Portability fixes.

diff --git a/t/src/Makefile.am b/t/src/Makefile.am
index 919b18f7d424817a72d63f42bb03ee185a502d8a..30f9c813c8920e99d7ee2a5d24724382bd022c59 100644 (file)
--- a/t/src/Makefile.am
+++ b/t/src/Makefile.am
@@ -11,34 +11,35 @@ noinst_PROGRAMS = testgedcom pathtest gomtest updatetest testintl \
 noinst_HEADERS = output.h dump_gom.h portability.h
 
 testgedcom_SOURCES = standalone.c output.c portability.c
-testgedcom_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
-testgedcom_LDADD  = -lgedcom -lutf8tools $(LIBICONV)
+testgedcom_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs @ICONV_LIBPATH@
+testgedcom_LDADD  = $(LIBICONV) -lgedcom -lutf8tools $(LIBICONV)
 
 pathtest_SOURCES = pathtest.c
-pathtest_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
-pathtest_LDADD = -lgedcom -lutf8tools $(LIBICONV)
+pathtest_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs @ICONV_LIBPATH@
+pathtest_LDADD = $(LIBICONV) -lgedcom -lutf8tools $(LIBICONV)
 
 gomtest_SOURCES = gomtest.c output.c dump_gom.c portability.c
-gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs -L../../utf8/.libs
-gomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools $(LIBICONV)
+gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs -L../../utf8/.libs \
+                 @ICONV_LIBPATH@
+gomtest_LDADD = $(LIBICONV) -lgedcom_gom -lgedcom -lutf8tools $(LIBICONV)
 
 updatetest_SOURCES = update.c output.c portability.c
-updatetest_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
-updatetest_LDADD = -lgedcom -lutf8tools $(LIBICONV)
+updatetest_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs @ICONV_LIBPATH@
+updatetest_LDADD = $(LIBICONV) -lgedcom -lutf8tools $(LIBICONV)
 
 updategomtest_SOURCES = update_gom.c output.c dump_gom.c portability.c
 updategomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs \
-                        -L../../utf8/.libs
-updategomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools $(LIBICONV)
+                        -L../../utf8/.libs @ICONV_LIBPATH@
+updategomtest_LDADD = $(LIBICONV) -lgedcom_gom -lgedcom -lutf8tools $(LIBICONV)
 
 writegomtest_SOURCES = gom_write.c output.c portability.c
 writegomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs \
-                       -L../../utf8/.libs
-writegomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools $(LIBICONV)
+                       -L../../utf8/.libs @ICONV_LIBPATH@
+writegomtest_LDADD = $(LIBICONV) -lgedcom_gom -lgedcom -lutf8tools $(LIBICONV)
 
 testintl_SOURCES = testintl.c output.c
-testintl_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
-testintl_LDADD = -lgedcom -lutf8tools @INTLLIBS@ $(LIBICONV)
+testintl_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs @ICONV_LIBPATH@
+testintl_LDADD = $(LIBICONV) -lgedcom -lutf8tools @INTLLIBS@ $(LIBICONV)
 
 TEST_SCRIPT=test_script test_gom test_update test_intl test_updategom test_writegom test_prologue.sh test_bulk.sh