diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-21 16:29:13 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-10-21 16:29:13 +0000 |
| commit | c6c8127de09a50c59d9004f83d55321888be8b77 (patch) | |
| tree | dfa7b9988fd3c5fba37514a5565ef80a3a944d04 /gcc/aclocal.m4 | |
| parent | 0196842534b5364a8a5c054a5c9206953db84909 (diff) | |
| download | gcc-c6c8127de09a50c59d9004f83d55321888be8b77.tar.gz | |
* aclocal.m4 (AM_WITH_NLS): Also create and substitute
INTLDEPS variable, which does not include $LIBICONV.
* Makefile.in: Use INTLDEPS in LIBDEPS.
* configure: Regenerate.
intl:
* dcigettext.c: Don't use #elif.
* gettextP.h: Prototype nls_uint32 and locale_charset here.
Always define ZERO to 1 to avoid warnings (ZERO is used in
flexible-array-member declarations).
* loadmsgcat.c: Apply __extension__ to structure definitions
using C99 designated initializer syntax.
Do not prototype locale_charset here.
* localcharset.c: Prototype get_charset_aliases before use.
Get rid of STATIC nonsense.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46394 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/aclocal.m4')
| -rw-r--r-- | gcc/aclocal.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 1b4c5ad4d00..5927d4cf380 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -1381,7 +1381,9 @@ AC_DEFUN([AM_WITH_NLS], BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no +dnl GCC LOCAL: Separate concept of link command line from dependencies. INTLLIBS= + INTLDEPS= dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then @@ -1487,6 +1489,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" USE_INCLUDED_LIBINTL=yes CATOBJEXT=.gmo INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" + INTLDEPS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi @@ -1605,6 +1608,7 @@ changequote([,])dnl AC_SUBST(CATOBJEXT) AC_SUBST(GMOFILES) AC_SUBST(INTLLIBS) + AC_SUBST(INTLDEPS) AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) |