diff options
author | Bruno Haible <bruno@clisp.org> | 2001-10-26 09:37:18 +0000 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2001-10-26 09:37:18 +0000 |
commit | 57650188f856420a53bcd2e63f5236f138a98806 (patch) | |
tree | 0127dc0256e3cdaf147813a17322e12eeebe27c8 /m4 | |
parent | 3a6b7a32db98cacd7dd02e7b861f046a9a2345f1 (diff) | |
download | external_gettext-57650188f856420a53bcd2e63f5236f138a98806.zip external_gettext-57650188f856420a53bcd2e63f5236f138a98806.tar.gz external_gettext-57650188f856420a53bcd2e63f5236f138a98806.tar.bz2 |
Tweak value of INTLLIBS.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/ChangeLog | 7 | ||||
-rw-r--r-- | m4/gettext.m4 | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 480eb30..615f7d8 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2001-10-21 Bruno Haible <haible@clisp.cons.org> + + * gettext.m4 (AM_GNU_GETTEXT): In INTLLIBS, use ${top_builddir} + instead of $(top_builddir), so that the value can also be used in + shell scripts. Note that in Makefiles both ${top_builddir} and + $(top_builddir) are equivalent. + 2001-10-09 Bruno Haible <haible@clisp.cons.org> * gettext.m4 (AM_GNU_GETTEXT): Add check for getc_unlocked. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 8b0ad3c..5cc7a27 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -164,7 +164,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" INTLOBJS="\$(GETTOBJS)" BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" + INTLLIBS="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi |