summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--modules/canonicalize-lgpl-tests1
-rw-r--r--modules/gettext-h5
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7947e5fcbb..ffd66ed7ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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.
* m4/longdouble.m4: Remove file.
* config/srclist.txt: Don't mention longdouble.m4.
diff --git a/modules/canonicalize-lgpl-tests b/modules/canonicalize-lgpl-tests
index 362959fa38..3c8eb9a02d 100644
--- 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 3f6981d520..15e97e6dac 100644
--- 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