Here's the proper fix instead of the hack of d28ce569fe233141f86fe516878361da01c9f9cb...

[mmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2a986b0..dc63866 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,9 +33,8 @@ auxexecdir = @libdir@
 ##
 ## nmh _does_ have a test suite!
 ##
-
-TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_srcdir@ \
-                   MH_TEST_DIR=@abs_srcdir@/test/testdir \
+TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
+                   MH_TEST_DIR=@abs_builddir@/test/testdir \
                    auxexecdir=$(auxexecdir) bindir=$(bindir) \
                    mandir=$(mandir) sysconfdir=$(sysconfdir)
 ##
@@ -210,6 +209,7 @@ uip_burst_SOURCES = uip/burst.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
+uip_comp_LDADD = $(LDADD) $(ICONVLIB)
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c