From 56694dd9965e7496ca003ec37a6709c86762b8d0 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Tue, 8 Jul 2003 05:55:11 +0000 Subject: Makefile.tpl (configure-gcc): Depend on maybe-configure-intl. top: * Makefile.tpl (configure-gcc): Depend on maybe-configure-intl. * Makefile.in: Regenerate. config: * gettext.m4: Delete all former contents. (ZW_GNU_GETTEXT_SISTER_DIR): New macro. * progtest.m4: New file. gcc: * Makefile.in (top_builddir): Set to "..", not ".". (INTLLIBS, INTLDEPS): Delete. (LIBINTL, LIBINTL_DEP, LIBICONV_DEP): New variables to be substituted. (LIBDEPS): Add $(LIBICONV_DEP). (LIBS): Take out $(INTLLIBS), add $(LIBINTL) and $(LIBICONV). (INCLUDES): Replace -I../intl with @INCINTL@. ($(top_builddir)/intl/libintl.a): Delete rule. (stage2-start, stage3-start, stage4-start, stageprofile-start, stagefeedback-start): Use $$ for variable to be evaluated by shell, not make. * acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES, HAVE_STPCPY): Delete. * aclocal.m4: sinclude ../config/progtest.m4. Add contents of lcmessage.m4 from gettext distro. * configure.in: Check for wchar.h and setlocale. Set LIBICONV_DEP to the empty string and substitute it. Call AM_LC_MESSAGES. Delete AC_ARG_ENABLE for --enable-nls; this is handled elsewhere. Use ZW_GNU_GETTEXT_SISTER_DIR, not CY_GNU_GETTEXT. Clear $LIBICONV if its text is included in $LIBINTL, to avoid linking it twice. * configure, config.in: Regenerate. intl: * README: Update. * Makefile.in (INSTALL, INSTALL_DATA, MKINSTALLDIRS, mkinstalldirs, gettextsrcdir, l): Delete. (COMPILE): Add $(DEFS-$@), remove $(XCFLAGS). (HEADERS): libgnuintl.h not libgnuintl.h.in. Remove os2compat.h. (SOURCES): Remove os2compat.c. (DEFS-dcigettext.o, DEFS-localealias.o, DEFS-localcharset.o, DEFS-relocatable.o): New. (all-yes): Add config.intl. (libintl.h): Use cp, not cat. (INCLUDES): Remove -I.. (TAGS, CTAGS, ID): Word wrap. (mostlyclean, distclean): Remove junk. (config.intl): New rule. * aclocal.m4: sinclude ../config/progtest.m4 instead of including it inline. * config.intl.in: New file. * configure.in: Take out unnecessary AC_CONFIG_AUX_DIR. Take out AC_DEFINEs for LOCALEDIR, LOCALE_ALIAS_PATH, LIBDIR, INSTALLDIR. Set LIBINTL_DEP and INCINTL and AC_SUBST them. Add config.intl to AC_OUTPUT. * os2compat.c, os2compat.h: Delete, unused. From-SVN: r69071 --- intl/config.h.in | 302 ++++++++++++++++++++++++------------------------------- 1 file changed, 129 insertions(+), 173 deletions(-) (limited to 'intl/config.h.in') diff --git a/intl/config.h.in b/intl/config.h.in index 80272b8..965e1db 100644 --- a/intl/config.h.in +++ b/intl/config.h.in @@ -1,255 +1,211 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ +/* Define if using alloca.c. */ #undef C_ALLOCA -/* Define because we depend on libiconv. */ -#undef DEPENDS_ON_LIBICONV - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS +/* Define to empty if the keyword does not work. */ +#undef const -/* Define to enable relocation. */ -#undef ENABLE_RELOCATABLE +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ +#undef CRAY_STACKSEG_END -/* Define to 1 if you have `alloca', as a function or macro. */ +/* Define if you have alloca, as a function or macro. */ #undef HAVE_ALLOCA -/* Define to 1 if you have and it should be used (not on Ultrix). - */ +/* Define if you have and it should be used (not on Ultrix). */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the header file. */ -#undef HAVE_ARGZ_H - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the `feof_unlocked' function. */ -#undef HAVE_FEOF_UNLOCKED +/* Define if you have a working `mmap' system call. */ +#undef HAVE_MMAP -/* Define to 1 if you have the `fgets_unlocked' function. */ -#undef HAVE_FGETS_UNLOCKED +/* Define as __inline if that's what the C compiler calls it. */ +#undef inline -/* Define to 1 if you have the `getcwd' function. */ -#undef HAVE_GETCWD +/* Define to `long' if doesn't define. */ +#undef off_t -/* Define to 1 if you have the `getc_unlocked' function. */ -#undef HAVE_GETC_UNLOCKED +/* Define to `unsigned' if doesn't define. */ +#undef size_t -/* Define to 1 if you have the `getegid' function. */ -#undef HAVE_GETEGID +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown + */ +#undef STACK_DIRECTION -/* Define to 1 if you have the `geteuid' function. */ -#undef HAVE_GETEUID +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define to 1 if you have the `getgid' function. */ -#undef HAVE_GETGID +/* Define if you have the __argz_count function. */ +#undef HAVE___ARGZ_COUNT -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE +/* Define if you have the __argz_next function. */ +#undef HAVE___ARGZ_NEXT -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT +/* Define if you have the __argz_stringify function. */ +#undef HAVE___ARGZ_STRINGIFY -/* Define to 1 if you have the `getuid' function. */ -#undef HAVE_GETUID +/* Define if you have the __fsetlocking function. */ +#undef HAVE___FSETLOCKING -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV +/* Define if you have the feof_unlocked function. */ +#undef HAVE_FEOF_UNLOCKED -/* Define if exists and doesn't clash with . */ -#undef HAVE_INTTYPES_H +/* Define if you have the fgets_unlocked function. */ +#undef HAVE_FGETS_UNLOCKED -/* Define if exists, doesn't clash with , and - declares uintmax_t. */ -#undef HAVE_INTTYPES_H_WITH_UINTMAX +/* Define if you have the getc_unlocked function. */ +#undef HAVE_GETC_UNLOCKED -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET +/* Define if you have the getcwd function. */ +#undef HAVE_GETCWD -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES +/* Define if you have the getegid function. */ +#undef HAVE_GETEGID -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H +/* Define if you have the geteuid function. */ +#undef HAVE_GETEUID -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H +/* Define if you have the getgid function. */ +#undef HAVE_GETGID -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H +/* Define if you have the getpagesize function. */ +#undef HAVE_GETPAGESIZE -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +/* Define if you have the getuid function. */ +#undef HAVE_GETUID -/* Define to 1 if you have the `mempcpy' function. */ +/* Define if you have the mempcpy function. */ #undef HAVE_MEMPCPY -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define to 1 if you have the `munmap' function. */ +/* Define if you have the munmap function. */ #undef HAVE_MUNMAP -/* Define to 1 if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define to 1 if you have the `putenv' function. */ +/* Define if you have the putenv function. */ #undef HAVE_PUTENV -/* Define to 1 if you have the `setenv' function. */ +/* Define if you have the setenv function. */ #undef HAVE_SETENV -/* Define to 1 if you have the `setlocale' function. */ +/* Define if you have the setlocale function. */ #undef HAVE_SETLOCALE -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define if exists, doesn't clash with , and declares - uintmax_t. */ -#undef HAVE_STDINT_H_WITH_UINTMAX - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `stpcpy' function. */ +/* Define if you have the stpcpy function. */ #undef HAVE_STPCPY -/* Define to 1 if you have the `strcasecmp' function. */ +/* Define if you have the strcasecmp function. */ #undef HAVE_STRCASECMP -/* Define to 1 if you have the `strdup' function. */ +/* Define if you have the strdup function. */ #undef HAVE_STRDUP -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strtoul' function. */ +/* Define if you have the strtoul function. */ #undef HAVE_STRTOUL -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H +/* Define if you have the tsearch function. */ +#undef HAVE_TSEARCH -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H +/* Define if you have the header file. */ +#undef HAVE_ARGZ_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H +/* Define if you have the header file. */ +#undef HAVE_LIMITS_H -/* Define to 1 if you have the `tsearch' function. */ -#undef HAVE_TSEARCH +/* Define if you have the header file. */ +#undef HAVE_LOCALE_H -/* Define if you have the 'uintmax_t' type in or . */ -#undef HAVE_UINTMAX_T +/* Define if you have the header file. */ +#undef HAVE_MALLOC_H -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H +/* Define if you have the header file. */ +#undef HAVE_NL_TYPES_H -/* Define if you have the unsigned long long type. */ -#undef HAVE_UNSIGNED_LONG_LONG +/* Define if you have the header file. */ +#undef HAVE_STDDEF_H -/* Define to 1 if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT +/* Define if you have the header file. */ +#undef HAVE_STDLIB_H -/* Define to 1 if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT +/* Define if you have the header file. */ +#undef HAVE_STRING_H -/* Define to 1 if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY +/* Define if you have the header file. */ +#undef HAVE_SYS_PARAM_H -/* Define to 1 if you have the `__fsetlocking' function. */ -#undef HAVE___FSETLOCKING +/* Define if you have the header file. */ +#undef HAVE_UNISTD_H -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST +/* Define if exists, doesn't clash with , + and declares uintmax_t. */ +#undef HAVE_INTTYPES_H_WITH_UINTMAX -/* Define to the installation directory. */ -#undef INSTALLDIR +/* Define if exists, doesn't clash with , + and declares uintmax_t. */ +#undef HAVE_STDINT_H_WITH_UINTMAX + +/* Define if you have the unsigned long long type. */ +#undef HAVE_UNSIGNED_LONG_LONG /* Define if integer division by zero raises signal SIGFPE. */ #undef INTDIV0_RAISES_SIGFPE -/* Define because this is libintl. */ -#undef IN_LIBINTL - -/* Define because this is a library. */ -#undef IN_LIBRARY - -/* Define to the library directory. */ -#undef LIBDIR +/* Define to unsigned long or unsigned long long + if and don't define. */ +#undef uintmax_t -/* Define to the directory holding the locale files. */ -#undef LOCALEDIR +/* Define if you have the 'uintmax_t' type in or . */ +#undef HAVE_UINTMAX_T -/* Define to the locale alias path. */ -#undef LOCALE_ALIAS_PATH +/* Define if exists and doesn't clash with . */ +#undef HAVE_INTTYPES_H -/* Define if there is no xmalloc. */ -#undef NO_XMALLOC +/* Define if exists and defines unusable PRI* macros. */ +#undef PRI_MACROS_BROKEN -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV -/* Define to the full name of this package. */ -#undef PACKAGE_NAME +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING +/* Define if you have and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES -/* Define to the version of this package. */ -#undef PACKAGE_VERSION +/* Define to 1 if translation of program messages to the user's native language + is requested. */ +#undef ENABLE_NLS -/* Define if exists and defines unusable PRI* macros. */ -#undef PRI_MACROS_BROKEN +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION +/* Define if the GNU dcgettext() function is already present or preinstalled. */ +#undef HAVE_DCGETTEXT -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define because this is libintl. */ +#undef IN_LIBINTL -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const +/* Define because this is a library. */ +#undef IN_LIBRARY -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -#undef inline +/* Define because we depend on libiconv. */ +#undef DEPENDS_ON_LIBICONV -/* Define to `long' if does not define. */ -#undef off_t +/* Define to enable relocation. */ +#undef ENABLE_RELOCATABLE -/* Define this entry point correctly. */ -#undef relocate +/* Define if there is no xmalloc. */ +#undef NO_XMALLOC /* Define this entry point correctly. */ #undef set_relocation_prefix -/* Define to `unsigned' if does not define. */ -#undef size_t +/* Define this entry point correctly. */ +#undef relocate -/* Define to unsigned long or unsigned long long if and - don't define. */ -#undef uintmax_t -- cgit v1.1