diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-04 18:18:54 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-04 18:18:54 +0000 |
| commit | 1e12d536323a2545a537ae3fcdda617e76760f90 (patch) | |
| tree | b01fd4f285dcf287b34caf7b296d58a120edb505 /gcc/intl.h | |
| parent | 52aa1bf85dce176278a5e8ee4120bd817d770391 (diff) | |
| download | gcc-1e12d536323a2545a537ae3fcdda617e76760f90.tar.gz | |
top:
* intl: New directory; see intl/ChangeLog for details.
* ABOUT-NLS, config.rpath: Import from gettext 0.12.1.
* Makefile.tpl: all-gcc depends on maybe-all-intl.
* Makefile.in: Regenerate.
config:
* gettext.m4: New file - copy of gettext.m4 from binutils
CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
gcc:
* ABOUT-NLS: Delete.
* intl: Delete entire directory.
* aclocal.m4: Include ../config/gettext.m4. Delete
AC_ISC_POSIX, AM_LANGINFO_CODESET, jm_GLIBC21, AM_LC_MESSAGES,
AM_PATH_PROG_WITH_TEST, AM_WITH_NLS, and AM_GNU_GETTEXT.
* configure.in: Use CY_GNU_GETTEXT, not AM_GNU_GETTEXT.
Remove intl/Makefile from all_outputs.
* configure, config.in: Regenerate.
* Makefile.in: Expunge all references to intl subdirectory.
Add -I../intl to INCLUDES.
* intl.h: Include libintl.h if and only if ENABLE_NLS is defined.
intl:
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
contrib:
* gcc_update: Remove gcc/intl/plural.c from list.
Add new generated files intl/plural.c, intl/configure,
intl/config.h.in.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68928 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/intl.h')
| -rw-r--r-- | gcc/intl.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/gcc/intl.h b/gcc/intl.h index 3acc511cc07..18f66490c59 100644 --- a/gcc/intl.h +++ b/gcc/intl.h @@ -27,17 +27,8 @@ # define setlocale(category, locale) (locale) #endif -#ifdef USE_INCLUDED_LIBINTL -# include <intl/libgnuintl.h> -#else -# ifdef HAVE_LIBINTL_H -# include <libintl.h> -# else -# undef ENABLE_NLS -# endif -#endif - #ifdef ENABLE_NLS +#include <libintl.h> extern void gcc_init_libintl (void); extern size_t gcc_gettext_width (const char *); #else |