diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.def | 72 | ||||
| -rw-r--r-- | Makefile.in | 1660 | ||||
| -rw-r--r-- | config/gettext-sister.m4 | 35 | ||||
| -rw-r--r-- | config/gettext.m4 | 361 | ||||
| -rw-r--r-- | config/iconv.m4 | 313 | ||||
| -rw-r--r-- | config/intlmacosx.m4 | 69 | ||||
| -rwxr-xr-x | configure | 44 | ||||
| -rw-r--r-- | configure.ac | 44 | ||||
| -rwxr-xr-x | contrib/download_prerequisites | 2 | ||||
| -rw-r--r-- | contrib/prerequisites.md5 | 1 | ||||
| -rw-r--r-- | contrib/prerequisites.sha512 | 1 | ||||
| -rw-r--r-- | gcc/Makefile.in | 8 | ||||
| -rw-r--r-- | gcc/aclocal.m4 | 4 | ||||
| -rwxr-xr-x | gcc/configure | 1927 | ||||
| -rw-r--r-- | gcc/doc/install.texi | 72 | ||||
| -rw-r--r-- | libcpp/aclocal.m4 | 5 | ||||
| -rwxr-xr-x | libcpp/configure | 2069 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 725 |
19 files changed, 5420 insertions, 1993 deletions
@@ -69,3 +69,4 @@ stamp-* /mpc* /gmp* /isl* +/gettext* diff --git a/Makefile.def b/Makefile.def index 15c068e..792f814 100644 --- a/Makefile.def +++ b/Makefile.def @@ -74,8 +74,14 @@ host_modules= { module= isl; lib_path=.libs; bootstrap=true; host_modules= { module= gold; bootstrap=true; }; host_modules= { module= gprof; }; host_modules= { module= gprofng; }; -// intl acts on 'host_shared' directly, and does not support --with-pic. -host_modules= { module= intl; bootstrap=true; }; +host_modules= { module= gettext; bootstrap=true; no_install=true; + module_srcdir= "gettext/gettext-runtime"; + // We always build gettext with pic, because some packages (e.g. gdbserver) + // need it in some configuratons, which is determined via nontrivial tests. + // Always enabling pic seems to make sense for something tied to + // user-facing output. + extra_configure_flags='--disable-shared --disable-java --disable-csharp --with-pic'; + lib_path=intl/.libs; }; host_modules= { module= tcl; missing=mostlyclean; }; host_modules= { module= itcl; }; @@ -345,7 +351,7 @@ dependencies = { module=all-build-fixincludes; on=all-build-libiberty; }; dependencies = { module=all-build-libcpp; on=all-build-libiberty; }; // Host modules specific to gcc. -dependencies = { module=configure-gcc; on=configure-intl; }; +dependencies = { module=configure-gcc; on=configure-gettext; }; dependencies = { module=configure-gcc; on=all-gmp; }; dependencies = { module=configure-gcc; on=all-mpfr; }; dependencies = { module=configure-gcc; on=all-mpc; }; @@ -357,7 +363,7 @@ dependencies = { module=configure-gcc; on=all-ld; }; dependencies = { module=configure-gcc; on=all-gold; }; dependencies = { module=configure-gcc; on=all-libiconv; }; dependencies = { module=all-gcc; on=all-libiberty; hard=true; }; -dependencies = { module=all-gcc; on=all-intl; }; +dependencies = { module=all-gcc; on=all-gettext; }; dependencies = { module=all-gcc; on=all-mpfr; }; dependencies = { module=all-gcc; on=all-mpc; }; dependencies = { module=all-gcc; on=all-isl; }; @@ -386,10 +392,10 @@ dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; }; dependencies = { module=install-strip-gcc ; on=install-strip-lto-plugin; }; dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; }; -dependencies = { module=configure-libcpp; on=configure-intl; }; +dependencies = { module=configure-libcpp; on=configure-gettext; }; dependencies = { module=configure-libcpp; on=all-libiconv; }; dependencies = { module=all-libcpp; on=all-libiberty; hard=true; }; -dependencies = { module=all-libcpp; on=all-intl; }; +dependencies = { module=all-libcpp; on=all-gettext; }; dependencies = { module=all-libcpp; on=all-libiconv; }; dependencies = { module=all-fixincludes; on=all-libiberty; }; @@ -411,16 +417,16 @@ dependencies = { module=all-gotools; on=all-target-libgo; }; dependencies = { module=all-utils; on=all-libiberty; }; -dependencies = { module=configure-intl; on=all-libiconv; }; +dependencies = { module=configure-gettext; on=all-libiconv; }; dependencies = { module=configure-mpfr; on=all-gmp; }; dependencies = { module=configure-mpc; on=all-mpfr; }; dependencies = { module=configure-isl; on=all-gmp; }; -dependencies = { module=all-intl; on=all-libiconv; }; +dependencies = { module=all-gettext; on=all-libiconv; }; // Host modules specific to gdb. dependencies = { module=configure-gdb; on=all-gmp; }; dependencies = { module=configure-gdb; on=all-mpfr; }; -dependencies = { module=configure-gdb; on=all-intl; }; +dependencies = { module=configure-gdb; on=all-gettext; }; dependencies = { module=configure-gdb; on=configure-sim; }; dependencies = { module=configure-gdb; on=all-bfd; }; dependencies = { module=configure-gdb; on=all-gnulib; }; @@ -454,17 +460,17 @@ dependencies = { module=all-libgui; on=all-tk; }; dependencies = { module=all-libgui; on=all-itcl; }; dependencies = { module=configure-gdbsupport; on=configure-gnulib; }; -dependencies = { module=configure-gdbsupport; on=configure-intl; }; +dependencies = { module=configure-gdbsupport; on=configure-gettext; }; dependencies = { module=all-gdbsupport; on=all-gnulib; }; -dependencies = { module=all-gdbsupport; on=all-intl; }; +dependencies = { module=all-gdbsupport; on=all-gettext; }; // Host modules specific to binutils. // build libsframe before bfd for encoder/decoder support for linking // SFrame sections dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; }; -dependencies = { module=configure-bfd; on=configure-intl; }; +dependencies = { module=configure-bfd; on=configure-gettext; }; dependencies = { module=all-bfd; on=all-libiberty; }; -dependencies = { module=all-bfd; on=all-intl; }; +dependencies = { module=all-bfd; on=all-gettext; }; dependencies = { module=all-bfd; on=all-zlib; }; dependencies = { module=all-bfd; on=all-libsframe; }; dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; }; @@ -473,13 +479,13 @@ dependencies = { module=all-opcodes; on=all-libiberty; }; // We must build gas before binutils, gprof, ld and gold to avoid race // condition in the prev-gcc/as script during bootstrap of combined tree // with GCC and binutils. See PR gas/14899 for details. -dependencies = { module=configure-binutils; on=configure-intl; }; +dependencies = { module=configure-binutils; on=configure-gettext; }; dependencies = { module=all-binutils; on=all-libiberty; }; dependencies = { module=all-binutils; on=all-opcodes; }; dependencies = { module=all-binutils; on=all-bfd; }; dependencies = { module=all-binutils; on=all-build-flex; }; dependencies = { module=all-binutils; on=all-build-bison; }; -dependencies = { module=all-binutils; on=all-intl; }; +dependencies = { module=all-binutils; on=all-gettext; }; dependencies = { module=all-binutils; on=all-gas; }; dependencies = { module=all-binutils; on=all-libctf; }; dependencies = { module=all-ld; on=all-libctf; }; @@ -508,51 +514,51 @@ dependencies = { module=configure-opcodes; on=configure-bfd; hard=true; }; dependencies = { module=install-opcodes; on=install-bfd; }; dependencies = { module=install-strip-opcodes; on=install-strip-bfd; }; -dependencies = { module=configure-gas; on=configure-intl; }; +dependencies = { module=configure-gas; on=configure-gettext; }; dependencies = { module=all-gas; on=all-libiberty; }; dependencies = { module=all-gas; on=all-opcodes; }; dependencies = { module=all-gas; on=all-bfd; }; -dependencies = { module=all-gas; on=all-intl; }; -dependencies = { module=configure-gprof; on=configure-intl; }; +dependencies = { module=all-gas; on=all-gettext; }; +dependencies = { module=configure-gprof; on=configure-gettext; }; dependencies = { module=all-gprof; on=all-libiberty; }; dependencies = { module=all-gprof; on=all-bfd; }; dependencies = { module=all-gprof; on=all-opcodes; }; -dependencies = { module=all-gprof; on=all-intl; }; +dependencies = { module=all-gprof; on=all-gettext; }; dependencies = { module=all-gprof; on=all-gas; }; -dependencies = { module=configure-gprofng; on=configure-intl; }; +dependencies = { module=configure-gprofng; on=configure-gettext; }; dependencies = { module=all-gprofng; on=all-libiberty; }; dependencies = { module=all-gprofng; on=all-bfd; }; dependencies = { module=all-gprofng; on=all-opcodes; }; -dependencies = { module=all-gprofng; on=all-intl; }; +dependencies = { module=all-gprofng; on=all-gettext; }; dependencies = { module=all-gprofng; on=all-gas; }; dependencies = { module=install-gprofng; on=install-opcodes; }; dependencies = { module=install-gprofng; on=install-bfd; }; -dependencies = { module=configure-ld; on=configure-intl; }; +dependencies = { module=configure-ld; on=configure-gettext; }; dependencies = { module=all-ld; on=all-libiberty; }; dependencies = { module=all-ld; on=all-bfd; }; dependencies = { module=all-ld; on=all-opcodes; }; dependencies = { module=all-ld; on=all-build-bison; }; dependencies = { module=all-ld; on=all-build-flex; }; -dependencies = { module=all-ld; on=all-intl; }; +dependencies = { module=all-ld; on=all-gettext; }; dependencies = { module=all-ld; on=all-gas; }; dependencies = { module=all-ld; on=all-binutils; }; dependencies = { module=install-ld; on=install-gold; }; dependencies = { module=install-strip-ld; on=install-strip-gold; }; -dependencies = { module=configure-gold; on=configure-intl; }; +dependencies = { module=configure-gold; on=configure-gettext; }; dependencies = { module=all-gold; on=all-libiberty; }; -dependencies = { module=all-gold; on=all-intl; }; +dependencies = { module=all-gold; on=all-gettext; }; dependencies = { module=all-gold; on=all-bfd; }; dependencies = { module=all-gold; on=all-build-bison; }; dependencies = { module=all-gold; on=all-gas; }; dependencies = { module=check-gold; on=all-binutils; }; dependencies = { module=check-gold; on=all-gas; }; -dependencies = { module=configure-opcodes; on=configure-intl; }; +dependencies = { module=configure-opcodes; on=configure-gettext; }; dependencies = { module=all-opcodes; on=all-bfd; }; dependencies = { module=all-opcodes; on=all-libiberty; }; -dependencies = { module=all-opcodes; on=all-intl; }; +dependencies = { module=all-opcodes; on=all-gettext; }; // Other host modules in the 'src' repository. dependencies = { module=all-dejagnu; on=all-tcl; }; @@ -586,8 +592,8 @@ dependencies = { module=install-sid; on=install-tk; }; dependencies = { module=install-strip-sid; on=install-strip-tk; }; dependencies = { module=configure-sim; on=all-gnulib; }; -dependencies = { module=configure-sim; on=configure-intl; }; -dependencies = { module=all-sim; on=all-intl; }; +dependencies = { module=configure-sim; on=configure-gettext; }; +dependencies = { module=all-sim; on=all-gettext; }; dependencies = { module=all-sim; on=all-libiberty; }; dependencies = { module=all-sim; on=all-bfd; }; dependencies = { module=all-sim; on=all-opcodes; }; @@ -602,7 +608,7 @@ dependencies = { module=all-libctf; on=all-bfd; }; dependencies = { module=all-libctf; on=all-zlib; }; // So that checking for ELF support in BFD from libctf configure is possible. dependencies = { module=configure-libctf; on=all-bfd; }; -dependencies = { module=configure-libctf; on=all-intl; }; +dependencies = { module=configure-libctf; on=all-gettext; }; dependencies = { module=configure-libctf; on=all-zlib; }; dependencies = { module=configure-libctf; on=all-libiconv; }; dependencies = { module=check-libctf; on=all-ld; }; @@ -615,13 +621,13 @@ dependencies = { module=distclean-gnulib; on=distclean-gdbserver; }; dependencies = { module=distclean-gnulib; on=distclean-sim; }; // Warning, these are not well tested. -dependencies = { module=all-bison; on=all-intl; }; +dependencies = { module=all-bison; on=all-gettext; }; dependencies = { module=all-bison; on=all-build-texinfo; }; dependencies = { module=all-flex; on=all-build-bison; }; -dependencies = { module=all-flex; on=all-intl; }; +dependencies = { module=all-flex; on=all-gettext; }; dependencies = { module=all-flex; on=all-m4; }; dependencies = { module=all-flex; on=all-build-texinfo; }; -dependencies = { module=all-m4; on=all-intl; }; +dependencies = { module=all-m4; on=all-gettext; }; dependencies = { module=all-m4; on=all-build-texinfo; }; // Target modules. These can also have dependencies on the language diff --git a/Makefile.in b/Makefile.in index 1dda62a..b65ab49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -768,7 +768,7 @@ TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the host machine work. -HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl) +HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_gettext) # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch @if gcc @@ -796,6 +796,11 @@ HOST_LIB_PATH_isl = \ $$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs: @endif isl +@if gettext +HOST_LIB_PATH_gettext = \ + $$r/$(HOST_SUBDIR)/gettext/intl/.libs:$$r/$(HOST_SUBDIR)/prev-gettext/intl/.libs: +@endif gettext + CXX_FOR_TARGET_FLAG_TO_PASS = \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" @@ -1098,7 +1103,7 @@ configure-host: \ maybe-configure-gold \ maybe-configure-gprof \ maybe-configure-gprofng \ - maybe-configure-intl \ + maybe-configure-gettext \ maybe-configure-tcl \ maybe-configure-itcl \ maybe-configure-ld \ @@ -1252,9 +1257,9 @@ all-host: maybe-all-gold @endif gold-no-bootstrap all-host: maybe-all-gprof all-host: maybe-all-gprofng -@if intl-no-bootstrap -all-host: maybe-all-intl -@endif intl-no-bootstrap +@if gettext-no-bootstrap +all-host: maybe-all-gettext +@endif gettext-no-bootstrap all-host: maybe-all-tcl all-host: maybe-all-itcl @if ld-no-bootstrap @@ -1392,7 +1397,7 @@ info-host: maybe-info-isl info-host: maybe-info-gold info-host: maybe-info-gprof info-host: maybe-info-gprofng -info-host: maybe-info-intl +info-host: maybe-info-gettext info-host: maybe-info-tcl info-host: maybe-info-itcl info-host: maybe-info-ld @@ -1483,7 +1488,7 @@ dvi-host: maybe-dvi-isl dvi-host: maybe-dvi-gold dvi-host: maybe-dvi-gprof dvi-host: maybe-dvi-gprofng -dvi-host: maybe-dvi-intl +dvi-host: maybe-dvi-gettext dvi-host: maybe-dvi-tcl dvi-host: maybe-dvi-itcl dvi-host: maybe-dvi-ld @@ -1574,7 +1579,7 @@ pdf-host: maybe-pdf-isl pdf-host: maybe-pdf-gold pdf-host: maybe-pdf-gprof pdf-host: maybe-pdf-gprofng -pdf-host: maybe-pdf-intl +pdf-host: maybe-pdf-gettext pdf-host: maybe-pdf-tcl pdf-host: maybe-pdf-itcl pdf-host: maybe-pdf-ld @@ -1665,7 +1670,7 @@ html-host: maybe-html-isl html-host: maybe-html-gold html-host: maybe-html-gprof html-host: maybe-html-gprofng -html-host: maybe-html-intl +html-host: maybe-html-gettext html-host: maybe-html-tcl html-host: maybe-html-itcl html-host: maybe-html-ld @@ -1756,7 +1761,7 @@ TAGS-host: maybe-TAGS-isl TAGS-host: maybe-TAGS-gold TAGS-host: maybe-TAGS-gprof TAGS-host: maybe-TAGS-gprofng -TAGS-host: maybe-TAGS-intl +TAGS-host: maybe-TAGS-gettext TAGS-host: maybe-TAGS-tcl TAGS-host: maybe-TAGS-itcl TAGS-host: maybe-TAGS-ld @@ -1847,7 +1852,7 @@ install-info-host: maybe-install-info-isl install-info-host: maybe-install-info-gold install-info-host: maybe-install-info-gprof install-info-host: maybe-install-info-gprofng -install-info-host: maybe-install-info-intl +install-info-host: maybe-install-info-gettext install-info-host: maybe-install-info-tcl install-info-host: maybe-install-info-itcl install-info-host: maybe-install-info-ld @@ -1938,7 +1943,7 @@ install-dvi-host: maybe-install-dvi-isl install-dvi-host: maybe-install-dvi-gold install-dvi-host: maybe-install-dvi-gprof install-dvi-host: maybe-install-dvi-gprofng -install-dvi-host: maybe-install-dvi-intl +install-dvi-host: maybe-install-dvi-gettext install-dvi-host: maybe-install-dvi-tcl install-dvi-host: maybe-install-dvi-itcl install-dvi-host: maybe-install-dvi-ld @@ -2029,7 +2034,7 @@ install-pdf-host: maybe-install-pdf-isl install-pdf-host: maybe-install-pdf-gold install-pdf-host: maybe-install-pdf-gprof install-pdf-host: maybe-install-pdf-gprofng -install-pdf-host: maybe-install-pdf-intl +install-pdf-host: maybe-install-pdf-gettext install-pdf-host: maybe-install-pdf-tcl install-pdf-host: maybe-install-pdf-itcl install-pdf-host: maybe-install-pdf-ld @@ -2120,7 +2125,7 @@ install-html-host: maybe-install-html-isl install-html-host: maybe-install-html-gold install-html-host: maybe-install-html-gprof install-html-host: maybe-install-html-gprofng -install-html-host: maybe-install-html-intl +install-html-host: maybe-install-html-gettext install-html-host: maybe-install-html-tcl install-html-host: maybe-install-html-itcl install-html-host: maybe-install-html-ld @@ -2211,7 +2216,7 @@ installcheck-host: maybe-installcheck-isl installcheck-host: maybe-installcheck-gold installcheck-host: maybe-installcheck-gprof installcheck-host: maybe-installcheck-gprofng -installcheck-host: maybe-installcheck-intl +installcheck-host: maybe-installcheck-gettext installcheck-host: maybe-installcheck-tcl installcheck-host: maybe-installcheck-itcl installcheck-host: maybe-installcheck-ld @@ -2302,7 +2307,7 @@ mostlyclean-host: maybe-mostlyclean-isl mostlyclean-host: maybe-mostlyclean-gold mostlyclean-host: maybe-mostlyclean-gprof mostlyclean-host: maybe-mostlyclean-gprofng -mostlyclean-host: maybe-mostlyclean-intl +mostlyclean-host: maybe-mostlyclean-gettext mostlyclean-host: maybe-mostlyclean-tcl mostlyclean-host: maybe-mostlyclean-itcl mostlyclean-host: maybe-mostlyclean-ld @@ -2393,7 +2398,7 @@ clean-host: maybe-clean-isl clean-host: maybe-clean-gold clean-host: maybe-clean-gprof clean-host: maybe-clean-gprofng -clean-host: maybe-clean-intl +clean-host: maybe-clean-gettext clean-host: maybe-clean-tcl clean-host: maybe-clean-itcl clean-host: maybe-clean-ld @@ -2484,7 +2489,7 @@ distclean-host: maybe-distclean-isl distclean-host: maybe-distclean-gold distclean-host: maybe-distclean-gprof distclean-host: maybe-distclean-gprofng -distclean-host: maybe-distclean-intl +distclean-host: maybe-distclean-gettext distclean-host: maybe-distclean-tcl distclean-host: maybe-distclean-itcl distclean-host: maybe-distclean-ld @@ -2575,7 +2580,7 @@ maintainer-clean-host: maybe-maintainer-clean-isl maintainer-clean-host: maybe-maintainer-clean-gold maintainer-clean-host: maybe-maintainer-clean-gprof maintainer-clean-host: maybe-maintainer-clean-gprofng -maintainer-clean-host: maybe-maintainer-clean-intl +maintainer-clean-host: maybe-maintainer-clean-gettext maintainer-clean-host: maybe-maintainer-clean-tcl maintainer-clean-host: maybe-maintainer-clean-itcl maintainer-clean-host: maybe-maintainer-clean-ld @@ -2724,7 +2729,7 @@ check-host: \ maybe-check-gold \ maybe-check-gprof \ maybe-check-gprofng \ - maybe-check-intl \ + maybe-check-gettext \ maybe-check-tcl \ maybe-check-itcl \ maybe-check-ld \ @@ -2862,7 +2867,7 @@ install-host-nogcc: \ maybe-install-gold \ maybe-install-gprof \ maybe-install-gprofng \ - maybe-install-intl \ + maybe-install-gettext \ maybe-install-tcl \ maybe-install-itcl \ maybe-install-ld \ @@ -2918,7 +2923,7 @@ install-host: \ maybe-install-gold \ maybe-install-gprof \ maybe-install-gprofng \ - maybe-install-intl \ + maybe-install-gettext \ maybe-install-tcl \ maybe-install-itcl \ maybe-install-ld \ @@ -3029,7 +3034,7 @@ install-strip-host: \ maybe-install-strip-gold \ maybe-install-strip-gprof \ maybe-install-strip-gprofng \ - maybe-install-strip-intl \ + maybe-install-strip-gettext \ maybe-install-strip-tcl \ maybe-install-strip-itcl \ maybe-install-strip-ld \ @@ -19797,371 +19802,380 @@ maintainer-clean-gprofng: -.PHONY: configure-intl maybe-configure-intl -maybe-configure-intl: +.PHONY: configure-gettext maybe-configure-gettext +maybe-configure-gettext: @if gcc-bootstrap -configure-intl: stage_current +configure-gettext: stage_current @endif gcc-bootstrap -@if intl -maybe-configure-intl: configure-intl -configure-intl: +@if gettext +maybe-configure-gettext: configure-gettext +configure-gettext: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/intl; \ - cd "$(HOST_SUBDIR)/intl" || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gettext; \ + cd "$(HOST_SUBDIR)/gettext" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) \ $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} \ + --target=${target_alias} --disable-shared --disable-java --disable-csharp --with-pic \ || exit 1 -@endif intl +@endif gettext -.PHONY: configure-stage1-intl maybe-configure-stage1-intl -maybe-configure-stage1-intl: -@if intl-bootstrap -maybe-configure-stage1-intl: configure-stage1-intl -configure-stage1-intl: +.PHONY: configure-stage1-gettext maybe-configure-stage1-gettext +maybe-configure-stage1-gettext: +@if gettext-bootstrap +maybe-configure-stage1-gettext: configure-stage1-gettext +configure-stage1-gettext: @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE1_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ \ - $(STAGE1_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stage2-intl maybe-configure-stage2-intl -maybe-configure-stage2-intl: -@if intl-bootstrap -maybe-configure-stage2-intl: configure-stage2-intl -configure-stage2-intl: + $(STAGE1_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stage2-gettext maybe-configure-stage2-gettext +maybe-configure-stage2-gettext: +@if gettext-bootstrap +maybe-configure-stage2-gettext: configure-stage2-gettext +configure-stage2-gettext: @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE2_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stage3-intl maybe-configure-stage3-intl -maybe-configure-stage3-intl: -@if intl-bootstrap -maybe-configure-stage3-intl: configure-stage3-intl -configure-stage3-intl: + $(STAGE2_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stage3-gettext maybe-configure-stage3-gettext +maybe-configure-stage3-gettext: +@if gettext-bootstrap +maybe-configure-stage3-gettext: configure-stage3-gettext +configure-stage3-gettext: @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE3_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stage4-intl maybe-configure-stage4-intl -maybe-configure-stage4-intl: -@if intl-bootstrap -maybe-configure-stage4-intl: configure-stage4-intl -configure-stage4-intl: + $(STAGE3_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stage4-gettext maybe-configure-stage4-gettext +maybe-configure-stage4-gettext: +@if gettext-bootstrap +maybe-configure-stage4-gettext: configure-stage4-gettext +configure-stage4-gettext: @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE4_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl -maybe-configure-stageprofile-intl: -@if intl-bootstrap -maybe-configure-stageprofile-intl: configure-stageprofile-intl -configure-stageprofile-intl: + $(STAGE4_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stageprofile-gettext maybe-configure-stageprofile-gettext +maybe-configure-stageprofile-gettext: +@if gettext-bootstrap +maybe-configure-stageprofile-gettext: configure-stageprofile-gettext +configure-stageprofile-gettext: @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEprofile_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage profile in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stagetrain-intl maybe-configure-stagetrain-intl -maybe-configure-stagetrain-intl: -@if intl-bootstrap -maybe-configure-stagetrain-intl: configure-stagetrain-intl -configure-stagetrain-intl: + $(STAGEprofile_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stagetrain-gettext maybe-configure-stagetrain-gettext +maybe-configure-stagetrain-gettext: +@if gettext-bootstrap +maybe-configure-stagetrain-gettext: configure-stagetrain-gettext +configure-stagetrain-gettext: @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEtrain_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage train in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage train in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEtrain_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl -maybe-configure-stagefeedback-intl: -@if intl-bootstrap -maybe-configure-stagefeedback-intl: configure-stagefeedback-intl -configure-stagefeedback-intl: + $(STAGEtrain_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stagefeedback-gettext maybe-configure-stagefeedback-gettext +maybe-configure-stagefeedback-gettext: +@if gettext-bootstrap +maybe-configure-stagefeedback-gettext: configure-stagefeedback-gettext +configure-stagefeedback-gettext: @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stageautoprofile-intl maybe-configure-stageautoprofile-intl -maybe-configure-stageautoprofile-intl: -@if intl-bootstrap -maybe-configure-stageautoprofile-intl: configure-stageautoprofile-intl -configure-stageautoprofile-intl: + $(STAGEfeedback_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stageautoprofile-gettext maybe-configure-stageautoprofile-gettext +maybe-configure-stageautoprofile-gettext: +@if gettext-bootstrap +maybe-configure-stageautoprofile-gettext: configure-stageautoprofile-gettext +configure-stageautoprofile-gettext: @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEautoprofile_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage autoprofile in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage autoprofile in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEautoprofile_CONFIGURE_FLAGS) -@endif intl-bootstrap - -.PHONY: configure-stageautofeedback-intl maybe-configure-stageautofeedback-intl -maybe-configure-stageautofeedback-intl: -@if intl-bootstrap -maybe-configure-stageautofeedback-intl: configure-stageautofeedback-intl -configure-stageautofeedback-intl: + $(STAGEautoprofile_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap + +.PHONY: configure-stageautofeedback-gettext maybe-configure-stageautofeedback-gettext +maybe-configure-stageautofeedback-gettext: +@if gettext-bootstrap +maybe-configure-stageautofeedback-gettext: configure-stageautofeedback-gettext +configure-stageautofeedback-gettext: @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEautofeedback_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage autofeedback in $(HOST_SUBDIR)/intl; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ + echo Configuring stage autofeedback in $(HOST_SUBDIR)/gettext; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext; \ + cd $(HOST_SUBDIR)/gettext || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - module_srcdir=intl; \ + module_srcdir=gettext/gettext-runtime; \ $(SHELL) $$s/$$module_srcdir/configure \ --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEautofeedback_CONFIGURE_FLAGS) -@endif intl-bootstrap + $(STAGEautofeedback_CONFIGURE_FLAGS) \ + --disable-shared --disable-java --disable-csharp --with-pic +@endif gettext-bootstrap -.PHONY: all-intl maybe-all-intl -maybe-all-intl: +.PHONY: all-gettext maybe-all-gettext +maybe-all-gettext: @if gcc-bootstrap -all-intl: stage_current +all-gettext: stage_current @endif gcc-bootstrap -@if intl -TARGET-intl=all -maybe-all-intl: all-intl -all-intl: configure-intl +@if gettext +TARGET-gettext=all +maybe-all-gettext: all-gettext +all-gettext: configure-gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-intl)) -@endif intl + $(TARGET-gettext)) +@endif gettext -.PHONY: all-stage1-intl maybe-all-stage1-intl -.PHONY: clean-stage1-intl maybe-clean-stage1-intl -maybe-all-stage1-intl: -maybe-clean-stage1-intl: -@if intl-bootstrap -maybe-all-stage1-intl: all-stage1-intl -all-stage1: all-stage1-intl -TARGET-stage1-intl = $(TARGET-intl) -all-stage1-intl: configure-stage1-intl +.PHONY: all-stage1-gettext maybe-all-stage1-gettext +.PHONY: clean-stage1-gettext maybe-clean-stage1-gettext +maybe-all-stage1-gettext: +maybe-clean-stage1-gettext: +@if gettext-bootstrap +maybe-all-stage1-gettext: all-stage1-gettext +all-stage1: all-stage1-gettext +TARGET-stage1-gettext = $(TARGET-gettext) +all-stage1-gettext: configure-stage1-gettext @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGE1_CFLAGS)" \ @@ -20174,39 +20188,39 @@ all-stage1-intl: configure-stage1-intl $(EXTRA_HOST_FLAGS) \ $(STAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-intl) + $(TARGET-stage1-gettext) -maybe-clean-stage1-intl: clean-stage1-intl -clean-stage1: clean-stage1-intl -clean-stage1-intl: +maybe-clean-stage1-gettext: clean-stage1-gettext +clean-stage1: clean-stage1-gettext +clean-stage1-gettext: @if [ $(current_stage) = stage1 ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stage1-gettext/Makefile ] || exit 0; \ $(MAKE) stage1-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) \ $(STAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stage2-intl maybe-all-stage2-intl -.PHONY: clean-stage2-intl maybe-clean-stage2-intl -maybe-all-stage2-intl: -maybe-clean-stage2-intl: -@if intl-bootstrap -maybe-all-stage2-intl: all-stage2-intl -all-stage2: all-stage2-intl -TARGET-stage2-intl = $(TARGET-intl) -all-stage2-intl: configure-stage2-intl +@endif gettext-bootstrap + + +.PHONY: all-stage2-gettext maybe-all-stage2-gettext +.PHONY: clean-stage2-gettext maybe-clean-stage2-gettext +maybe-all-stage2-gettext: +maybe-clean-stage2-gettext: +@if gettext-bootstrap +maybe-all-stage2-gettext: all-stage2-gettext +all-stage2: all-stage2-gettext +TARGET-stage2-gettext = $(TARGET-gettext) +all-stage2-gettext: configure-stage2-gettext @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGE2_CFLAGS)" \ @@ -20218,38 +20232,38 @@ all-stage2-intl: configure-stage2-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-intl) + $(TARGET-stage2-gettext) -maybe-clean-stage2-intl: clean-stage2-intl -clean-stage2: clean-stage2-intl -clean-stage2-intl: +maybe-clean-stage2-gettext: clean-stage2-gettext +clean-stage2: clean-stage2-gettext +clean-stage2-gettext: @if [ $(current_stage) = stage2 ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stage2-gettext/Makefile ] || exit 0; \ $(MAKE) stage2-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stage3-intl maybe-all-stage3-intl -.PHONY: clean-stage3-intl maybe-clean-stage3-intl -maybe-all-stage3-intl: -maybe-clean-stage3-intl: -@if intl-bootstrap -maybe-all-stage3-intl: all-stage3-intl -all-stage3: all-stage3-intl -TARGET-stage3-intl = $(TARGET-intl) -all-stage3-intl: configure-stage3-intl +@endif gettext-bootstrap + + +.PHONY: all-stage3-gettext maybe-all-stage3-gettext +.PHONY: clean-stage3-gettext maybe-clean-stage3-gettext +maybe-all-stage3-gettext: +maybe-clean-stage3-gettext: +@if gettext-bootstrap +maybe-all-stage3-gettext: all-stage3-gettext +all-stage3: all-stage3-gettext +TARGET-stage3-gettext = $(TARGET-gettext) +all-stage3-gettext: configure-stage3-gettext @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGE3_CFLAGS)" \ @@ -20261,38 +20275,38 @@ all-stage3-intl: configure-stage3-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-intl) + $(TARGET-stage3-gettext) -maybe-clean-stage3-intl: clean-stage3-intl -clean-stage3: clean-stage3-intl -clean-stage3-intl: +maybe-clean-stage3-gettext: clean-stage3-gettext +clean-stage3: clean-stage3-gettext +clean-stage3-gettext: @if [ $(current_stage) = stage3 ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stage3-gettext/Makefile ] || exit 0; \ $(MAKE) stage3-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stage4-intl maybe-all-stage4-intl -.PHONY: clean-stage4-intl maybe-clean-stage4-intl -maybe-all-stage4-intl: -maybe-clean-stage4-intl: -@if intl-bootstrap -maybe-all-stage4-intl: all-stage4-intl -all-stage4: all-stage4-intl -TARGET-stage4-intl = $(TARGET-intl) -all-stage4-intl: configure-stage4-intl +@endif gettext-bootstrap + + +.PHONY: all-stage4-gettext maybe-all-stage4-gettext +.PHONY: clean-stage4-gettext maybe-clean-stage4-gettext +maybe-all-stage4-gettext: +maybe-clean-stage4-gettext: +@if gettext-bootstrap +maybe-all-stage4-gettext: all-stage4-gettext +all-stage4: all-stage4-gettext +TARGET-stage4-gettext = $(TARGET-gettext) +all-stage4-gettext: configure-stage4-gettext @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGE4_CFLAGS)" \ @@ -20304,38 +20318,38 @@ all-stage4-intl: configure-stage4-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGE4_TFLAGS)" \ - $(TARGET-stage4-intl) + $(TARGET-stage4-gettext) -maybe-clean-stage4-intl: clean-stage4-intl -clean-stage4: clean-stage4-intl -clean-stage4-intl: +maybe-clean-stage4-gettext: clean-stage4-gettext +clean-stage4: clean-stage4-gettext +clean-stage4-gettext: @if [ $(current_stage) = stage4 ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stage4-gettext/Makefile ] || exit 0; \ $(MAKE) stage4-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl -.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl -maybe-all-stageprofile-intl: -maybe-clean-stageprofile-intl: -@if intl-bootstrap -maybe-all-stageprofile-intl: all-stageprofile-intl -all-stageprofile: all-stageprofile-intl -TARGET-stageprofile-intl = $(TARGET-intl) -all-stageprofile-intl: configure-stageprofile-intl +@endif gettext-bootstrap + + +.PHONY: all-stageprofile-gettext maybe-all-stageprofile-gettext +.PHONY: clean-stageprofile-gettext maybe-clean-stageprofile-gettext +maybe-all-stageprofile-gettext: +maybe-clean-stageprofile-gettext: +@if gettext-bootstrap +maybe-all-stageprofile-gettext: all-stageprofile-gettext +all-stageprofile: all-stageprofile-gettext +TARGET-stageprofile-gettext = $(TARGET-gettext) +all-stageprofile-gettext: configure-stageprofile-gettext @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGEprofile_CFLAGS)" \ @@ -20347,38 +20361,38 @@ all-stageprofile-intl: configure-stageprofile-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGEprofile_TFLAGS)" \ - $(TARGET-stageprofile-intl) + $(TARGET-stageprofile-gettext) -maybe-clean-stageprofile-intl: clean-stageprofile-intl -clean-stageprofile: clean-stageprofile-intl -clean-stageprofile-intl: +maybe-clean-stageprofile-gettext: clean-stageprofile-gettext +clean-stageprofile: clean-stageprofile-gettext +clean-stageprofile-gettext: @if [ $(current_stage) = stageprofile ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stageprofile-gettext/Makefile ] || exit 0; \ $(MAKE) stageprofile-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stagetrain-intl maybe-all-stagetrain-intl -.PHONY: clean-stagetrain-intl maybe-clean-stagetrain-intl -maybe-all-stagetrain-intl: -maybe-clean-stagetrain-intl: -@if intl-bootstrap -maybe-all-stagetrain-intl: all-stagetrain-intl -all-stagetrain: all-stagetrain-intl -TARGET-stagetrain-intl = $(TARGET-intl) -all-stagetrain-intl: configure-stagetrain-intl +@endif gettext-bootstrap + + +.PHONY: all-stagetrain-gettext maybe-all-stagetrain-gettext +.PHONY: clean-stagetrain-gettext maybe-clean-stagetrain-gettext +maybe-all-stagetrain-gettext: +maybe-clean-stagetrain-gettext: +@if gettext-bootstrap +maybe-all-stagetrain-gettext: all-stagetrain-gettext +all-stagetrain: all-stagetrain-gettext +TARGET-stagetrain-gettext = $(TARGET-gettext) +all-stagetrain-gettext: configure-stagetrain-gettext @[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEtrain_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGEtrain_CFLAGS)" \ @@ -20390,38 +20404,38 @@ all-stagetrain-intl: configure-stagetrain-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGEtrain_TFLAGS)" \ - $(TARGET-stagetrain-intl) + $(TARGET-stagetrain-gettext) -maybe-clean-stagetrain-intl: clean-stagetrain-intl -clean-stagetrain: clean-stagetrain-intl -clean-stagetrain-intl: +maybe-clean-stagetrain-gettext: clean-stagetrain-gettext +clean-stagetrain: clean-stagetrain-gettext +clean-stagetrain-gettext: @if [ $(current_stage) = stagetrain ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stagetrain-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stagetrain-gettext/Makefile ] || exit 0; \ $(MAKE) stagetrain-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl -.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl -maybe-all-stagefeedback-intl: -maybe-clean-stagefeedback-intl: -@if intl-bootstrap -maybe-all-stagefeedback-intl: all-stagefeedback-intl -all-stagefeedback: all-stagefeedback-intl -TARGET-stagefeedback-intl = $(TARGET-intl) -all-stagefeedback-intl: configure-stagefeedback-intl +@endif gettext-bootstrap + + +.PHONY: all-stagefeedback-gettext maybe-all-stagefeedback-gettext +.PHONY: clean-stagefeedback-gettext maybe-clean-stagefeedback-gettext +maybe-all-stagefeedback-gettext: +maybe-clean-stagefeedback-gettext: +@if gettext-bootstrap +maybe-all-stagefeedback-gettext: all-stagefeedback-gettext +all-stagefeedback: all-stagefeedback-gettext +TARGET-stagefeedback-gettext = $(TARGET-gettext) +all-stagefeedback-gettext: configure-stagefeedback-gettext @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGEfeedback_CFLAGS)" \ @@ -20433,38 +20447,38 @@ all-stagefeedback-intl: configure-stagefeedback-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGEfeedback_TFLAGS)" \ - $(TARGET-stagefeedback-intl) + $(TARGET-stagefeedback-gettext) -maybe-clean-stagefeedback-intl: clean-stagefeedback-intl -clean-stagefeedback: clean-stagefeedback-intl -clean-stagefeedback-intl: +maybe-clean-stagefeedback-gettext: clean-stagefeedback-gettext +clean-stagefeedback: clean-stagefeedback-gettext +clean-stagefeedback-gettext: @if [ $(current_stage) = stagefeedback ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stagefeedback-gettext/Makefile ] || exit 0; \ $(MAKE) stagefeedback-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stageautoprofile-intl maybe-all-stageautoprofile-intl -.PHONY: clean-stageautoprofile-intl maybe-clean-stageautoprofile-intl -maybe-all-stageautoprofile-intl: -maybe-clean-stageautoprofile-intl: -@if intl-bootstrap -maybe-all-stageautoprofile-intl: all-stageautoprofile-intl -all-stageautoprofile: all-stageautoprofile-intl -TARGET-stageautoprofile-intl = $(TARGET-intl) -all-stageautoprofile-intl: configure-stageautoprofile-intl +@endif gettext-bootstrap + + +.PHONY: all-stageautoprofile-gettext maybe-all-stageautoprofile-gettext +.PHONY: clean-stageautoprofile-gettext maybe-clean-stageautoprofile-gettext +maybe-all-stageautoprofile-gettext: +maybe-clean-stageautoprofile-gettext: +@if gettext-bootstrap +maybe-all-stageautoprofile-gettext: all-stageautoprofile-gettext +all-stageautoprofile: all-stageautoprofile-gettext +TARGET-stageautoprofile-gettext = $(TARGET-gettext) +all-stageautoprofile-gettext: configure-stageautoprofile-gettext @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEautoprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $$s/gcc/config/i386/$(AUTO_PROFILE) \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGEautoprofile_CFLAGS)" \ @@ -20476,38 +20490,38 @@ all-stageautoprofile-intl: configure-stageautoprofile-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGEautoprofile_TFLAGS)" \ - $(TARGET-stageautoprofile-intl) + $(TARGET-stageautoprofile-gettext) -maybe-clean-stageautoprofile-intl: clean-stageautoprofile-intl -clean-stageautoprofile: clean-stageautoprofile-intl -clean-stageautoprofile-intl: +maybe-clean-stageautoprofile-gettext: clean-stageautoprofile-gettext +clean-stageautoprofile: clean-stageautoprofile-gettext +clean-stageautoprofile-gettext: @if [ $(current_stage) = stageautoprofile ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stageautoprofile-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stageautoprofile-gettext/Makefile ] || exit 0; \ $(MAKE) stageautoprofile-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap - - -.PHONY: all-stageautofeedback-intl maybe-all-stageautofeedback-intl -.PHONY: clean-stageautofeedback-intl maybe-clean-stageautofeedback-intl -maybe-all-stageautofeedback-intl: -maybe-clean-stageautofeedback-intl: -@if intl-bootstrap -maybe-all-stageautofeedback-intl: all-stageautofeedback-intl -all-stageautofeedback: all-stageautofeedback-intl -TARGET-stageautofeedback-intl = $(TARGET-intl) -all-stageautofeedback-intl: configure-stageautofeedback-intl +@endif gettext-bootstrap + + +.PHONY: all-stageautofeedback-gettext maybe-all-stageautofeedback-gettext +.PHONY: clean-stageautofeedback-gettext maybe-clean-stageautofeedback-gettext +maybe-all-stageautofeedback-gettext: +maybe-clean-stageautofeedback-gettext: +@if gettext-bootstrap +maybe-all-stageautofeedback-gettext: all-stageautofeedback-gettext +all-stageautofeedback: all-stageautofeedback-gettext +TARGET-stageautofeedback-gettext = $(TARGET-gettext) +all-stageautofeedback-gettext: configure-stageautofeedback-gettext @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEautofeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(STAGEautofeedback_CFLAGS)" \ @@ -20519,88 +20533,76 @@ all-stageautofeedback-intl: configure-stageautofeedback-intl LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \ - $(TARGET-stageautofeedback-intl) + $(TARGET-stageautofeedback-gettext) -maybe-clean-stageautofeedback-intl: clean-stageautofeedback-intl -clean-stageautofeedback: clean-stageautofeedback-intl -clean-stageautofeedback-intl: +maybe-clean-stageautofeedback-gettext: clean-stageautofeedback-gettext +clean-stageautofeedback: clean-stageautofeedback-gettext +clean-stageautofeedback-gettext: @if [ $(current_stage) = stageautofeedback ]; then \ - [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/gettext/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stageautofeedback-intl/Makefile ] || exit 0; \ + [ -f $(HOST_SUBDIR)/stageautofeedback-gettext/Makefile ] || exit 0; \ $(MAKE) stageautofeedback-start; \ fi; \ - cd $(HOST_SUBDIR)/intl && \ + cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif intl-bootstrap +@endif gettext-bootstrap -.PHONY: check-intl maybe-check-intl -maybe-check-intl: -@if intl -maybe-check-intl: check-intl +.PHONY: check-gettext maybe-check-gettext +maybe-check-gettext: +@if gettext +maybe-check-gettext: check-gettext -check-intl: +check-gettext: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) -@endif intl +@endif gettext -.PHONY: install-intl maybe-install-intl -maybe-install-intl: -@if intl -maybe-install-intl: install-intl +.PHONY: install-gettext maybe-install-gettext +maybe-install-gettext: +@if gettext +maybe-install-gettext: install-gettext -install-intl: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) install) +install-gettext: -@endif intl +@endif gettext -.PHONY: install-strip-intl maybe-install-strip-intl -maybe-install-strip-intl: -@if intl -maybe-install-strip-intl: install-strip-intl +.PHONY: install-strip-gettext maybe-install-strip-gettext +maybe-install-strip-gettext: +@if gettext +maybe-install-strip-gettext: install-strip-gettext -install-strip-intl: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) install-strip) +install-strip-gettext: -@endif intl +@endif gettext # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-intl info-intl -maybe-info-intl: -@if intl -maybe-info-intl: info-intl +.PHONY: maybe-info-gettext info-gettext +maybe-info-gettext: +@if gettext +maybe-info-gettext: info-gettext -info-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ +info-gettext: \ + configure-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing info in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20608,24 +20610,24 @@ info-intl: \ info) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-dvi-intl dvi-intl -maybe-dvi-intl: -@if intl -maybe-dvi-intl: dvi-intl +.PHONY: maybe-dvi-gettext dvi-gettext +maybe-dvi-gettext: +@if gettext +maybe-dvi-gettext: dvi-gettext -dvi-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ +dvi-gettext: \ + configure-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing dvi in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20633,24 +20635,24 @@ dvi-intl: \ dvi) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-pdf-intl pdf-intl -maybe-pdf-intl: -@if intl -maybe-pdf-intl: pdf-intl +.PHONY: maybe-pdf-gettext pdf-gettext +maybe-pdf-gettext: +@if gettext +maybe-pdf-gettext: pdf-gettext -pdf-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ +pdf-gettext: \ + configure-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing pdf in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20658,24 +20660,24 @@ pdf-intl: \ pdf) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-html-intl html-intl -maybe-html-intl: -@if intl -maybe-html-intl: html-intl +.PHONY: maybe-html-gettext html-gettext +maybe-html-gettext: +@if gettext +maybe-html-gettext: html-gettext -html-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ +html-gettext: \ + configure-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing html in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20683,24 +20685,24 @@ html-intl: \ html) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-TAGS-intl TAGS-intl -maybe-TAGS-intl: -@if intl -maybe-TAGS-intl: TAGS-intl +.PHONY: maybe-TAGS-gettext TAGS-gettext +maybe-TAGS-gettext: +@if gettext +maybe-TAGS-gettext: TAGS-gettext -TAGS-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ +TAGS-gettext: \ + configure-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing TAGS in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20708,25 +20710,25 @@ TAGS-intl: \ TAGS) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-install-info-intl install-info-intl -maybe-install-info-intl: -@if intl -maybe-install-info-intl: install-info-intl +.PHONY: maybe-install-info-gettext install-info-gettext +maybe-install-info-gettext: +@if gettext +maybe-install-info-gettext: install-info-gettext -install-info-intl: \ - configure-intl \ - info-intl - @[ -f ./intl/Makefile ] || exit 0; \ +install-info-gettext: \ + configure-gettext \ + info-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing install-info in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20734,25 +20736,25 @@ install-info-intl: \ install-info) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-install-dvi-intl install-dvi-intl -maybe-install-dvi-intl: -@if intl -maybe-install-dvi-intl: install-dvi-intl +.PHONY: maybe-install-dvi-gettext install-dvi-gettext +maybe-install-dvi-gettext: +@if gettext +maybe-install-dvi-gettext: install-dvi-gettext -install-dvi-intl: \ - configure-intl \ - dvi-intl - @[ -f ./intl/Makefile ] || exit 0; \ +install-dvi-gettext: \ + configure-gettext \ + dvi-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-dvi in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing install-dvi in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20760,25 +20762,25 @@ install-dvi-intl: \ install-dvi) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-install-pdf-intl install-pdf-intl -maybe-install-pdf-intl: -@if intl -maybe-install-pdf-intl: install-pdf-intl +.PHONY: maybe-install-pdf-gettext install-pdf-gettext +maybe-install-pdf-gettext: +@if gettext +maybe-install-pdf-gettext: install-pdf-gettext -install-pdf-intl: \ - configure-intl \ - pdf-intl - @[ -f ./intl/Makefile ] || exit 0; \ +install-pdf-gettext: \ + configure-gettext \ + pdf-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing install-pdf in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20786,25 +20788,25 @@ install-pdf-intl: \ install-pdf) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-install-html-intl install-html-intl -maybe-install-html-intl: -@if intl -maybe-install-html-intl: install-html-intl +.PHONY: maybe-install-html-gettext install-html-gettext +maybe-install-html-gettext: +@if gettext +maybe-install-html-gettext: install-html-gettext -install-html-intl: \ - configure-intl \ - html-intl - @[ -f ./intl/Makefile ] || exit 0; \ +install-html-gettext: \ + configure-gettext \ + html-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing install-html in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20812,24 +20814,24 @@ install-html-intl: \ install-html) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-installcheck-intl installcheck-intl -maybe-installcheck-intl: -@if intl -maybe-installcheck-intl: installcheck-intl +.PHONY: maybe-installcheck-gettext installcheck-gettext +maybe-installcheck-gettext: +@if gettext +maybe-installcheck-gettext: installcheck-gettext -installcheck-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ +installcheck-gettext: \ + configure-gettext + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing installcheck in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20837,23 +20839,23 @@ installcheck-intl: \ installcheck) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-mostlyclean-intl mostlyclean-intl -maybe-mostlyclean-intl: -@if intl -maybe-mostlyclean-intl: mostlyclean-intl +.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext +maybe-mostlyclean-gettext: +@if gettext +maybe-mostlyclean-gettext: mostlyclean-gettext -mostlyclean-intl: - @[ -f ./intl/Makefile ] || exit 0; \ +mostlyclean-gettext: + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing mostlyclean in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20861,23 +20863,23 @@ mostlyclean-intl: mostlyclean) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-clean-intl clean-intl -maybe-clean-intl: -@if intl -maybe-clean-intl: clean-intl +.PHONY: maybe-clean-gettext clean-gettext +maybe-clean-gettext: +@if gettext +maybe-clean-gettext: clean-gettext -clean-intl: - @[ -f ./intl/Makefile ] || exit 0; \ +clean-gettext: + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing clean in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20885,23 +20887,23 @@ clean-intl: clean) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-distclean-intl distclean-intl -maybe-distclean-intl: -@if intl -maybe-distclean-intl: distclean-intl +.PHONY: maybe-distclean-gettext distclean-gettext +maybe-distclean-gettext: +@if gettext +maybe-distclean-gettext: distclean-gettext -distclean-intl: - @[ -f ./intl/Makefile ] || exit 0; \ +distclean-gettext: + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing distclean in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20909,23 +20911,23 @@ distclean-intl: distclean) \ || exit 1 -@endif intl +@endif gettext -.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl -maybe-maintainer-clean-intl: -@if intl -maybe-maintainer-clean-intl: maintainer-clean-intl +.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext +maybe-maintainer-clean-gettext: +@if gettext +maybe-maintainer-clean-gettext: maintainer-clean-gettext -maintainer-clean-intl: - @[ -f ./intl/Makefile ] || exit 0; \ +maintainer-clean-gettext: + @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in intl"; \ - (cd $(HOST_SUBDIR)/intl && \ + echo "Doing maintainer-clean in gettext"; \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20933,7 +20935,7 @@ maintainer-clean-intl: maintainer-clean) \ || exit 1 -@endif intl +@endif gettext @@ -62413,11 +62415,11 @@ stage1-start:: mkdir stage1-gold; \ mv stage1-gold gold @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \ - mkdir stage1-intl; \ - mv stage1-intl intl -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stage1-gettext ] || \ + mkdir stage1-gettext; \ + mv stage1-gettext gettext +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \ mkdir stage1-ld; \ @@ -62538,11 +62540,11 @@ stage1-end:: cd $(HOST_SUBDIR); mv gold stage1-gold; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stage1-intl; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stage1-gettext; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stage1-ld; \ @@ -62717,12 +62719,12 @@ stage2-start:: mv stage2-gold gold; \ mv stage1-gold prev-gold || test -f stage1-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \ - mkdir stage2-intl; \ - mv stage2-intl intl; \ - mv stage1-intl prev-intl || test -f stage1-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stage2-gettext ] || \ + mkdir stage2-gettext; \ + mv stage2-gettext gettext; \ + mv stage1-gettext prev-gettext || test -f stage1-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \ mkdir stage2-ld; \ @@ -62867,12 +62869,12 @@ stage2-end:: mv prev-gold stage1-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stage2-intl; \ - mv prev-intl stage1-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stage2-gettext; \ + mv prev-gettext stage1-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stage2-ld; \ @@ -63083,12 +63085,12 @@ stage3-start:: mv stage3-gold gold; \ mv stage2-gold prev-gold || test -f stage2-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \ - mkdir stage3-intl; \ - mv stage3-intl intl; \ - mv stage2-intl prev-intl || test -f stage2-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stage3-gettext ] || \ + mkdir stage3-gettext; \ + mv stage3-gettext gettext; \ + mv stage2-gettext prev-gettext || test -f stage2-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \ mkdir stage3-ld; \ @@ -63233,12 +63235,12 @@ stage3-end:: mv prev-gold stage2-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stage3-intl; \ - mv prev-intl stage2-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stage3-gettext; \ + mv prev-gettext stage2-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stage3-ld; \ @@ -63505,12 +63507,12 @@ stage4-start:: mv stage4-gold gold; \ mv stage3-gold prev-gold || test -f stage3-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \ - mkdir stage4-intl; \ - mv stage4-intl intl; \ - mv stage3-intl prev-intl || test -f stage3-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stage4-gettext ] || \ + mkdir stage4-gettext; \ + mv stage4-gettext gettext; \ + mv stage3-gettext prev-gettext || test -f stage3-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \ mkdir stage4-ld; \ @@ -63655,12 +63657,12 @@ stage4-end:: mv prev-gold stage3-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stage4-intl; \ - mv prev-intl stage3-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stage4-gettext; \ + mv prev-gettext stage3-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stage4-ld; \ @@ -63915,12 +63917,12 @@ stageprofile-start:: mv stageprofile-gold gold; \ mv stage1-gold prev-gold || test -f stage1-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \ - mkdir stageprofile-intl; \ - mv stageprofile-intl intl; \ - mv stage1-intl prev-intl || test -f stage1-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stageprofile-gettext ] || \ + mkdir stageprofile-gettext; \ + mv stageprofile-gettext gettext; \ + mv stage1-gettext prev-gettext || test -f stage1-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \ mkdir stageprofile-ld; \ @@ -64065,12 +64067,12 @@ stageprofile-end:: mv prev-gold stage1-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stageprofile-intl; \ - mv prev-intl stage1-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stageprofile-gettext; \ + mv prev-gettext stage1-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stageprofile-ld; \ @@ -64258,12 +64260,12 @@ stagetrain-start:: mv stagetrain-gold gold; \ mv stageprofile-gold prev-gold || test -f stageprofile-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stagetrain-intl ] || \ - mkdir stagetrain-intl; \ - mv stagetrain-intl intl; \ - mv stageprofile-intl prev-intl || test -f stageprofile-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stagetrain-gettext ] || \ + mkdir stagetrain-gettext; \ + mv stagetrain-gettext gettext; \ + mv stageprofile-gettext prev-gettext || test -f stageprofile-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stagetrain-ld ] || \ mkdir stagetrain-ld; \ @@ -64408,12 +64410,12 @@ stagetrain-end:: mv prev-gold stageprofile-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stagetrain-intl; \ - mv prev-intl stageprofile-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stagetrain-gettext; \ + mv prev-gettext stageprofile-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stagetrain-ld; \ @@ -64601,12 +64603,12 @@ stagefeedback-start:: mv stagefeedback-gold gold; \ mv stagetrain-gold prev-gold || test -f stagetrain-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \ - mkdir stagefeedback-intl; \ - mv stagefeedback-intl intl; \ - mv stagetrain-intl prev-intl || test -f stagetrain-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stagefeedback-gettext ] || \ + mkdir stagefeedback-gettext; \ + mv stagefeedback-gettext gettext; \ + mv stagetrain-gettext prev-gettext || test -f stagetrain-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \ mkdir stagefeedback-ld; \ @@ -64751,12 +64753,12 @@ stagefeedback-end:: mv prev-gold stagetrain-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stagefeedback-intl; \ - mv prev-intl stagetrain-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stagefeedback-gettext; \ + mv prev-gettext stagetrain-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stagefeedback-ld; \ @@ -64967,12 +64969,12 @@ stageautoprofile-start:: mv stageautoprofile-gold gold; \ mv stage1-gold prev-gold || test -f stage1-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stageautoprofile-intl ] || \ - mkdir stageautoprofile-intl; \ - mv stageautoprofile-intl intl; \ - mv stage1-intl prev-intl || test -f stage1-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stageautoprofile-gettext ] || \ + mkdir stageautoprofile-gettext; \ + mv stageautoprofile-gettext gettext; \ + mv stage1-gettext prev-gettext || test -f stage1-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stageautoprofile-ld ] || \ mkdir stageautoprofile-ld; \ @@ -65117,12 +65119,12 @@ stageautoprofile-end:: mv prev-gold stage1-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stageautoprofile-intl; \ - mv prev-intl stage1-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stageautoprofile-gettext; \ + mv prev-gettext stage1-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stageautoprofile-ld; \ @@ -65310,12 +65312,12 @@ stageautofeedback-start:: mv stageautofeedback-gold gold; \ mv stageautoprofile-gold prev-gold || test -f stageautoprofile-lean @endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stageautofeedback-intl ] || \ - mkdir stageautofeedback-intl; \ - mv stageautofeedback-intl intl; \ - mv stageautoprofile-intl prev-intl || test -f stageautoprofile-lean -@endif intl +@if gettext + @cd $(HOST_SUBDIR); [ -d stageautofeedback-gettext ] || \ + mkdir stageautofeedback-gettext; \ + mv stageautofeedback-gettext gettext; \ + mv stageautoprofile-gettext prev-gettext || test -f stageautoprofile-lean +@endif gettext @if ld @cd $(HOST_SUBDIR); [ -d stageautofeedback-ld ] || \ mkdir stageautofeedback-ld; \ @@ -65460,12 +65462,12 @@ stageautofeedback-end:: mv prev-gold stageautoprofile-gold; : ; \ fi @endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl; then \ - cd $(HOST_SUBDIR); mv intl stageautofeedback-intl; \ - mv prev-intl stageautoprofile-intl; : ; \ +@if gettext + @if test -d $(HOST_SUBDIR)/gettext; then \ + cd $(HOST_SUBDIR); mv gettext stageautofeedback-gettext; \ + mv prev-gettext stageautoprofile-gettext; : ; \ fi -@endif intl +@endif gettext @if ld @if test -d $(HOST_SUBDIR)/ld; then \ cd $(HOST_SUBDIR); mv ld stageautofeedback-ld; \ @@ -65794,16 +65796,16 @@ all-build-libiberty: maybe-all-build-texinfo all-build-m4: maybe-all-build-texinfo all-build-fixincludes: maybe-all-build-libiberty all-build-libcpp: maybe-all-build-libiberty -configure-gcc: maybe-configure-intl -configure-stage1-gcc: maybe-configure-stage1-intl -configure-stage2-gcc: maybe-configure-stage2-intl -configure-stage3-gcc: maybe-configure-stage3-intl -configure-stage4-gcc: maybe-configure-stage4-intl -configure-stageprofile-gcc: maybe-configure-stageprofile-intl -configure-stagetrain-gcc: maybe-configure-stagetrain-intl -configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl -configure-stageautoprofile-gcc: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-gcc: maybe-configure-stageautofeedback-intl +configure-gcc: maybe-configure-gettext +configure-stage1-gcc: maybe-configure-stage1-gettext +configure-stage2-gcc: maybe-configure-stage2-gettext +configure-stage3-gcc: maybe-configure-stage3-gettext +configure-stage4-gcc: maybe-configure-stage4-gettext +configure-stageprofile-gcc: maybe-configure-stageprofile-gettext +configure-stagetrain-gcc: maybe-configure-stagetrain-gettext +configure-stagefeedback-gcc: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-gcc: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-gcc: maybe-configure-stageautofeedback-gettext configure-gcc: maybe-all-gmp configure-stage1-gcc: maybe-all-stage1-gmp configure-stage2-gcc: maybe-all-stage2-gmp @@ -65914,16 +65916,16 @@ all-stagetrain-gcc: all-stagetrain-libiberty all-stagefeedback-gcc: all-stagefeedback-libiberty all-stageautoprofile-gcc: all-stageautoprofile-libiberty all-stageautofeedback-gcc: all-stageautofeedback-libiberty -all-gcc: maybe-all-intl -all-stage1-gcc: maybe-all-stage1-intl -all-stage2-gcc: maybe-all-stage2-intl -all-stage3-gcc: maybe-all-stage3-intl -all-stage4-gcc: maybe-all-stage4-intl -all-stageprofile-gcc: maybe-all-stageprofile-intl -all-stagetrain-gcc: maybe-all-stagetrain-intl -all-stagefeedback-gcc: maybe-all-stagefeedback-intl -all-stageautoprofile-gcc: maybe-all-stageautoprofile-intl -all-stageautofeedback-gcc: maybe-all-stageautofeedback-intl +all-gcc: maybe-all-gettext +all-stage1-gcc: maybe-all-stage1-gettext +all-stage2-gcc: maybe-all-stage2-gettext +all-stage3-gcc: maybe-all-stage3-gettext +all-stage4-gcc: maybe-all-stage4-gettext +all-stageprofile-gcc: maybe-all-stageprofile-gettext +all-stagetrain-gcc: maybe-all-stagetrain-gettext +all-stagefeedback-gcc: maybe-all-stagefeedback-gettext +all-stageautoprofile-gcc: maybe-all-stageautoprofile-gettext +all-stageautofeedback-gcc: maybe-all-stageautofeedback-gettext all-gcc: maybe-all-mpfr all-stage1-gcc: maybe-all-stage1-mpfr all-stage2-gcc: maybe-all-stage2-mpfr @@ -66158,16 +66160,16 @@ configure-stagetrain-libcpp: configure-stagetrain-libiberty configure-stagefeedback-libcpp: configure-stagefeedback-libiberty configure-stageautoprofile-libcpp: configure-stageautoprofile-libiberty configure-stageautofeedback-libcpp: configure-stageautofeedback-libiberty -configure-libcpp: maybe-configure-intl -configure-stage1-libcpp: maybe-configure-stage1-intl -configure-stage2-libcpp: maybe-configure-stage2-intl -configure-stage3-libcpp: maybe-configure-stage3-intl -configure-stage4-libcpp: maybe-configure-stage4-intl -configure-stageprofile-libcpp: maybe-configure-stageprofile-intl -configure-stagetrain-libcpp: maybe-configure-stagetrain-intl -configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl -configure-stageautoprofile-libcpp: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-libcpp: maybe-configure-stageautofeedback-intl +configure-libcpp: maybe-configure-gettext +configure-stage1-libcpp: maybe-configure-stage1-gettext +configure-stage2-libcpp: maybe-configure-stage2-gettext +configure-stage3-libcpp: maybe-configure-stage3-gettext +configure-stage4-libcpp: maybe-configure-stage4-gettext +configure-stageprofile-libcpp: maybe-configure-stageprofile-gettext +configure-stagetrain-libcpp: maybe-configure-stagetrain-gettext +configure-stagefeedback-libcpp: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-libcpp: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-libcpp: maybe-configure-stageautofeedback-gettext configure-libcpp: maybe-all-libiconv configure-stage1-libcpp: maybe-all-stage1-libiconv configure-stage2-libcpp: maybe-all-stage2-libiconv @@ -66188,16 +66190,16 @@ all-stagetrain-libcpp: all-stagetrain-libiberty all-stagefeedback-libcpp: all-stagefeedback-libiberty all-stageautoprofile-libcpp: all-stageautoprofile-libiberty all-stageautofeedback-libcpp: all-stageautofeedback-libiberty -all-libcpp: maybe-all-intl -all-stage1-libcpp: maybe-all-stage1-intl -all-stage2-libcpp: maybe-all-stage2-intl -all-stage3-libcpp: maybe-all-stage3-intl -all-stage4-libcpp: maybe-all-stage4-intl -all-stageprofile-libcpp: maybe-all-stageprofile-intl -all-stagetrain-libcpp: maybe-all-stagetrain-intl -all-stagefeedback-libcpp: maybe-all-stagefeedback-intl -all-stageautoprofile-libcpp: maybe-all-stageautoprofile-intl -all-stageautofeedback-libcpp: maybe-all-stageautofeedback-intl +all-libcpp: maybe-all-gettext +all-stage1-libcpp: maybe-all-stage1-gettext +all-stage2-libcpp: maybe-all-stage2-gettext +all-stage3-libcpp: maybe-all-stage3-gettext +all-stage4-libcpp: maybe-all-stage4-gettext +all-stageprofile-libcpp: maybe-all-stageprofile-gettext +all-stagetrain-libcpp: maybe-all-stagetrain-gettext +all-stagefeedback-libcpp: maybe-all-stagefeedback-gettext +all-stageautoprofile-libcpp: maybe-all-stageautoprofile-gettext +all-stageautofeedback-libcpp: maybe-all-stageautofeedback-gettext all-libcpp: maybe-all-libiconv all-stage1-libcpp: maybe-all-stage1-libiconv all-stage2-libcpp: maybe-all-stage2-libiconv @@ -66240,16 +66242,16 @@ all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin all-stageautoprofile-lto-plugin: maybe-all-stageautoprofile-libiberty-linker-plugin all-stageautofeedback-lto-plugin: maybe-all-stageautofeedback-libiberty-linker-plugin all-gotools: maybe-all-target-libgo -configure-intl: maybe-all-libiconv -configure-stage1-intl: maybe-all-stage1-libiconv -configure-stage2-intl: maybe-all-stage2-libiconv -configure-stage3-intl: maybe-all-stage3-libiconv -configure-stage4-intl: maybe-all-stage4-libiconv -configure-stageprofile-intl: maybe-all-stageprofile-libiconv -configure-stagetrain-intl: maybe-all-stagetrain-libiconv -configure-stagefeedback-intl: maybe-all-stagefeedback-libiconv -configure-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv -configure-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv +configure-gettext: maybe-all-libiconv +configure-stage1-gettext: maybe-all-stage1-libiconv +configure-stage2-gettext: maybe-all-stage2-libiconv +configure-stage3-gettext: maybe-all-stage3-libiconv +configure-stage4-gettext: maybe-all-stage4-libiconv +configure-stageprofile-gettext: maybe-all-stageprofile-libiconv +configure-stagetrain-gettext: maybe-all-stagetrain-libiconv +configure-stagefeedback-gettext: maybe-all-stagefeedback-libiconv +configure-stageautoprofile-gettext: maybe-all-stageautoprofile-libiconv +configure-stageautofeedback-gettext: maybe-all-stageautofeedback-libiconv configure-mpfr: maybe-all-gmp configure-stage1-mpfr: maybe-all-stage1-gmp configure-stage2-mpfr: maybe-all-stage2-gmp @@ -66280,16 +66282,16 @@ configure-stagetrain-isl: maybe-all-stagetrain-gmp configure-stagefeedback-isl: maybe-all-stagefeedback-gmp configure-stageautoprofile-isl: maybe-all-stageautoprofile-gmp configure-stageautofeedback-isl: maybe-all-stageautofeedback-gmp -all-intl: maybe-all-libiconv -all-stage1-intl: maybe-all-stage1-libiconv -all-stage2-intl: maybe-all-stage2-libiconv -all-stage3-intl: maybe-all-stage3-libiconv -all-stage4-intl: maybe-all-stage4-libiconv -all-stageprofile-intl: maybe-all-stageprofile-libiconv -all-stagetrain-intl: maybe-all-stagetrain-libiconv -all-stagefeedback-intl: maybe-all-stagefeedback-libiconv -all-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv -all-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv +all-gettext: maybe-all-libiconv +all-stage1-gettext: maybe-all-stage1-libiconv +all-stage2-gettext: maybe-all-stage2-libiconv +all-stage3-gettext: maybe-all-stage3-libiconv +all-stage4-gettext: maybe-all-stage4-libiconv +all-stageprofile-gettext: maybe-all-stageprofile-libiconv +all-stagetrain-gettext: maybe-all-stagetrain-libiconv +all-stagefeedback-gettext: maybe-all-stagefeedback-libiconv +all-stageautoprofile-gettext: maybe-all-stageautoprofile-libiconv +all-stageautofeedback-gettext: maybe-all-stageautofeedback-libiconv configure-gdb: maybe-configure-sim configure-gdb: maybe-all-gnulib configure-gdb: maybe-all-gdbsupport @@ -66319,16 +66321,16 @@ configure-stagetrain-bfd: configure-stagetrain-libiberty configure-stagefeedback-bfd: configure-stagefeedback-libiberty configure-stageautoprofile-bfd: configure-stageautoprofile-libiberty configure-stageautofeedback-bfd: configure-stageautofeedback-libiberty -configure-bfd: maybe-configure-intl -configure-stage1-bfd: maybe-configure-stage1-intl -configure-stage2-bfd: maybe-configure-stage2-intl -configure-stage3-bfd: maybe-configure-stage3-intl -configure-stage4-bfd: maybe-configure-stage4-intl -configure-stageprofile-bfd: maybe-configure-stageprofile-intl -configure-stagetrain-bfd: maybe-configure-stagetrain-intl -configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl -configure-stageautoprofile-bfd: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-bfd: maybe-configure-stageautofeedback-intl +configure-bfd: maybe-configure-gettext +configure-stage1-bfd: maybe-configure-stage1-gettext +configure-stage2-bfd: maybe-configure-stage2-gettext +configure-stage3-bfd: maybe-configure-stage3-gettext +configure-stage4-bfd: maybe-configure-stage4-gettext +configure-stageprofile-bfd: maybe-configure-stageprofile-gettext +configure-stagetrain-bfd: maybe-configure-stagetrain-gettext +configure-stagefeedback-bfd: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-bfd: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-bfd: maybe-configure-stageautofeedback-gettext all-bfd: maybe-all-libiberty all-stage1-bfd: maybe-all-stage1-libiberty all-stage2-bfd: maybe-all-stage2-libiberty @@ -66339,16 +66341,16 @@ all-stagetrain-bfd: maybe-all-stagetrain-libiberty all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty all-stageautoprofile-bfd: maybe-all-stageautoprofile-libiberty all-stageautofeedback-bfd: maybe-all-stageautofeedback-libiberty -all-bfd: maybe-all-intl -all-stage1-bfd: maybe-all-stage1-intl -all-stage2-bfd: maybe-all-stage2-intl -all-stage3-bfd: maybe-all-stage3-intl -all-stage4-bfd: maybe-all-stage4-intl -all-stageprofile-bfd: maybe-all-stageprofile-intl -all-stagetrain-bfd: maybe-all-stagetrain-intl -all-stagefeedback-bfd: maybe-all-stagefeedback-intl -all-stageautoprofile-bfd: maybe-all-stageautoprofile-intl -all-stageautofeedback-bfd: maybe-all-stageautofeedback-intl +all-bfd: maybe-all-gettext +all-stage1-bfd: maybe-all-stage1-gettext +all-stage2-bfd: maybe-all-stage2-gettext +all-stage3-bfd: maybe-all-stage3-gettext +all-stage4-bfd: maybe-all-stage4-gettext +all-stageprofile-bfd: maybe-all-stageprofile-gettext +all-stagetrain-bfd: maybe-all-stagetrain-gettext +all-stagefeedback-bfd: maybe-all-stagefeedback-gettext +all-stageautoprofile-bfd: maybe-all-stageautoprofile-gettext +all-stageautofeedback-bfd: maybe-all-stageautofeedback-gettext all-bfd: maybe-all-zlib all-stage1-bfd: maybe-all-stage1-zlib all-stage2-bfd: maybe-all-stage2-zlib @@ -66389,16 +66391,16 @@ all-stagetrain-opcodes: maybe-all-stagetrain-libiberty all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty all-stageautoprofile-opcodes: maybe-all-stageautoprofile-libiberty all-stageautofeedback-opcodes: maybe-all-stageautofeedback-libiberty -configure-binutils: maybe-configure-intl -configure-stage1-binutils: maybe-configure-stage1-intl -configure-stage2-binutils: maybe-configure-stage2-intl -configure-stage3-binutils: maybe-configure-stage3-intl -configure-stage4-binutils: maybe-configure-stage4-intl -configure-stageprofile-binutils: maybe-configure-stageprofile-intl -configure-stagetrain-binutils: maybe-configure-stagetrain-intl -configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl -configure-stageautoprofile-binutils: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-binutils: maybe-configure-stageautofeedback-intl +configure-binutils: maybe-configure-gettext +configure-stage1-binutils: maybe-configure-stage1-gettext +configure-stage2-binutils: maybe-configure-stage2-gettext +configure-stage3-binutils: maybe-configure-stage3-gettext +configure-stage4-binutils: maybe-configure-stage4-gettext +configure-stageprofile-binutils: maybe-configure-stageprofile-gettext +configure-stagetrain-binutils: maybe-configure-stagetrain-gettext +configure-stagefeedback-binutils: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-binutils: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-binutils: maybe-configure-stageautofeedback-gettext all-binutils: maybe-all-libiberty all-stage1-binutils: maybe-all-stage1-libiberty all-stage2-binutils: maybe-all-stage2-libiberty @@ -66449,16 +66451,16 @@ all-stagetrain-binutils: maybe-all-build-bison all-stagefeedback-binutils: maybe-all-build-bison all-stageautoprofile-binutils: maybe-all-build-bison all-stageautofeedback-binutils: maybe-all-build-bison -all-binutils: maybe-all-intl -all-stage1-binutils: maybe-all-stage1-intl -all-stage2-binutils: maybe-all-stage2-intl -all-stage3-binutils: maybe-all-stage3-intl -all-stage4-binutils: maybe-all-stage4-intl -all-stageprofile-binutils: maybe-all-stageprofile-intl -all-stagetrain-binutils: maybe-all-stagetrain-intl -all-stagefeedback-binutils: maybe-all-stagefeedback-intl -all-stageautoprofile-binutils: maybe-all-stageautoprofile-intl -all-stageautofeedback-binutils: maybe-all-stageautofeedback-intl +all-binutils: maybe-all-gettext +all-stage1-binutils: maybe-all-stage1-gettext +all-stage2-binutils: maybe-all-stage2-gettext +all-stage3-binutils: maybe-all-stage3-gettext +all-stage4-binutils: maybe-all-stage4-gettext +all-stageprofile-binutils: maybe-all-stageprofile-gettext +all-stagetrain-binutils: maybe-all-stagetrain-gettext +all-stagefeedback-binutils: maybe-all-stagefeedback-gettext +all-stageautoprofile-binutils: maybe-all-stageautoprofile-gettext +all-stageautofeedback-binutils: maybe-all-stageautofeedback-gettext all-binutils: maybe-all-gas all-stage1-binutils: maybe-all-stage1-gas all-stage2-binutils: maybe-all-stage2-gas @@ -66521,16 +66523,16 @@ configure-stageautoprofile-opcodes: configure-stageautoprofile-bfd configure-stageautofeedback-opcodes: configure-stageautofeedback-bfd install-opcodes: maybe-install-bfd install-strip-opcodes: maybe-install-strip-bfd -configure-gas: maybe-configure-intl -configure-stage1-gas: maybe-configure-stage1-intl -configure-stage2-gas: maybe-configure-stage2-intl -configure-stage3-gas: maybe-configure-stage3-intl -configure-stage4-gas: maybe-configure-stage4-intl -configure-stageprofile-gas: maybe-configure-stageprofile-intl -configure-stagetrain-gas: maybe-configure-stagetrain-intl -configure-stagefeedback-gas: maybe-configure-stagefeedback-intl -configure-stageautoprofile-gas: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-gas: maybe-configure-stageautofeedback-intl +configure-gas: maybe-configure-gettext +configure-stage1-gas: maybe-configure-stage1-gettext +configure-stage2-gas: maybe-configure-stage2-gettext +configure-stage3-gas: maybe-configure-stage3-gettext +configure-stage4-gas: maybe-configure-stage4-gettext +configure-stageprofile-gas: maybe-configure-stageprofile-gettext +configure-stagetrain-gas: maybe-configure-stagetrain-gettext +configure-stagefeedback-gas: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-gas: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-gas: maybe-configure-stageautofeedback-gettext all-gas: maybe-all-libiberty all-stage1-gas: maybe-all-stage1-libiberty all-stage2-gas: maybe-all-stage2-libiberty @@ -66561,28 +66563,28 @@ all-stagetrain-gas: maybe-all-stagetrain-bfd all-stagefeedback-gas: maybe-all-stagefeedback-bfd all-stageautoprofile-gas: maybe-all-stageautoprofile-bfd all-stageautofeedback-gas: maybe-all-stageautofeedback-bfd -all-gas: maybe-all-intl -all-stage1-gas: maybe-all-stage1-intl -all-stage2-gas: maybe-all-stage2-intl -all-stage3-gas: maybe-all-stage3-intl -all-stage4-gas: maybe-all-stage4-intl -all-stageprofile-gas: maybe-all-stageprofile-intl -all-stagetrain-gas: maybe-all-stagetrain-intl -all-stagefeedback-gas: maybe-all-stagefeedback-intl -all-stageautoprofile-gas: maybe-all-stageautoprofile-intl -all-stageautofeedback-gas: maybe-all-stageautofeedback-intl +all-gas: maybe-all-gettext +all-stage1-gas: maybe-all-stage1-gettext +all-stage2-gas: maybe-all-stage2-gettext +all-stage3-gas: maybe-all-stage3-gettext +all-stage4-gas: maybe-all-stage4-gettext +all-stageprofile-gas: maybe-all-stageprofile-gettext +all-stagetrain-gas: maybe-all-stagetrain-gettext +all-stagefeedback-gas: maybe-all-stagefeedback-gettext +all-stageautoprofile-gas: maybe-all-stageautoprofile-gettext +all-stageautofeedback-gas: maybe-all-stageautofeedback-gettext install-gprofng: maybe-install-opcodes install-gprofng: maybe-install-bfd -configure-ld: maybe-configure-intl -configure-stage1-ld: maybe-configure-stage1-intl -configure-stage2-ld: maybe-configure-stage2-intl -configure-stage3-ld: maybe-configure-stage3-intl -configure-stage4-ld: maybe-configure-stage4-intl -configure-stageprofile-ld: maybe-configure-stageprofile-intl -configure-stagetrain-ld: maybe-configure-stagetrain-intl -configure-stagefeedback-ld: maybe-configure-stagefeedback-intl -configure-stageautoprofile-ld: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-ld: maybe-configure-stageautofeedback-intl +configure-ld: maybe-configure-gettext +configure-stage1-ld: maybe-configure-stage1-gettext +configure-stage2-ld: maybe-configure-stage2-gettext +configure-stage3-ld: maybe-configure-stage3-gettext +configure-stage4-ld: maybe-configure-stage4-gettext +configure-stageprofile-ld: maybe-configure-stageprofile-gettext +configure-stagetrain-ld: maybe-configure-stagetrain-gettext +configure-stagefeedback-ld: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-ld: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-ld: maybe-configure-stageautofeedback-gettext all-ld: maybe-all-libiberty all-stage1-ld: maybe-all-stage1-libiberty all-stage2-ld: maybe-all-stage2-libiberty @@ -66633,16 +66635,16 @@ all-stagetrain-ld: maybe-all-build-flex all-stagefeedback-ld: maybe-all-build-flex all-stageautoprofile-ld: maybe-all-build-flex all-stageautofeedback-ld: maybe-all-build-flex -all-ld: maybe-all-intl -all-stage1-ld: maybe-all-stage1-intl -all-stage2-ld: maybe-all-stage2-intl -all-stage3-ld: maybe-all-stage3-intl -all-stage4-ld: maybe-all-stage4-intl -all-stageprofile-ld: maybe-all-stageprofile-intl -all-stagetrain-ld: maybe-all-stagetrain-intl -all-stagefeedback-ld: maybe-all-stagefeedback-intl -all-stageautoprofile-ld: maybe-all-stageautoprofile-intl -all-stageautofeedback-ld: maybe-all-stageautofeedback-intl +all-ld: maybe-all-gettext +all-stage1-ld: maybe-all-stage1-gettext +all-stage2-ld: maybe-all-stage2-gettext +all-stage3-ld: maybe-all-stage3-gettext +all-stage4-ld: maybe-all-stage4-gettext +all-stageprofile-ld: maybe-all-stageprofile-gettext +all-stagetrain-ld: maybe-all-stagetrain-gettext +all-stagefeedback-ld: maybe-all-stagefeedback-gettext +all-stageautoprofile-ld: maybe-all-stageautoprofile-gettext +all-stageautofeedback-ld: maybe-all-stageautofeedback-gettext all-ld: maybe-all-gas all-stage1-ld: maybe-all-stage1-gas all-stage2-ld: maybe-all-stage2-gas @@ -66665,16 +66667,16 @@ all-stageautoprofile-ld: maybe-all-stageautoprofile-binutils all-stageautofeedback-ld: maybe-all-stageautofeedback-binutils install-ld: maybe-install-gold install-strip-ld: maybe-install-strip-gold -configure-gold: maybe-configure-intl -configure-stage1-gold: maybe-configure-stage1-intl -configure-stage2-gold: maybe-configure-stage2-intl -configure-stage3-gold: maybe-configure-stage3-intl -configure-stage4-gold: maybe-configure-stage4-intl -configure-stageprofile-gold: maybe-configure-stageprofile-intl -configure-stagetrain-gold: maybe-configure-stagetrain-intl -configure-stagefeedback-gold: maybe-configure-stagefeedback-intl -configure-stageautoprofile-gold: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-gold: maybe-configure-stageautofeedback-intl +configure-gold: maybe-configure-gettext +configure-stage1-gold: maybe-configure-stage1-gettext +configure-stage2-gold: maybe-configure-stage2-gettext +configure-stage3-gold: maybe-configure-stage3-gettext +configure-stage4-gold: maybe-configure-stage4-gettext +configure-stageprofile-gold: maybe-configure-stageprofile-gettext +configure-stagetrain-gold: maybe-configure-stagetrain-gettext +configure-stagefeedback-gold: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-gold: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-gold: maybe-configure-stageautofeedback-gettext all-gold: maybe-all-libiberty all-stage1-gold: maybe-all-stage1-libiberty all-stage2-gold: maybe-all-stage2-libiberty @@ -66685,16 +66687,16 @@ all-stagetrain-gold: maybe-all-stagetrain-libiberty all-stagefeedback-gold: maybe-all-stagefeedback-libiberty all-stageautoprofile-gold: maybe-all-stageautoprofile-libiberty all-stageautofeedback-gold: maybe-all-stageautofeedback-libiberty -all-gold: maybe-all-intl -all-stage1-gold: maybe-all-stage1-intl -all-stage2-gold: maybe-all-stage2-intl -all-stage3-gold: maybe-all-stage3-intl -all-stage4-gold: maybe-all-stage4-intl -all-stageprofile-gold: maybe-all-stageprofile-intl -all-stagetrain-gold: maybe-all-stagetrain-intl -all-stagefeedback-gold: maybe-all-stagefeedback-intl -all-stageautoprofile-gold: maybe-all-stageautoprofile-intl -all-stageautofeedback-gold: maybe-all-stageautofeedback-intl +all-gold: maybe-all-gettext +all-stage1-gold: maybe-all-stage1-gettext +all-stage2-gold: maybe-all-stage2-gettext +all-stage3-gold: maybe-all-stage3-gettext +all-stage4-gold: maybe-all-stage4-gettext +all-stageprofile-gold: maybe-all-stageprofile-gettext +all-stagetrain-gold: maybe-all-stagetrain-gettext +all-stagefeedback-gold: maybe-all-stagefeedback-gettext +all-stageautoprofile-gold: maybe-all-stageautoprofile-gettext +all-stageautofeedback-gold: maybe-all-stageautofeedback-gettext all-gold: maybe-all-bfd all-stage1-gold: maybe-all-stage1-bfd all-stage2-gold: maybe-all-stage2-bfd @@ -66745,16 +66747,16 @@ check-stagetrain-gold: maybe-all-stagetrain-gas check-stagefeedback-gold: maybe-all-stagefeedback-gas check-stageautoprofile-gold: maybe-all-stageautoprofile-gas check-stageautofeedback-gold: maybe-all-stageautofeedback-gas -configure-opcodes: maybe-configure-intl -configure-stage1-opcodes: maybe-configure-stage1-intl -configure-stage2-opcodes: maybe-configure-stage2-intl -configure-stage3-opcodes: maybe-configure-stage3-intl -configure-stage4-opcodes: maybe-configure-stage4-intl -configure-stageprofile-opcodes: maybe-configure-stageprofile-intl -configure-stagetrain-opcodes: maybe-configure-stagetrain-intl -configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl -configure-stageautoprofile-opcodes: maybe-configure-stageautoprofile-intl -configure-stageautofeedback-opcodes: maybe-configure-stageautofeedback-intl +configure-opcodes: maybe-configure-gettext +configure-stage1-opcodes: maybe-configure-stage1-gettext +configure-stage2-opcodes: maybe-configure-stage2-gettext +configure-stage3-opcodes: maybe-configure-stage3-gettext +configure-stage4-opcodes: maybe-configure-stage4-gettext +configure-stageprofile-opcodes: maybe-configure-stageprofile-gettext +configure-stagetrain-opcodes: maybe-configure-stagetrain-gettext +configure-stagefeedback-opcodes: maybe-configure-stagefeedback-gettext +configure-stageautoprofile-opcodes: maybe-configure-stageautoprofile-gettext +configure-stageautofeedback-opcodes: maybe-configure-stageautofeedback-gettext all-opcodes: maybe-all-bfd all-stage1-opcodes: maybe-all-stage1-bfd all-stage2-opcodes: maybe-all-stage2-bfd @@ -66775,16 +66777,16 @@ all-stagetrain-opcodes: maybe-all-stagetrain-libiberty all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty all-stageautoprofile-opcodes: maybe-all-stageautoprofile-libiberty all-stageautofeedback-opcodes: maybe-all-stageautofeedback-libiberty -all-opcodes: maybe-all-intl -all-stage1-opcodes: maybe-all-stage1-intl -all-stage2-opcodes: maybe-all-stage2-intl -all-stage3-opcodes: maybe-all-stage3-intl -all-stage4-opcodes: maybe-all-stage4-intl -all-stageprofile-opcodes: maybe-all-stageprofile-intl -all-stagetrain-opcodes: maybe-all-stagetrain-intl -all-stagefeedback-opcodes: maybe-all-stagefeedback-intl -all-stageautoprofile-opcodes: maybe-all-stageautoprofile-intl -all-stageautofeedback-opcodes: maybe-all-stageautofeedback-intl +all-opcodes: maybe-all-gettext +all-stage1-opcodes: maybe-all-stage1-gettext +all-stage2-opcodes: maybe-all-stage2-gettext +all-stage3-opcodes: maybe-all-stage3-gettext +all-stage4-opcodes: maybe-all-stage4-gettext +all-stageprofile-opcodes: maybe-all-stageprofile-gettext +all-stagetrain-opcodes: maybe-all-stagetrain-gettext +all-stagefeedback-opcodes: maybe-all-stagefeedback-gettext +all-stageautoprofile-opcodes: maybe-all-stageautoprofile-gettext +all-stageautofeedback-opcodes: maybe-all-stageautofeedback-gettext all-dejagnu: maybe-all-tcl all-dejagnu: maybe-all-expect all-dejagnu: maybe-all-tk @@ -66849,16 +66851,16 @@ configure-stagetrain-libctf: maybe-all-stagetrain-bfd configure-stagefeedback-libctf: maybe-all-stagefeedback-bfd configure-stageautoprofile-libctf: maybe-all-stageautoprofile-bfd configure-stageautofeedback-libctf: maybe-all-stageautofeedback-bfd -configure-libctf: maybe-all-intl -configure-stage1-libctf: maybe-all-stage1-intl -configure-stage2-libctf: maybe-all-stage2-intl -configure-stage3-libctf: maybe-all-stage3-intl -configure-stage4-libctf: maybe-all-stage4-intl -configure-stageprofile-libctf: maybe-all-stageprofile-intl -configure-stagetrain-libctf: maybe-all-stagetrain-intl -configure-stagefeedback-libctf: maybe-all-stagefeedback-intl -configure-stageautoprofile-libctf: maybe-all-stageautoprofile-intl -configure-stageautofeedback-libctf: maybe-all-stageautofeedback-intl +configure-libctf: maybe-all-gettext +configure-stage1-libctf: maybe-all-stage1-gettext +configure-stage2-libctf: maybe-all-stage2-gettext +configure-stage3-libctf: maybe-all-stage3-gettext +configure-stage4-libctf: maybe-all-stage4-gettext +configure-stageprofile-libctf: maybe-all-stageprofile-gettext +configure-stagetrain-libctf: maybe-all-stagetrain-gettext +configure-stagefeedback-libctf: maybe-all-stagefeedback-gettext +configure-stageautoprofile-libctf: maybe-all-stageautoprofile-gettext +configure-stageautofeedback-libctf: maybe-all-stageautofeedback-gettext configure-libctf: maybe-all-zlib configure-stage1-libctf: maybe-all-stage1-zlib configure-stage2-libctf: maybe-all-stage2-zlib @@ -67031,7 +67033,7 @@ all-c++tools: maybe-all-gcc all-utils: maybe-all-libiberty configure-gdb: maybe-all-gmp configure-gdb: maybe-all-mpfr -configure-gdb: maybe-all-intl +configure-gdb: maybe-all-gettext configure-gdb: maybe-all-bfd configure-gdb: maybe-all-libiconv all-gdb: maybe-all-libiberty @@ -67041,33 +67043,33 @@ all-gdb: maybe-all-libdecnumber all-gdb: maybe-all-libctf all-gdb: maybe-all-libbacktrace all-gdbserver: maybe-all-libiberty -configure-gdbsupport: maybe-configure-intl -all-gdbsupport: maybe-all-intl -configure-gprof: maybe-configure-intl +configure-gdbsupport: maybe-configure-gettext +all-gdbsupport: maybe-all-gettext +configure-gprof: maybe-configure-gettext all-gprof: maybe-all-libiberty all-gprof: maybe-all-bfd all-gprof: maybe-all-opcodes -all-gprof: maybe-all-intl +all-gprof: maybe-all-gettext all-gprof: maybe-all-gas -configure-gprofng: maybe-configure-intl +configure-gprofng: maybe-configure-gettext all-gprofng: maybe-all-libiberty all-gprofng: maybe-all-bfd all-gprofng: maybe-all-opcodes -all-gprofng: maybe-all-intl +all-gprofng: maybe-all-gettext all-gprofng: maybe-all-gas all-sid: maybe-all-libiberty all-sid: maybe-all-bfd all-sid: maybe-all-opcodes -configure-sim: maybe-configure-intl -all-sim: maybe-all-intl +configure-sim: maybe-configure-gettext +all-sim: maybe-all-gettext all-sim: maybe-all-libiberty all-sim: maybe-all-bfd all-sim: maybe-all-opcodes all-fastjar: maybe-all-zlib all-fastjar: maybe-all-libiberty -all-bison: maybe-all-intl -all-flex: maybe-all-intl -all-m4: maybe-all-intl +all-bison: maybe-all-gettext +all-flex: maybe-all-gettext +all-m4: maybe-all-gettext configure-target-fastjar: maybe-configure-target-zlib all-target-fastjar: maybe-all-target-zlib configure-target-libgo: maybe-all-target-libstdc++-v3 diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4 index e8e6b66..5bb385f 100644 --- a/config/gettext-sister.m4 +++ b/config/gettext-sister.m4 @@ -10,19 +10,30 @@ # the necessary substitutions and definitions for this directory. AC_DEFUN([ZW_GNU_GETTEXT_SISTER_DIR], -[# If we haven't got the data from the intl directory, -# assume NLS is disabled. -USE_NLS=no AC_SUBST(USE_NLS) -LIBINTL= AC_SUBST(LIBINTL) -LIBINTL_DEP= AC_SUBST(LIBINTL_DEP) -INCINTL= AC_SUBST(INCINTL) -XGETTEXT= AC_SUBST(XGETTEXT) -GMSGFMT= AC_SUBST(GMSGFMT) -POSUB= AC_SUBST(POSUB) - -if test -f ifelse([$1],,[../intl],[$1])/config.intl; then - . ifelse([$1],,[../intl],[$1])/config.intl +[ +m4_pushdef([gettext_builddir], + m4_default([$1], [../gettext])) +m4_pushdef([gettext_cfg], + gettext_builddir[/uninstalled-config.sh]) +if test -f gettext_cfg; then + relative_builddir='[$(top_builddir)/]gettext_builddir' + . gettext_cfg +else + # The sister gettext directory doesn't exist and won't collect information on + # using gettext for us. Call a bundled AM_GNU_GETTEXT. + AM_GNU_GETTEXT([external]) fi +m4_popdef([gettext_cfg]) +m4_popdef([gettext_builddir]) + +AC_SUBST([USE_NLS]) +AC_SUBST([LIBINTL]) +AC_SUBST([LIBINTL_DEP]) +AC_SUBST([INCINTL]) +AC_SUBST([XGETTEXT]) +AC_SUBST([GMSGFMT]) +AC_SUBST([POSUB]) + AC_MSG_CHECKING([whether NLS is requested]) if test x"$USE_NLS" != xyes; then AC_MSG_RESULT(no) diff --git a/config/gettext.m4 b/config/gettext.m4 index 5b42bb1..f449240 100644 --- a/config/gettext.m4 +++ b/config/gettext.m4 @@ -1,43 +1,39 @@ -# gettext.m4 serial 20 (gettext-0.12) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# gettext.m4 serial 72 (gettext-0.21.1) +dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl INTLSYMBOL must be one of 'external', 'use-libtool'. +dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and +dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. dnl If INTLSYMBOL is 'use-libtool', then a libtool library dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. +dnl AM-DISABLE-SHARED). dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl implementations (in libc or libintl) without the ngettext() function dnl will be ignored. If NEEDSYMBOL is specified and is dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. +dnl the value '$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled @@ -59,17 +55,22 @@ dnl AC_DEFUN([AM_GNU_GETTEXT], [ dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + m4_if([$1], [], , [m4_if([$1], [external], , [m4_if([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , +])])])]) + m4_if(m4_if([$1], [], [old])[]m4_if([$1], [no-libtool], [old]), [old], + [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. +])]) + m4_if([$2], [], , [m4_if([$2], [need-ngettext], , [m4_if([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + define([gt_included_intl], + m4_if([$1], [external], [no], [yes])) + gt_NEEDS_INIT + AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ AC_REQUIRE([AM_INTL_SUBDIR])dnl ]) @@ -80,22 +81,24 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl Sometimes libintl requires libiconv, so first search for libiconv. dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ + dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. + m4_if(gt_included_intl, yes, , [ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX + dnl Set USE_NLS. - AM_NLS + AC_REQUIRE([AM_NLS]) - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no ]) @@ -103,16 +106,25 @@ AC_DEFUN([AM_GNU_GETTEXT], LTLIBINTL= POSUB= + dnl Add a version number to the cache macros. + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -121,13 +133,29 @@ AC_DEFUN([AM_GNU_GETTEXT], dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include <libintl.h> + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> #ifndef __GNU_GETTEXT_SUPPORTED_REVISION extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; @@ -135,22 +163,18 @@ extern int *_nl_domain_bindings; #else #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #endif -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], []), - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + __GNU_GETTEXT_SYMBOL_EXPRESSION], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) - - if test "$gt_cv_func_gnugettext_libc" != "yes"; then +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [eval "$gt_func_gnugettext_libc=yes"], + [eval "$gt_func_gnugettext_libc=no"])]) + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ + m4_if(gt_included_intl, yes, , [ AM_ICONV_LINK ]) dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL @@ -159,65 +183,63 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, + [$gt_func_gnugettext_libintl], [gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include <libintl.h> + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> #ifndef __GNU_GETTEXT_SUPPORTED_REVISION extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (); -#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (0)) +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) #else #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #endif -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], []), - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + __GNU_GETTEXT_SYMBOL_EXPRESSION], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [eval "$gt_func_gnugettext_libintl=yes"], + [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <libintl.h> + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <libintl.h> #ifndef __GNU_GETTEXT_SUPPORTED_REVISION extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (); -#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (0)) +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) #else #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #endif -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], []), - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + __GNU_GETTEXT_SYMBOL_EXPRESSION], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes - ]) +$gt_revision_test_code + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) @@ -227,8 +249,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", dnl use it. But if this macro is used in GNU gettext, and GNU dnl gettext is already preinstalled in libintl, we update this dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -239,7 +261,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", INCINTL= fi - ifelse(gt_included_intl, yes, [ + m4_if(gt_included_intl, yes, [ if test "$gt_use_preinstalled_gnugettext" != "yes"; then dnl GNU gettext is not found in the C library. dnl Fall back on included GNU gettext library. @@ -251,11 +273,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", dnl Mark actions used to generate GNU NLS library. BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" + LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + CATOBJEXT= if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions to use GNU gettext tools. @@ -263,9 +286,18 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", fi ]) + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Some extra flags are needed during linking. + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -278,7 +310,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", if test "$USE_NLS" = "yes"; then AC_MSG_CHECKING([where the gettext function comes from]) if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -292,16 +324,16 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then AC_MSG_CHECKING([how to link with libintl]) AC_MSG_RESULT([$LIBINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -309,125 +341,46 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", POSUB=po fi - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi + m4_if(gt_included_intl, yes, [ + dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' + dnl because some of the testsuite requires it. + BUILD_INCLUDED_LIBINTL=yes dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) - - dnl For backward compatibility. Some configure.acs may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - - dnl For backward compatibility. Some Makefiles may be using this. - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST(INTLOBJS) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], [ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \ -__fsetlocking]) - - AM_ICONV - AM_LANGINFO_CODESET - if test $ac_cv_header_locale_h = yes; then - AM_LC_MESSAGES - fi + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) +]) - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi + +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], +[ + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) ]) dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + + +dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) diff --git a/config/iconv.m4 b/config/iconv.m4 index f1e54c5..ff5d526 100644 --- a/config/iconv.m4 +++ b/config/iconv.m4 @@ -1,13 +1,17 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# iconv.m4 serial 26 +dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -dnl with modifications to support building with in-tree libiconv + +AC_PREREQ([2.64]) + +dnl Note: AM_ICONV is documented in the GNU gettext manual +dnl <https://www.gnu.org/software/gettext/manual/html_node/AM_005fICONV.html>. +dnl Don't make changes that are incompatible with that documentation! AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], [ @@ -24,107 +28,266 @@ AC_DEFUN([AM_ICONV_LINK], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - dnl Add $INCICONV to CPPFLAGS before performing the first check, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. This first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCICONV" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - CPPFLAGS="$am_save_CPPFLAGS" - - if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then - for _libs in .libs _libs; do - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS -I../libiconv/include" - LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <stdlib.h> +#include <iconv.h> + ]], + [[iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - INCICONV="-I../libiconv/include" - LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a - LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - break - fi - done - fi - + iconv_close(cd);]])], + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - CPPFLAGS="$am_save_CPPFLAGS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <stdlib.h> +#include <iconv.h> + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, + dnl Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include <iconv.h> +#include <string.h> + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + ]], + [[int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; +]])], + [am_cv_func_iconv_works=yes], , + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_MSG_CHECKING([how to link with libiconv]) AC_MSG_RESULT([$LIBICONV]) else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +AC_DEFUN_ONCE([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ + AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature], + [gl_cv_iconv_nonconst], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include <stdlib.h> #include <iconv.h> extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) + ]], + [[]])], + [gl_cv_iconv_nonconst=yes], + [gl_cv_iconv_nonconst=no]) + ]) + else + dnl When compiling GNU libiconv on a system that does not have iconv yet, + dnl pick the POSIX compliant declaration without 'const'. + gl_cv_iconv_nonconst=yes + fi + if test $gl_cv_iconv_nonconst = yes; then + iconv_arg1="" + else + iconv_arg1="const" + fi + AC_DEFINE_UNQUOTED([ICONV_CONST], [$iconv_arg1], + [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test $gl_cv_iconv_nonconst != yes; then + ICONV_CONST="const" + fi + ]) + + dnl A summary result, for those packages which want to print a summary at the + dnl end of the configuration. + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi fi ]) diff --git a/config/intlmacosx.m4 b/config/intlmacosx.m4 new file mode 100644 index 0000000..3141bf8 --- /dev/null +++ b/config/intlmacosx.m4 @@ -0,0 +1,69 @@ +# intlmacosx.m4 serial 9 (gettext-0.22.3) +dnl Copyright (C) 2004-2014, 2016, 2019-2023 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Lesser General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Lesser General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.4. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <CoreFoundation/CFPreferences.h>]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent, + dnl because in macOS 10.13.4 it has the following behaviour: + dnl When two or more languages are specified in the + dnl "System Preferences > Language & Region > Preferred Languages" panel, + dnl it returns en_CC where CC is the territory (even when English is not among + dnl the preferred languages!). What we want instead is what + dnl CFLocaleCopyCurrent returned in earlier macOS releases and what + dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the + dnl first among the preferred languages and CC is the territory. + AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <CoreFoundation/CFLocale.h>]], + [[CFLocaleCopyPreferredLanguages();]])], + [gt_cv_func_CFLocaleCopyPreferredLanguages=yes], + [gt_cv_func_CFLocaleCopyPreferredLanguages=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ + || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + dnl Starting with macOS version 14, CoreFoundation relies on CoreServices, + dnl and we have to link it in explicitly, otherwise an exception + dnl NSInvalidArgumentException "unrecognized selector sent to instance" + dnl occurs. + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) @@ -2829,7 +2829,7 @@ build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" # these libraries are used by various programs built for the host environment #f -host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe" +host_libs="gettext libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -10120,7 +10120,8 @@ serialization_dependencies=serdep.tmp # files altogether, and which should be passed on to subconfigures. # Also strip program-prefix, program-suffix, and program-transform-name, # so that we can pass down a consistent program-transform-name. -baseargs= +hbaseargs= +bbaseargs= tbaseargs= keep_next=no skip_next=no @@ -10136,7 +10137,8 @@ do *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - baseargs="$baseargs '$ac_arg'" + hbaseargs="$hbaseargs '$ac_arg'" + bbaseargs="$bbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'" keep_next=no continue @@ -10160,6 +10162,7 @@ do esac skip_targ=no + skip_barg=no case $ac_arg in --with-* | --without-*) @@ -10172,6 +10175,12 @@ do *[-_]lib) lib=`echo "$libopt" | sed 's,[-_]lib$,,'` ;; + *[-_]prefix) + lib=`echo "$libopt" | sed 's,[-_]prefix$,,'` + ;; + *[-_]type) + lib=`echo "$libopt" | sed 's,[-_]type$,,'` + ;; *) lib=$libopt ;; @@ -10188,6 +10197,11 @@ do skip_targ=yes fi ;; + libintl | libiconv) + # We don't want libintl (and co.) in anything but the host arguments. + skip_targ=yes + skip_barg=yes + ;; esac ;; esac @@ -10196,7 +10210,8 @@ do --cache-file=/dev/null | \ -cache-file=/dev/null ) # Handled here to avoid the test to skip args below. - baseargs="$baseargs '$ac_arg'" + hbaseargs="$hbaseargs '$ac_arg'" + bbaseargs="$bbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'" # Assert: $separate_arg should always be no. keep_next=$separate_arg @@ -10227,7 +10242,10 @@ do *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - baseargs="$baseargs '$ac_arg'" + hbaseargs="$hbaseargs '$ac_arg'" + if test X"$skip_barg" = Xno; then + bbaseargs="$bbaseargs '$ac_arg'" + fi if test X"$skip_targ" = Xno; then tbaseargs="$tbaseargs '$ac_arg'" fi @@ -10242,7 +10260,8 @@ do done # Remove the initial space we just introduced and, as these will be # expanded by make, quote '$'. -baseargs=`echo "x$baseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` +hbaseargs=`echo "x$hbaseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` +bbaseargs=`echo "x$bbaseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` # Add in --program-transform-name, after --program-prefix and # --program-suffix have been applied to it. Autoconf has already @@ -10256,14 +10275,17 @@ ${program_transform_name} EOF_SED gcc_transform_name=`cat conftestsed.out` rm -f conftestsed.out -baseargs="$baseargs --program-transform-name='${gcc_transform_name}'" +hbaseargs="$hbaseargs --program-transform-name='${gcc_transform_name}'" +bbaseargs="$bbaseargs --program-transform-name='${gcc_transform_name}'" tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'" if test "$silent" = yes; then - baseargs="$baseargs --silent" + bbaseargs="$bbaseargs --silent" + hbaseargs="$hbaseargs --silent" tbaseargs="$tbaseargs --silent" fi -baseargs="$baseargs --disable-option-checking" +bbaseargs="$bbaseargs --disable-option-checking" +hbaseargs="$hbaseargs --disable-option-checking" tbaseargs="$tbaseargs --disable-option-checking" if test "$enable_year2038" = no; then @@ -10281,7 +10303,7 @@ fi # desired. We can't even use the same cache file for all build-side # libraries, as they're compiled differently; some with C, some with # C++ or with different feature-enabling options. -build_configargs="$build_configargs --cache-file=./config.cache ${baseargs}" +build_configargs="$build_configargs --cache-file=./config.cache ${bbaseargs}" # For host modules, accept cache file option, or specification as blank. case "${cache_file}" in @@ -10295,7 +10317,7 @@ esac # Host dirs don't like to share a cache file either, horribly enough. # This seems to be due to autoconf 2.5x stupidity. -host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${baseargs}" +host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${hbaseargs}" target_configargs="$target_configargs ${tbaseargs}" diff --git a/configure.ac b/configure.ac index 692dc71..d549098 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" # these libraries are used by various programs built for the host environment #f -host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe" +host_libs="gettext libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libcody libdecnumber gmp mpfr mpc isl libiconv libctf libsframe" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -3239,7 +3239,8 @@ AC_SUBST_FILE(serialization_dependencies) # files altogether, and which should be passed on to subconfigures. # Also strip program-prefix, program-suffix, and program-transform-name, # so that we can pass down a consistent program-transform-name. -baseargs= +hbaseargs= +bbaseargs= tbaseargs= keep_next=no skip_next=no @@ -3255,7 +3256,8 @@ do *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - baseargs="$baseargs '$ac_arg'" + hbaseargs="$hbaseargs '$ac_arg'" + bbaseargs="$bbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'" keep_next=no continue @@ -3279,6 +3281,7 @@ do esac skip_targ=no + skip_barg=no case $ac_arg in changequote(,) --with-* | --without-*) @@ -3291,6 +3294,12 @@ changequote(,) *[-_]lib) lib=`echo "$libopt" | sed 's,[-_]lib$,,'` ;; + *[-_]prefix) + lib=`echo "$libopt" | sed 's,[-_]prefix$,,'` + ;; + *[-_]type) + lib=`echo "$libopt" | sed 's,[-_]type$,,'` + ;; *) lib=$libopt ;; @@ -3307,6 +3316,11 @@ changequote([,]) skip_targ=yes fi ;; + libintl | libiconv) + # We don't want libintl (and co.) in anything but the host arguments. + skip_targ=yes + skip_barg=yes + ;; esac ;; esac @@ -3315,7 +3329,8 @@ changequote([,]) --cache-file=/dev/null | \ -cache-file=/dev/null ) # Handled here to avoid the test to skip args below. - baseargs="$baseargs '$ac_arg'" + hbaseargs="$hbaseargs '$ac_arg'" + bbaseargs="$bbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'" # Assert: $separate_arg should always be no. keep_next=$separate_arg @@ -3346,7 +3361,10 @@ changequote([,]) *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - baseargs="$baseargs '$ac_arg'" + hbaseargs="$hbaseargs '$ac_arg'" + if test X"$skip_barg" = Xno; then + bbaseargs="$bbaseargs '$ac_arg'" + fi if test X"$skip_targ" = Xno; then tbaseargs="$tbaseargs '$ac_arg'" fi @@ -3361,7 +3379,8 @@ changequote([,]) done # Remove the initial space we just introduced and, as these will be # expanded by make, quote '$'. -baseargs=`echo "x$baseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` +hbaseargs=`echo "x$hbaseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` +bbaseargs=`echo "x$bbaseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` # Add in --program-transform-name, after --program-prefix and # --program-suffix have been applied to it. Autoconf has already @@ -3375,14 +3394,17 @@ ${program_transform_name} EOF_SED gcc_transform_name=`cat conftestsed.out` rm -f conftestsed.out -baseargs="$baseargs --program-transform-name='${gcc_transform_name}'" +hbaseargs="$hbaseargs --program-transform-name='${gcc_transform_name}'" +bbaseargs="$bbaseargs --program-transform-name='${gcc_transform_name}'" tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'" if test "$silent" = yes; then - baseargs="$baseargs --silent" + bbaseargs="$bbaseargs --silent" + hbaseargs="$hbaseargs --silent" tbaseargs="$tbaseargs --silent" fi -baseargs="$baseargs --disable-option-checking" +bbaseargs="$bbaseargs --disable-option-checking" +hbaseargs="$hbaseargs --disable-option-checking" tbaseargs="$tbaseargs --disable-option-checking" if test "$enable_year2038" = no; then @@ -3403,7 +3425,7 @@ AC_ARG_VAR([target_configargs], # desired. We can't even use the same cache file for all build-side # libraries, as they're compiled differently; some with C, some with # C++ or with different feature-enabling options. -build_configargs="$build_configargs --cache-file=./config.cache ${baseargs}" +build_configargs="$build_configargs --cache-file=./config.cache ${bbaseargs}" # For host modules, accept cache file option, or specification as blank. case "${cache_file}" in @@ -3417,7 +3439,7 @@ esac # Host dirs don't like to share a cache file either, horribly enough. # This seems to be due to autoconf 2.5x stupidity. -host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${baseargs}" +host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${hbaseargs}" target_configargs="$target_configargs ${tbaseargs}" diff --git a/contrib/download_prerequisites b/contrib/download_prerequisites index 930f3a2..9568091 100755 --- a/contrib/download_prerequisites +++ b/contrib/download_prerequisites @@ -31,6 +31,7 @@ gmp='gmp-6.2.1.tar.bz2' mpfr='mpfr-4.1.0.tar.bz2' mpc='mpc-1.2.1.tar.gz' isl='isl-0.24.tar.bz2' +gettext='gettext-0.22.tar.gz' base_url='http://gcc.gnu.org/pub/gcc/infrastructure/' @@ -38,6 +39,7 @@ echo_archives() { echo "${gmp}" echo "${mpfr}" echo "${mpc}" + echo "${gettext}" if [ ${graphite} -gt 0 ]; then echo "${isl}"; fi } diff --git a/contrib/prerequisites.md5 b/contrib/prerequisites.md5 index a20f986..716a9ff 100644 --- a/contrib/prerequisites.md5 +++ b/contrib/prerequisites.md5 @@ -2,3 +2,4 @@ 44b892bc5a45bafb4294d134e13aad1d mpfr-4.1.0.tar.bz2 9f16c976c25bb0f76b50be749cd7a3a8 mpc-1.2.1.tar.gz dd2f7b78e118c25bd96134a52aae7f4d isl-0.24.tar.bz2 +c092102240f8f66134d22718421d5115 gettext-0.22.tar.gz diff --git a/contrib/prerequisites.sha512 b/contrib/prerequisites.sha512 index 89541b9..f71398b 100644 --- a/contrib/prerequisites.sha512 +++ b/contrib/prerequisites.sha512 @@ -2,3 +2,4 @@ 410208ee0d48474c1c10d3d4a59decd2dfa187064183b09358ec4c4666e34d74383128436b404123b831e585d81a9176b24c7ced9d913967c5fce35d4040a0b4 mpfr-4.1.0.tar.bz2 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee mpc-1.2.1.tar.gz aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95 isl-0.24.tar.bz2 +e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 29cec21..7f2df4b 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1124,9 +1124,11 @@ else BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a endif -# Dependencies on the intl and portability libraries. -LIBDEPS= libcommon.a $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) \ - $(LIBDECNUMBER) $(LIBBACKTRACE) +# Dependencies on the intl and portability libraries. The INTL dep might be +# constructed with a ./ prefix, which GNU Make removes while processing +# prerequisites, so we need to strip it off. +LIBDEPS= libcommon.a $(CPPLIB) $(LIBIBERTY) $(LIBICONV_DEP) $(LIBDECNUMBER) \ + $(LIBBACKTRACE) $(LIBINTL_DEP:./%=%) # Likewise, for use in the tools that must run on this machine # even if we are cross-building GCC. diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 126e09b..c0fcbeb 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -76,15 +76,19 @@ m4_include([../config/dfp.m4]) m4_include([../config/enable.m4]) m4_include([../config/gcc-plugin.m4]) m4_include([../config/gettext-sister.m4]) +m4_include([../config/gettext.m4]) m4_include([../config/iconv.m4]) +m4_include([../config/intlmacosx.m4]) m4_include([../config/lcmessage.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) m4_include([../config/mmap.m4]) +m4_include([../config/nls.m4]) m4_include([../config/override.m4]) m4_include([../config/picflag.m4]) +m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) m4_include([../config/stdint.m4]) m4_include([../config/warnings.m4]) diff --git a/gcc/configure b/gcc/configure index 0d818ae..c37cae7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -629,6 +629,7 @@ ac_includes_default="\ # include <unistd.h> #endif" +gt_needs= ac_subst_vars='LTLIBOBJS LIBOBJS CET_HOST_FLAGS @@ -778,13 +779,20 @@ GENCAT INSTOBJEXT DATADIRNAME CATALOGS -POSUB -GMSGFMT -XGETTEXT INCINTL LIBINTL_DEP +POSUB +LTLIBINTL LIBINTL +INTLLIBS +INTL_MACOSX_LIBS +MSGMERGE +XGETTEXT +GMSGFMT +MSGFMT USE_NLS +MKINSTALLDIRS +INSTALL_SCRIPT get_gcc_base_ver HAVE_AUTO_BUILD extra_opt_files @@ -1002,6 +1010,9 @@ with_libiconv_prefix with_libiconv_type enable_sjlj_exceptions with_gcc_major_version_only +enable_nls +with_libintl_prefix +with_libintl_type enable_secureplt enable_mingw_wildcard enable_large_address_aware @@ -1729,6 +1740,7 @@ Optional Features: --disable-rpath do not hardcode runtime library paths --enable-sjlj-exceptions arrange to use setjmp/longjmp exception handling + --disable-nls do not use Native Language Support --enable-secureplt enable -msecure-plt by default for PowerPC --enable-mingw-wildcard Set whether to expand wildcard on command-line. Default to platform configuration @@ -1876,6 +1888,9 @@ Optional Packages: --with-libiconv-type=TYPE type of library to search for (auto/static/shared) --with-gcc-major-version-only use only GCC major number in filesystem paths + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib + --without-libintl-prefix don't search for libintl in includedir and libdir + --with-libintl-type=TYPE type of library to search for (auto/static/shared) --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -3293,6 +3308,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -11826,6 +11842,31 @@ fi + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } if ${am_cv_func_iconv+:} false; then : @@ -11834,39 +11875,12 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - am_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <stdlib.h> #include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - - if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then - for _libs in .libs _libs; do - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS -I../libiconv/include" - LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> + int main () { @@ -11878,37 +11892,25 @@ iconv_t cd = iconv_open("",""); } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - INCICONV="-I../libiconv/include" - LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a - LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la - am_cv_lib_iconv=yes - am_cv_func_iconv=yes + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - break - fi - done - fi - if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <stdlib.h> #include <iconv.h> + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -11919,7 +11921,6 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" LIBS="$am_save_LIBS" fi @@ -11927,39 +11928,181 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else -$as_echo "#define HAVE_ICONV 1" >>confdefs.h + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - fi - if test "$am_cv_lib_iconv" = yes; then +#include <iconv.h> +#include <string.h> - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" +int +main () +{ +int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then +$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 $as_echo_n "checking how to link with libiconv... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 $as_echo "$LIBICONV" >&6; } else + CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -11967,13 +12110,12 @@ $as_echo "$LIBICONV" >&6; } if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if ${am_cv_proto_iconv+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5 +$as_echo_n "checking whether iconv is compatible with its POSIX signature... " >&6; } +if ${gl_cv_iconv_nonconst+:} false; then : $as_echo_n "(cached) " >&6 else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -11982,11 +12124,7 @@ extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif int main () @@ -11997,24 +12135,42 @@ main () } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" + gl_cv_iconv_nonconst=yes else - am_cv_proto_iconv_arg1="const" + gl_cv_iconv_nonconst=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5 +$as_echo "$gl_cv_iconv_nonconst" >&6; } + else + gl_cv_iconv_nonconst=yes + fi + if test $gl_cv_iconv_nonconst = yes; then + iconv_arg1="" + else + iconv_arg1="const" + fi cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 +#define ICONV_CONST $iconv_arg1 _ACEOF + + + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi fi @@ -13299,19 +13455,1465 @@ fi # Internationalization -# If we haven't got the data from the intl directory, -# assume NLS is disabled. -USE_NLS=no -LIBINTL= -LIBINTL_DEP= -INCINTL= -XGETTEXT= -GMSGFMT= -POSUB= - -if test -f ../intl/config.intl; then - . ../intl/config.intl +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval +else + USE_NLS=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + + + + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$MSGFMT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + + + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + rm -f messages.po + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" +fi +rm -f conf$$.file + +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac +fi +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 +$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } + GMSGFMT=":" + fi + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + rm -f messages.po + fi + + ac_config_commands="$ac_config_commands default-1" + + + + + +if test -f ../gettext/uninstalled-config.sh; then + relative_builddir='$(top_builddir)/../gettext' + . ../gettext/uninstalled-config.sh +else + # The sister gettext directory doesn't exist and won't collect information on + # using gettext for us. Call a bundled AM_GNU_GETTEXT. + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFPreferences.h> +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5 +$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; } +if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFLocale.h> +int +main () +{ +CFLocaleCopyPreferredLanguages(); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyPreferredLanguages=yes +else + gt_cv_func_CFLocaleCopyPreferredLanguages=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } + if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ + || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + fi + + + + + + + LIBINTL= + LTLIBINTL= + POSUB= + + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libc=yes" +else + eval "$gt_func_gnugettext_libc=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + + + + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> +#include <iconv.h> + +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> +#include <iconv.h> + +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <iconv.h> +#include <string.h> + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () +{ +int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + + + + + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libintl-prefix was given. +if test "${with_libintl_prefix+set}" = set; then : + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi + +fi + + +# Check whether --with-libintl-type was given. +if test "${with_libintl_type+set}" = set; then : + withval=$with_libintl_type; with_libintl_type=$withval +else + with_libintl_type=auto +fi + + lib_type=`eval echo \$with_libintl_type` + + LIBINTL= + LTLIBINTL= + INCINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test x$lib_type != xstatic; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + elif test x$lib_type != xshared; then + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext" && test x$lib_type != xstatic; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + elif test x$lib_type != xshared; then + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l:lib$name.$libext" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l:lib$name.$libext" + fi + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libintl=yes" +else + eval "$gt_func_gnugettext_libintl=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +eval ac_res=\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + else + USE_NLS=no + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + fi + + +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h + + fi + + POSUB=po + fi + + + + INTLLIBS="$LIBINTL" + + + + + + +fi + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } if test x"$USE_NLS" != xyes; then @@ -20000,7 +21602,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 20003 "configure" +#line 21605 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20106,7 +21708,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 20109 "configure" +#line 21711 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -33676,6 +35278,7 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' +INSTALL='$INSTALL' AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF @@ -33785,6 +35388,13 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR subdirs="$subdirs" ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + subdirs='$subdirs' _ACEOF @@ -33798,6 +35408,7 @@ do "auto-host.h") CONFIG_HEADERS="$CONFIG_HEADERS auto-host.h:config.in" ;; "depdir") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir" ;; "gccdepdir") CONFIG_COMMANDS="$CONFIG_COMMANDS gccdepdir" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "as") CONFIG_FILES="$CONFIG_FILES as:exec-tool.in" ;; "collect-ld") CONFIG_FILES="$CONFIG_FILES collect-ld:exec-tool.in" ;; "nm") CONFIG_FILES="$CONFIG_FILES nm:exec-tool.in" ;; @@ -34284,6 +35895,10 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix # CONFIG_FILE # + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -34337,6 +35952,7 @@ s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | @@ -34433,6 +36049,107 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} do ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs $lang/$DEPDIR done ;; + "default-1":C) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.ac is obsolete" || echo "setting ALL_LINGUAS in configure.ac is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.ac. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + GMOFILES= + UPDATEPOFILES= + DUMMYPOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; "as":F) chmod +x as ;; "collect-ld":F) chmod +x collect-ld ;; "nm":F) chmod +x nm ;; diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 959a041..f995b77 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -477,6 +477,17 @@ is shown below: @code{sys} and @code{time}. @end table +@item GNU gettext + +Necessary to build GCC with internationalization support via +@option{--enable-nls}. It can be downloaded from +@uref{https://gnu.org/s/gettext/}. If a GNU gettext distribution is +found in a subdirectory of your GCC sources named @file{gettext}, it +will be built together with GCC, unless present in the system (either in +libc or as a stand-alone library). + +The in-tree configuration requires GNU gettext version 0.22 or later. + @end table @heading Tools/packages necessary for modifying GCC @@ -633,14 +644,14 @@ components of the binutils you intend to build alongside the compiler (@file{bfd}, @file{binutils}, @file{gas}, @file{gprof}, @file{ld}, @file{opcodes}, @dots{}) to the directory containing the GCC sources. -Likewise the GMP, MPFR and MPC libraries can be automatically built -together with GCC. You may simply run the +Likewise the GMP, MPFR, MPC and Gettext libraries can be automatically +built together with GCC. You may simply run the @command{contrib/download_prerequisites} script in the GCC source directory to set up everything. -Otherwise unpack the GMP, MPFR and/or MPC source +Otherwise unpack the GMP, MPFR, MPC and/or Gettext source distributions in the directory containing the GCC sources and rename -their directories to @file{gmp}, @file{mpfr} and @file{mpc}, -respectively (or use symbolic links with the same name). +their directories to @file{gmp}, @file{mpfr}, @file{mpc} and +@file{gettext}, respectively (or use symbolic links with the same name). @html <hr /> @@ -2219,9 +2230,56 @@ which lets GCC output diagnostics in languages other than American English. Native Language Support is enabled by default if not doing a canadian cross build. The @option{--disable-nls} option disables NLS@. +Note that this functionality requires either libintl (provided by GNU +gettext) or C standard library that contains support for gettext (such +as the GNU C Library). +@xref{with-included-gettext,,--with-included-gettext} for more +information on the conditions required to get gettext support. + +@item --with-libintl-prefix=@var{dir} +@itemx --without-libintl-prefix +Searches for libintl in @file{@var{dir}/include} and +@file{@var{dir}/lib}, or disables manual searching for it, letting the +linker handle it. + +@item --with-libintl-type=@var{type} +Specifies the type of library to search for when looking for libintl. +@var{type} can be one of @code{auto}, @code{static} or @code{shared}. + +@anchor{with-included-gettext} @item --with-included-gettext -If NLS is enabled, the @option{--with-included-gettext} option causes the build -procedure to prefer its copy of GNU @command{gettext}. +Only available if @file{gettext} is present in the source tree. + +Forces the gettext tree to be configured to build and use a new static +libintl, overriding the system libintl. Results in GCC being built +against the newly built libintl rather than the system libintl. + +The build system makes a somewhat complicated choice when picking where +to get gettext routines from. The following table is a summary of the +possible options: + +@c Thanks for summary, Bruno! +@multitable @columnfractions .12 .12 .12 .2 .44 +@headitem GNU gettext present in sources +@tab libintl installed on the system +@tab @code{gettext} present in libc +@tab @code{--with-included-gettext} +@tab Effects on localization + +@item No @tab No @tab No @tab (ignored) @tab No localization +@item No @tab No @tab Yes @tab (ignored) @tab Localized, libc gettext +@item No @tab Yes @tab No @tab (ignored) @tab Localized, libintl +@item No @tab Yes @tab Yes @tab (ignored) @tab Localized, libintl + +@item Yes @tab No @tab No @tab No @tab Localized, new, static libintl +@item Yes @tab No @tab No @tab Yes @tab Localized, new, static libintl +@item Yes @tab No @tab Yes @tab No @tab Localized, libc gettext +@item Yes @tab No @tab Yes @tab Yes @tab Localized, new, static libintl +@item Yes @tab Yes @tab No @tab No @tab Localized, libintl +@item Yes @tab Yes @tab No @tab Yes @tab Localized, new, static libintl +@item Yes @tab Yes @tab Yes @tab No @tab Localized, libintl +@item Yes @tab Yes @tab Yes @tab Yes @tab Localized, new, static libintl +@end multitable @item --with-catgets If NLS is enabled, and if the host lacks @code{gettext} but has the diff --git a/libcpp/aclocal.m4 b/libcpp/aclocal.m4 index 70c3eff..4fc8170 100644 --- a/libcpp/aclocal.m4 +++ b/libcpp/aclocal.m4 @@ -18,9 +18,14 @@ m4_include([../config/codeset.m4]) m4_include([../config/depstand.m4]) m4_include([../config/enable.m4]) m4_include([../config/gettext-sister.m4]) +m4_include([../config/gettext.m4]) m4_include([../config/iconv.m4]) +m4_include([../config/intlmacosx.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) m4_include([../config/lib-prefix.m4]) +m4_include([../config/nls.m4]) +m4_include([../config/po.m4]) +m4_include([../config/progtest.m4]) m4_include([../config/warnings.m4]) diff --git a/libcpp/configure b/libcpp/configure index ed98f40..452e4c1 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -622,6 +622,7 @@ ac_includes_default="\ # include <unistd.h> #endif" +gt_needs= ac_subst_vars='LTLIBOBJS CET_HOST_FLAGS PICFLAG @@ -630,20 +631,26 @@ enable_host_shared MAINT USED_CATALOGS PACKAGE -LTLIBICONV -LIBICONV CATOBJEXT GENCAT INSTOBJEXT DATADIRNAME CATALOGS -POSUB -GMSGFMT -XGETTEXT INCINTL LIBINTL_DEP +POSUB +LTLIBINTL LIBINTL +INTLLIBS +LTLIBICONV +LIBICONV +INTL_MACOSX_LIBS +MSGMERGE +XGETTEXT +GMSGFMT +MSGFMT USE_NLS +MKINSTALLDIRS ALLOCA LIBOBJS CXXDEPMODE @@ -732,10 +739,13 @@ ac_user_opts=' enable_option_checking enable_largefile enable_werror_always +enable_nls with_gnu_ld enable_rpath with_libiconv_prefix with_libiconv_type +with_libintl_prefix +with_libintl_type enable_maintainer_mode enable_checking enable_canonical_system_headers @@ -1372,6 +1382,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-largefile omit support for large files --enable-werror-always enable -Werror despite compiler version + --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --enable-maintainer-mode enable rules only needed by maintainers --enable-checking[=LIST] @@ -1394,6 +1405,9 @@ Optional Packages: --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libiconv-type=TYPE type of library to search for (auto/static/shared) + --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib + --without-libintl-prefix don't search for libintl in includedir and libdir + --with-libintl-type=TYPE type of library to search for (auto/static/shared) Some influential environment variables: CC C compiler command @@ -2259,6 +2273,48 @@ fi as_fn_set_status $ac_retval } # ac_fn_cxx_try_link + +# ac_fn_cxx_try_run LINENO +# ------------------------ +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_cxx_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_run cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -2543,6 +2599,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -6543,186 +6600,314 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h fi -# If we haven't got the data from the intl directory, -# assume NLS is disabled. -USE_NLS=no -LIBINTL= -LIBINTL_DEP= -INCINTL= -XGETTEXT= -GMSGFMT= -POSUB= -if test -f ../intl/config.intl; then - . ../intl/config.intl -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } -if test x"$USE_NLS" != xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + USE_NLS=yes +fi -$as_echo "#define ENABLE_NLS 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - # Look for .po and .gmo files in the source directory. - CATALOGS= - XLINGUAS= - for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do - # If there aren't any .gmo files the shell will give us the - # literal string "../path/to/srcdir/po/*.gmo" which has to be - # weeded out. - case "$cat" in *\**) - continue;; - esac - # The quadruple backslash is collapsed to a double backslash - # by the backticks, then collapsed again by the double quotes, - # leaving us with one backslash in the sed expression (right - # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e "s!\\\\.gmo!!"` - # The user is allowed to set LINGUAS to a list of languages to - # install catalogs for. If it's empty that means "all of them." - if test "x$LINGUAS" = x; then - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - else - case "$LINGUAS" in *$lang*) - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - ;; - esac - fi - done - LINGUAS="$XLINGUAS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - DATADIRNAME=share - - INSTOBJEXT=.mo - GENCAT=gencat - CATOBJEXT=.gmo +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" +else + ac_executable_p="test -f" fi +rm -f conf$$.file -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uchar" >&5 -$as_echo_n "checking for uchar... " >&6; } -if ${gcc_cv_type_uchar+:} false; then : +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <sys/types.h> + case "$MSGFMT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -int -main () -{ -if ((uchar *)0) return 0; - if (sizeof(uchar)) return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_uchar=yes + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_type_uchar=no + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_type_uchar" >&5 -$as_echo "$gcc_cv_type_uchar" >&6; } -if test $ac_cv_type_uchar = yes; then -$as_echo "#define HAVE_UCHAR 1" >>confdefs.h + + +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5 -$as_echo_n "checking size of ino_t... " >&6; } -if ${ac_cv_sizeof_ino_t+:} false; then : - $as_echo_n "(cached) " >&6 +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default"; then : + ac_executable_p="test -f" +fi +rm -f conf$$.file +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$ac_cv_type_ino_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (ino_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_ino_t=0 - fi + case "$XGETTEXT" in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac fi - +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5 -$as_echo "$ac_cv_sizeof_ino_t" >&6; } - + rm -f messages.po -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INO_T $ac_cv_sizeof_ino_t -_ACEOF +# Prepare PATH_SEPARATOR. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5 -$as_echo_n "checking size of dev_t... " >&6; } -if ${ac_cv_sizeof_dev_t+:} false; then : - $as_echo_n "(cached) " >&6 +# Find out how to test for executable files. Don't use a zero-byte file, +# as systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + ac_executable_p="test -x" else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t" "$ac_includes_default"; then : + ac_executable_p="test -f" +fi +rm -f conf$$.file +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 else - if test "$ac_cv_type_dev_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (dev_t) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_dev_t=0 - fi + case "$MSGMERGE" in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$ac_save_IFS" + test -z "$ac_dir" && ac_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" + break 2 + fi + fi + done + done + IFS="$ac_save_IFS" + test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" + ;; +esac fi - +MSGMERGE="$ac_cv_path_MSGMERGE" +if test "$MSGMERGE" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5 -$as_echo "$ac_cv_sizeof_dev_t" >&6; } + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 +$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; } + GMSGFMT=":" + fi + fi -cat >>confdefs.h <<_ACEOF -#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t -_ACEOF + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + rm -f messages.po + fi + ac_config_commands="$ac_config_commands default-1" -# g++ on Solaris 10+ defines _XOPEN_SOURCE=600, which exposes a different -# iconv() prototype. -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" @@ -7282,49 +7467,232 @@ fi +if test -f ../gettext/uninstalled-config.sh; then + relative_builddir='$(top_builddir)/../gettext' + . ../gettext/uninstalled-config.sh +else + # The sister gettext directory doesn't exist and won't collect information on + # using gettext for us. Call a bundled AM_GNU_GETTEXT. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if ${am_cv_func_iconv+:} false; then : + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : $as_echo_n "(cached) " >&6 else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFPreferences.h> +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - am_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCICONV" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5 +$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; } +if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> +#include <CoreFoundation/CFLocale.h> int main () { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +CFLocaleCopyPreferredLanguages(); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - am_cv_func_iconv=yes +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyPreferredLanguages=yes +else + gt_cv_func_CFLocaleCopyPreferredLanguages=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - - if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then - for _libs in .libs _libs; do - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS -I../libiconv/include" - LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; } + if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes \ + || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices" + fi + + + + + + + LIBINTL= + LTLIBINTL= + POSUB= + + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + +#include <libintl.h> +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libc=yes" +else + eval "$gt_func_gnugettext_libc=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + + + + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include <stdlib.h> #include <iconv.h> + int main () { @@ -7335,49 +7703,36 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - INCICONV="-I../libiconv/include" - LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a - LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la - am_cv_lib_iconv=yes - am_cv_func_iconv=yes +if ac_fn_c_try_link "$LINENO"; then : + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - break - fi - done - fi - if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $INCICONV" LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <stdlib.h> #include <iconv.h> + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : am_cv_lib_iconv=yes am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" LIBS="$am_save_LIBS" fi @@ -7385,11 +7740,961 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <iconv.h> +#include <string.h> + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () +{ +int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then $as_echo "#define HAVE_ICONV 1" >>confdefs.h fi if test "$am_cv_lib_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + + + + + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libintl-prefix was given. +if test "${with_libintl_prefix+set}" = set; then : + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi + +fi + + +# Check whether --with-libintl-type was given. +if test "${with_libintl_type+set}" = set; then : + withval=$with_libintl_type; with_libintl_type=$withval +else + with_libintl_type=auto +fi + + lib_type=`eval echo \$with_libintl_type` + + LIBINTL= + LTLIBINTL= + INCINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test x$lib_type != xstatic; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + elif test x$lib_type != xshared; then + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext" && test x$lib_type != xstatic; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + elif test x$lib_type != xshared; then + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l:lib$name.$libext" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l:lib$name.$libext" + fi + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libintl=yes" +else + eval "$gt_func_gnugettext_libintl=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); +#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) +#else +#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 +#endif +$gt_revision_test_code + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +eval ac_res=\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + else + USE_NLS=no + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + fi + + +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h + + fi + + POSUB=po + fi + + + + INTLLIBS="$LIBINTL" + + + + + + +fi + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } +if test x"$USE_NLS" != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } + # Look for .po and .gmo files in the source directory. + CATALOGS= + XLINGUAS= + for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do + # If there aren't any .gmo files the shell will give us the + # literal string "../path/to/srcdir/po/*.gmo" which has to be + # weeded out. + case "$cat" in *\**) + continue;; + esac + # The quadruple backslash is collapsed to a double backslash + # by the backticks, then collapsed again by the double quotes, + # leaving us with one backslash in the sed expression (right + # before the dot that mustn't act as a wildcard). + cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` + lang=`echo $cat | sed -e "s!\\\\.gmo!!"` + # The user is allowed to set LINGUAS to a list of languages to + # install catalogs for. If it's empty that means "all of them." + if test "x$LINGUAS" = x; then + CATALOGS="$CATALOGS $cat" + XLINGUAS="$XLINGUAS $lang" + else + case "$LINGUAS" in *$lang*) + CATALOGS="$CATALOGS $cat" + XLINGUAS="$XLINGUAS $lang" + ;; + esac + fi + done + LINGUAS="$XLINGUAS" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } + + + DATADIRNAME=share + + INSTOBJEXT=.mo + + GENCAT=gencat + + CATOBJEXT=.gmo + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uchar" >&5 +$as_echo_n "checking for uchar... " >&6; } +if ${gcc_cv_type_uchar+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <sys/types.h> + +int +main () +{ +if ((uchar *)0) return 0; + if (sizeof(uchar)) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_uchar=yes +else + ac_cv_type_uchar=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_type_uchar" >&5 +$as_echo "$gcc_cv_type_uchar" >&6; } +if test $ac_cv_type_uchar = yes; then + +$as_echo "#define HAVE_UCHAR 1" >>confdefs.h + +fi + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5 +$as_echo_n "checking size of ino_t... " >&6; } +if ${ac_cv_sizeof_ino_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_ino_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (ino_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_ino_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5 +$as_echo "$ac_cv_sizeof_ino_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INO_T $ac_cv_sizeof_ino_t +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5 +$as_echo_n "checking size of dev_t... " >&6; } +if ${ac_cv_sizeof_dev_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_dev_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (dev_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_dev_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5 +$as_echo "$ac_cv_sizeof_dev_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t +_ACEOF + + + +# g++ on Solaris 10+ defines _XOPEN_SOURCE=600, which exposes a different +# iconv() prototype. +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + + + + am_save_CPPFLAGS="$CPPFLAGS" for element in $INCICONV; do haveit= @@ -7413,11 +8718,243 @@ $as_echo "#define HAVE_ICONV 1" >>confdefs.h fi done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> +#include <iconv.h> + +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> +#include <iconv.h> + +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <iconv.h> +#include <string.h> + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () +{ +int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 $as_echo_n "checking how to link with libiconv... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 $as_echo "$LIBICONV" >&6; } else + CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -7425,13 +8962,12 @@ $as_echo "$LIBICONV" >&6; } if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if ${am_cv_proto_iconv+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5 +$as_echo_n "checking whether iconv is compatible with its POSIX signature... " >&6; } +if ${gl_cv_iconv_nonconst+:} false; then : $as_echo_n "(cached) " >&6 else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -7440,11 +8976,7 @@ extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif int main () @@ -7455,24 +8987,42 @@ main () } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" + gl_cv_iconv_nonconst=yes else - am_cv_proto_iconv_arg1="const" + gl_cv_iconv_nonconst=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5 +$as_echo "$gl_cv_iconv_nonconst" >&6; } + else + gl_cv_iconv_nonconst=yes + fi + if test $gl_cv_iconv_nonconst = yes; then + iconv_arg1="" + else + iconv_arg1="const" + fi cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 +#define ICONV_CONST $iconv_arg1 _ACEOF + + + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi fi ac_ext=c @@ -8628,6 +10178,13 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR +# Capture the value of obsolete ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + _ACEOF @@ -8638,6 +10195,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "depdir") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -9196,6 +10754,107 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;; + "default-1":C) + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + POMAKEFILEDEPS="POTFILES.in" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$OBSOLETE_ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.ac is obsolete" || echo "setting ALL_LINGUAS in configure.ac is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" + else + # The set of available languages was given in configure.ac. + eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' + fi + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + GMOFILES= + UPDATEPOFILES= + DUMMYPOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done ;; "config.h":H) echo timestamp > stamp-h1 ;; esac diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index cd07845..1223376 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -26953,6 +26953,31 @@ fi + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } if ${am_cv_func_iconv+:} false; then : @@ -26961,21 +26986,21 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - am_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCICONV" if test x$gcc_no_link = xyes; then as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <stdlib.h> #include <iconv.h> + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -26985,117 +27010,216 @@ if ac_fn_c_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - - if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then - for _libs in .libs _libs; do - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS -I../libiconv/include" - LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a" - if test x$gcc_no_link = xyes; then + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + if test x$gcc_no_link = xyes; then as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include <stdlib.h> #include <iconv.h> + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - INCICONV="-I../libiconv/include" - LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a - LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la - am_cv_lib_iconv=yes - am_cv_func_iconv=yes + am_cv_lib_iconv=yes + am_cv_func_iconv=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - break - fi - done + LIBS="$am_save_LIBS" fi - if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $INCICONV" - LIBS="$LIBS $LIBICONV" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdlib.h> + #include <iconv.h> +#include <string.h> + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + int main () { -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +int result = 0; + /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from + successful returns. This is even documented in + <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + { + /* Try standardized names. */ + iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); + /* Try IRIX, OSF/1 names. */ + iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); + /* Try AIX names. */ + iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); + /* Try HP-UX names. */ + iconv_t cd4 = iconv_open ("utf8", "eucJP"); + if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) + && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) + result |= 16; + if (cd1 != (iconv_t)(-1)) + iconv_close (cd1); + if (cd2 != (iconv_t)(-1)) + iconv_close (cd2); + if (cd3 != (iconv_t)(-1)) + iconv_close (cd3); + if (cd4 != (iconv_t)(-1)) + iconv_close (cd4); + } + return result; + ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then $as_echo "#define HAVE_ICONV 1" >>confdefs.h fi if test "$am_cv_lib_iconv" = yes; then - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 $as_echo_n "checking how to link with libiconv... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 $as_echo "$LIBICONV" >&6; } else + CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= LTLIBICONV= fi @@ -27103,13 +27227,12 @@ $as_echo "$LIBICONV" >&6; } if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if ${am_cv_proto_iconv+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5 +$as_echo_n "checking whether iconv is compatible with its POSIX signature... " >&6; } +if ${gl_cv_iconv_nonconst+:} false; then : $as_echo_n "(cached) " >&6 else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -27118,11 +27241,7 @@ extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif int main () @@ -27133,24 +27252,42 @@ main () } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" + gl_cv_iconv_nonconst=yes else - am_cv_proto_iconv_arg1="const" + gl_cv_iconv_nonconst=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5 +$as_echo "$gl_cv_iconv_nonconst" >&6; } + else + gl_cv_iconv_nonconst=yes + fi + if test $gl_cv_iconv_nonconst = yes; then + iconv_arg1="" + else + iconv_arg1="const" + fi cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 +#define ICONV_CONST $iconv_arg1 _ACEOF + + + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi fi @@ -34923,210 +35060,6 @@ done #GCC_CHECK_TLS - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if ${am_cv_func_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - am_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCICONV" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - - if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then - for _libs in .libs _libs; do - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS -I../libiconv/include" - LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - INCICONV="-I../libiconv/include" - LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a - LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - break - fi - done - fi - - if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $INCICONV" - LIBS="$LIBS $LIBICONV" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - -$as_echo "#define HAVE_ICONV 1" >>confdefs.h - - fi - if test "$am_cv_lib_iconv" = yes; then - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -$as_echo_n "checking how to link with libiconv... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -$as_echo "$LIBICONV" >&6; } - else - LIBICONV= - LTLIBICONV= - fi - - - - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if ${am_cv_proto_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <stdlib.h> -#include <iconv.h> -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" -else - am_cv_proto_iconv_arg1="const" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } - -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF - - fi - - $as_echo "#define HAVE_USELOCALE 1" >>confdefs.h ;; @@ -42370,210 +42303,6 @@ fi done - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if ${am_cv_func_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - am_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCICONV" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - - if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then - for _libs in .libs _libs; do - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS -I../libiconv/include" - LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - INCICONV="-I../libiconv/include" - LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a - LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - break - fi - done - fi - - if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $INCICONV" - LIBS="$LIBS $LIBICONV" - if test x$gcc_no_link = xyes; then - as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <iconv.h> -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS="$am_save_CPPFLAGS" - LIBS="$am_save_LIBS" - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - -$as_echo "#define HAVE_ICONV 1" >>confdefs.h - - fi - if test "$am_cv_lib_iconv" = yes; then - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -$as_echo_n "checking how to link with libiconv... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -$as_echo "$LIBICONV" >&6; } - else - LIBICONV= - LTLIBICONV= - fi - - - - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 -$as_echo_n "checking for iconv declaration... " >&6; } - if ${am_cv_proto_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <stdlib.h> -#include <iconv.h> -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - am_cv_proto_iconv_arg1="" -else - am_cv_proto_iconv_arg1="const" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" -fi - - am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- - }$am_cv_proto_iconv" >&5 -$as_echo "${ac_t:- - }$am_cv_proto_iconv" >&6; } - -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF - - fi - ;; *-mingw32*) |