summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2002-01-24 12:34:28 +0000
committerBruno Haible <bruno@clisp.org>2009-06-22 01:06:59 +0200
commitd279c6f057517809b7b2733a87828343842f4e15 (patch)
tree0ce319f453886fc945f9b7930336a6a2d016e338 /src
parent95e1735945ef2c47b0158fd82ba3e0d5a8497442 (diff)
downloadexternal_gettext-d279c6f057517809b7b2733a87828343842f4e15.zip
external_gettext-d279c6f057517809b7b2733a87828343842f4e15.tar.gz
external_gettext-d279c6f057517809b7b2733a87828343842f4e15.tar.bz2
Make the rpath thing work in projects that use libtool.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.am10
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0e0ddaf..cea966f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-24 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.am (LDADD): Use @LTLIBINTL@ instead of @INTLLIBS@.
+ (libgettextsrc_la_LDFLAGS): Likewise. Use @LTLIBICONV@ instead of
+ @LIBICONV@.
+
2002-01-21 Bruno Haible <bruno@clisp.org>
* msggrep.c (main): On SunOS4, don't pass option "-q" to grep.
diff --git a/src/Makefile.am b/src/Makefile.am
index 25a7a32..1233ed9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,7 +45,7 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \
-I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
-DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
-LDADD = ../lib/libgettextlib.la @INTLLIBS@
+LDADD = ../lib/libgettextlib.la @LTLIBINTL@
SED = sed
YACC = @YACC@ -d
@@ -99,12 +99,12 @@ urlget_SOURCES = urlget.c
# How to build libgettextsrc.la.
# Need ../lib/libgettextlib.la.
-# Need @INTLLIBS@ because many source files use gettext().
-# Need @LIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c use
-# iconv().
+# Need @LTLIBINTL@ because many source files use gettext().
+# Need @LTLIBICONV@ because po-charset.c, po-lex.c, msgl-iconv.c, write-po.c
+# use iconv().
libgettextsrc_la_LDFLAGS = \
-release @VERSION@ \
- ../lib/libgettextlib.la @INTLLIBS@ @LIBICONV@ -lc -no-undefined
+ ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
# Link dependencies.
msgcmp_LDADD = libgettextsrc.la