Avoid link error on MacOS X 10.4, due to replaced 'unsetenv' function.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index b7495ce372bced590a244582a5a56af88f31bca5..4d7c60f85bc88f8742a6e4f526c1a199118d79e0 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-15  Bruno Haible  <bruno@clisp.org>
+
+       Avoid link error on MacOS X 10.4, due to replaced 'unsetenv' function.
+       * Makefile.am (gettext_6_prg_LDADD, gettext_7_prg_LDADD): Add
+       libgettextlib.la. Add $(LDADD).
+       (gettext_6_prg_LDADD_1, gettext_7_prg_LDADD_1): Remove $(LDADD) here.
+       Reported by <ryandesign> at <https://savannah.gnu.org/bugs/?29888>.
+
 2010-05-09  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.18 released.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 5a89a6e021c2da76bdc767c8311eb9bc27bfe29f..496e13edac9e42665ed5c772e5a8a1e747c59a0f 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -223,13 +223,13 @@ gettext_5_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 gettext_6_prg_SOURCES = gettext-6-prg.c
 gettext_6_prg_CFLAGS = $(gettext_6_prg_CFLAGS_@HAVE_NEWLOCALE@)
 gettext_6_prg_CFLAGS_1 = -DUSE_POSIX_THREADS
-gettext_6_prg_LDADD = $(gettext_6_prg_LDADD_@HAVE_NEWLOCALE@)
-gettext_6_prg_LDADD_1 = $(LDADD) -lpthread
+gettext_6_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) $(gettext_6_prg_LDADD_@HAVE_NEWLOCALE@)
+gettext_6_prg_LDADD_1 = -lpthread
 gettext_7_prg_SOURCES = gettext-7-prg.c
 gettext_7_prg_CFLAGS = $(gettext_7_prg_CFLAGS_@HAVE_NEWLOCALE@)
 gettext_7_prg_CFLAGS_1 = -DUSE_POSIX_THREADS
-gettext_7_prg_LDADD = $(gettext_7_prg_LDADD_@HAVE_NEWLOCALE@)
-gettext_7_prg_LDADD_1 = $(LDADD) -lpthread
+gettext_7_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD) $(gettext_7_prg_LDADD_@HAVE_NEWLOCALE@)
+gettext_7_prg_LDADD_1 = -lpthread
 gettext_8_prg_SOURCES = gettext-8-prg.c
 gettext_8_prg_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 cake_SOURCES = plural-1-prg.c setlocale.c