56694dd996
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 |
||
|---|---|---|
| .. | ||
| aclocal.m4 | ||
| bindtextdom.c | ||
| ChangeLog | ||
| config.h.in | ||
| config.intl.in | ||
| configure | ||
| configure.in | ||
| dcgettext.c | ||
| dcigettext.c | ||
| dcngettext.c | ||
| dgettext.c | ||
| dngettext.c | ||
| eval-plural.h | ||
| explodename.c | ||
| finddomain.c | ||
| gettext.c | ||
| gettextP.h | ||
| gmo.h | ||
| hash-string.h | ||
| intl-compat.c | ||
| l10nflist.c | ||
| libgnuintl.h | ||
| loadinfo.h | ||
| loadmsgcat.c | ||
| localcharset.c | ||
| localcharset.h | ||
| locale.alias | ||
| localealias.c | ||
| localename.c | ||
| log.c | ||
| Makefile.in | ||
| ngettext.c | ||
| osdep.c | ||
| plural-exp.c | ||
| plural-exp.h | ||
| plural.c | ||
| plural.y | ||
| README | ||
| relocatable.c | ||
| relocatable.h | ||
| textdomain.c | ||
| VERSION | ||
GNU toolchain edition of GNU libintl 0.12.1 Most of the content of this directory is taken from gettext 0.12.1 and is owned by that project. Patches should be directed to the gettext developers first. However, note the following: * libintl.h comes from gettext, but is named libgnuintl.h.in in that project's source tree. * The files COPYING.LIB-2.0 and COPYING.LIB-2.1 are redundant with the top-level COPYING.LIB and have therefore been removed. * The files config.charset, ref-add.sin, ref-del.sin, os2compat.c, and os2compat.h are not used in this setup and have therefore been removed. * aclocal.m4 was constructed following the instructions printed by "gettextize" from the files that gettext 0.12.1 installs in $(prefix)/share/aclocal. * configure.in, config.intl.in, and Makefile.in were written for this directory layout, by Zack Weinberg <zack@codesourcery.com>. Please direct patches for these files to gcc-patches@gcc.gnu.org.