Mercurial > hg > octave-lojdl > gnulib-hg

changeset 8649:ca75eb69fcf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix linking of test programs with libintl or not.
author Bruno Haible <bruno@clisp.org>
date Fri, 06 Apr 2007 20:08:02 +0000
parents 359d135f748c
children a555b16abc8a
files ChangeLog modules/canonicalize-lgpl-tests modules/gettext-h
diffstat 3 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- a/modules/canonicalize-lgpl-tests
+++ b/modules/canonicalize-lgpl-tests
@@ -10,6 +10,5 @@
 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
 
--- a/modules/gettext-h
+++ b/modules/gettext-h
@@ -7,6 +7,8 @@
 Depends-on:
 
 configure.ac:
+AC_SUBST([LIBINTL])
+AC_SUBST([LTLIBINTL])
 
 Makefile.am:
 lib_SOURCES += gettext.h
@@ -14,6 +16,9 @@
 Include:
 "gettext.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL