diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2001-10-19 15:17:39 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-10-19 15:17:39 +0000 |
| commit | 191bf464071d7cd21095b9f1d119c05fd8306493 (patch) | |
| tree | 081319da8a2e78a4efbfcb39e1acf6aca8752c83 /gcc/intl | |
| parent | 7c87e9f9216fd7959a5365ae62f9173ce524d21b (diff) | |
| download | gcc-191bf464071d7cd21095b9f1d119c05fd8306493.tar.gz | |
aclocal.m4 (AM_WITH_NLS): AC_DEFINE HAVE_LIBINTL_H and USE_INCLUDED_LIBINTL when appropriate.
* aclocal.m4 (AM_WITH_NLS): AC_DEFINE HAVE_LIBINTL_H and
USE_INCLUDED_LIBINTL when appropriate.
* configure, config.in: Regenerate.
* Makefile.in (datadir): Set to @datadir@.
(intl.o): Also depend on $(CONFIG_H) and system.h.
* intl.c: Factor out common gettext initialization sequence.
(gcc_init_libintl): New function.
* intl.h: Include intl/libgnuintl.h if USE_INCLUDED_LIBINTL;
otherwise include libintl.h if HAVE_LIBINTL_H; otherwise turn
off NLS. Add multiple include guard. No need to #ifdef-guard
an #undef. Prototype gcc_init_libintl here.
* collect2.c (main), cppmain.c (general_init), gcc.c (main),
gcov.c (main), protoize.c (main), toplev.c (toplev_main):
Use gcc_init_libintl.
intl:
* Makefile.in: Don't copy libgnuintl.h anywhere.
From-SVN: r46348
Diffstat (limited to 'gcc/intl')
| -rw-r--r-- | gcc/intl/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/intl/Makefile.in | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/intl/ChangeLog b/gcc/intl/ChangeLog index b2018b84ec4..5d8bfcbfacb 100644 --- a/gcc/intl/ChangeLog +++ b/gcc/intl/ChangeLog @@ -1,3 +1,7 @@ +2001-10-19 Zack Weinberg <zack@codesourcery.com> + + * Makefile.in: Don't copy libgnuintl.h anywhere. + 2001-10-12 Zack Weinberg <zack@codesourcery.com> * Update entire directory from gettext 0.10.40. diff --git a/gcc/intl/Makefile.in b/gcc/intl/Makefile.in index acf050d59af..a4e0d6a403b 100644 --- a/gcc/intl/Makefile.in +++ b/gcc/intl/Makefile.in @@ -105,8 +105,9 @@ LTV_AGE=0 INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir) \ -I$(top_srcdir)/config -I$(top_srcdir)/../include +# GCC LOCAL: Removed libintl.h from all-yes. all: all-@USE_INCLUDED_LIBINTL@ -all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed +all-yes: libintl.$la charset.alias ref-add.sed ref-del.sed all-no: all-no-@BUILD_INCLUDED_LIBINTL@ all-no-yes: libgnuintl.$la all-no-no: @@ -124,8 +125,9 @@ libintl.la libgnuintl.la: $(OBJECTS) -rpath $(libdir) \ -no-undefined -libintl.h: libgnuintl.h - cp $(srcdir)/libgnuintl.h libintl.h +#GCC LOCAL: Do not install this file. +#libintl.h: libgnuintl.h +# cp $(srcdir)/libgnuintl.h libintl.h charset.alias: config.charset $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ |