Fix linking of test programs with libintl or not.

diff --git a/ChangeLog b/ChangeLog
index 7947e5fcbbef610dc52edc280f3a3eb8c202b80b..ffd66ed7ca581bf8457acb9fe21f687de87db997 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-06  Bruno Haible  <bruno@clisp.org>
+
+       * modules/gettext-h (configure.ac): AC_SUBST LIBINTL and LTLIBINTL.
+       (Link): New section.
+
+       * modules/canonicalize-lgpl-tests (Makefile.am): Undo last change.
+
 2007-04-06  Bruno Haible  <bruno@clisp.org>
 
        Assume the 'long double' type.

diff --git a/modules/canonicalize-lgpl-tests b/modules/canonicalize-lgpl-tests
index 362959fa38b945b8bffb54a5c04878eb942c9941..3c8eb9a02d4c1f737a1cdeb56f6d8ad350e831af 100644 (file)
--- a/modules/canonicalize-lgpl-tests
+++ b/modules/canonicalize-lgpl-tests
@@ -10,6 +10,5 @@ Makefile.am:
 TESTS += test-canonicalize-lgpl.sh
 TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@'
 check_PROGRAMS += test-canonicalize-lgpl
-test_canonicalize_lgpl_LDADD = @LIBINTL@ $(LDADD)
 EXTRA_DIST += test-canonicalize-lgpl.sh
 

diff --git a/modules/gettext-h b/modules/gettext-h
index 3f6981d520b01e16522a884b8b5da313089f0ee0..15e97e6dacbe756a0e39ed0b00641ac7f6c68c01 100644 (file)
--- a/modules/gettext-h
+++ b/modules/gettext-h
@@ -7,6 +7,8 @@ lib/gettext.h
 Depends-on:
 
 configure.ac:
+AC_SUBST([LIBINTL])
+AC_SUBST([LTLIBINTL])
 
 Makefile.am:
 lib_SOURCES += gettext.h
@@ -14,6 +16,9 @@ lib_SOURCES += gettext.h
 Include:
 "gettext.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL