summaryrefslogtreecommitdiffstats
path: root/gettext-tools/tests
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-05-15 14:26:25 +0200
committerBruno Haible <bruno@clisp.org>2010-05-15 14:26:25 +0200
commit73700131b8bccc1affa86126b988457536a351a3 (patch)
tree0bf7e68100f72cb4e7b94ff43d007e1535d52bbe /gettext-tools/tests
parentf2488ce2d939b79e2e36bd59da973127768dbd51 (diff)
downloadexternal_gettext-73700131b8bccc1affa86126b988457536a351a3.zip
external_gettext-73700131b8bccc1affa86126b988457536a351a3.tar.gz
external_gettext-73700131b8bccc1affa86126b988457536a351a3.tar.bz2
Avoid link error on MacOS X 10.4, due to replaced 'unsetenv' function.
Diffstat (limited to 'gettext-tools/tests')
-rw-r--r--gettext-tools/tests/ChangeLog8
-rw-r--r--gettext-tools/tests/Makefile.am8
2 files changed, 12 insertions, 4 deletions
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index b7495ce..4d7c60f 100644
--- 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 5a89a6e..496e13e 100644
--- 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