FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*: add modern gettext

Browse source 
This patch updates gettext.m4 and related .m4 files and adds
gettext-runtime as a gmp/mpfr/... style host library, allowing newer
libintl to be used.

This patch /does not/ add build-time tools required for
internationalizing (msgfmt et al), instead, it just updates the runtime
library.  The result should be a distribution that acts exactly the same
when a copy of gettext is present, and disables internationalization
otherwise.

There should be no changes in behavior when gettext is included in-tree.
When gettext is not included in tree, nor available on the system, the
programs will be built without localization.

ChangeLog:

	PR bootstrap/12596
	* .gitignore: Add '/gettext*'.
	* configure.ac (host_libs): Replace intl with gettext.
	(hbaseargs, bbaseargs, baseargs): Split baseargs into
	{h,b}baseargs.
	(skip_barg): New flag.  Skips appending current flag to
	bbaseargs.
	<library exemptions>: Exempt --with-libintl-{type,prefix} from
	target and build machine argument passing.
	* configure: Regenerate.
	* Makefile.def (host_modules): Replace intl module with gettext
	module.
	(configure-ld): Depend on configure-gettext.
	* Makefile.in: Regenerate.

config/ChangeLog:

	* intlmacosx.m4: Import from gettext-0.22 (serial 8).
	* gettext.m4: Sync with gettext-0.22 (serial 77).
	* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Load gettext's
	uninstalled-config.sh, or call AM_GNU_GETTEXT if missing.
	* iconv.m4: Sync with gettext-0.22 (serial 26).

contrib/ChangeLog:

	* prerequisites.sha512: Add gettext.
	* prerequisites.md5: Add gettext.
	* download_prerequisites: Add gettext.

gcc/ChangeLog:

	* configure: Regenerate.
	* aclocal.m4: Regenerate.
	* Makefile.in (LIBDEPS): Remove (potential) ./ prefix from
	LIBINTL_DEP.
	* doc/install.texi: Document new (notable) flags added by the
	optional gettext tree and by AM_GNU_GETTEXT.  Document libintl/libc
	with gettext dependency.

libcpp/ChangeLog:

	* configure: Regenerate.
	* aclocal.m4: Regenerate.

libstdc++-v3/ChangeLog:

	* configure: Regenerate.
This commit is contained in:
Arsen Arsenović 2023-05-19 21:12:57 +02:00 • committed by Arsen Arsenović
parent fbe4e64365
commit db50aea625
No known key found for this signature in database
GPG key ID: 52C294301EA2C493
19 changed files with 5539 additions and 2112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -69,3 +69,4 @@ stamp-*
/mpc* /mpc*
/gmp* /gmp*
/isl* /isl*
/gettext*

72
Makefile.def
View file

@ -74,8 +74,14 @@ host_modules= { module= isl; lib_path=.libs; bootstrap=true;
host_modules= { module= gold; bootstrap=true; }; host_modules= { module= gold; bootstrap=true; };
host_modules= { module= gprof; }; host_modules= { module= gprof; };
host_modules= { module= gprofng; }; host_modules= { module= gprofng; };
// intl acts on 'host_shared' directly, and does not support --with-pic. host_modules= { module= gettext; bootstrap=true; no_install=true;
host_modules= { module= intl; bootstrap=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; host_modules= { module= tcl;
missing=mostlyclean; }; missing=mostlyclean; };
host_modules= { module= itcl; }; 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; }; dependencies = { module=all-build-libcpp; on=all-build-libiberty; };
// Host modules specific to gcc. // 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-gmp; };
dependencies = { module=configure-gcc; on=all-mpfr; }; dependencies = { module=configure-gcc; on=all-mpfr; };
dependencies = { module=configure-gcc; on=all-mpc; }; 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-gold; };
dependencies = { module=configure-gcc; on=all-libiconv; }; dependencies = { module=configure-gcc; on=all-libiconv; };
dependencies = { module=all-gcc; on=all-libiberty; hard=true; }; 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-mpfr; };
dependencies = { module=all-gcc; on=all-mpc; }; dependencies = { module=all-gcc; on=all-mpc; };
dependencies = { module=all-gcc; on=all-isl; }; 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=install-strip-gcc ; on=install-strip-lto-plugin; };
dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; }; 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=configure-libcpp; on=all-libiconv; };
dependencies = { module=all-libcpp; on=all-libiberty; hard=true; }; 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-libcpp; on=all-libiconv; };
dependencies = { module=all-fixincludes; on=all-libiberty; }; 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=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-mpfr; on=all-gmp; };
dependencies = { module=configure-mpc; on=all-mpfr; }; dependencies = { module=configure-mpc; on=all-mpfr; };
dependencies = { module=configure-isl; on=all-gmp; }; 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. // Host modules specific to gdb.
dependencies = { module=configure-gdb; on=all-gmp; }; dependencies = { module=configure-gdb; on=all-gmp; };
dependencies = { module=configure-gdb; on=all-mpfr; }; 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=configure-sim; };
dependencies = { module=configure-gdb; on=all-bfd; }; dependencies = { module=configure-gdb; on=all-bfd; };
dependencies = { module=configure-gdb; on=all-gnulib; }; 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=all-libgui; on=all-itcl; };
dependencies = { module=configure-gdbsupport; on=configure-gnulib; }; 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-gnulib; };
dependencies = { module=all-gdbsupport; on=all-intl; }; dependencies = { module=all-gdbsupport; on=all-gettext; };
// Host modules specific to binutils. // Host modules specific to binutils.
// build libsframe before bfd for encoder/decoder support for linking // build libsframe before bfd for encoder/decoder support for linking
// SFrame sections // SFrame sections
dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; }; 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-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-zlib; };
dependencies = { module=all-bfd; on=all-libsframe; }; dependencies = { module=all-bfd; on=all-libsframe; };
dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; }; 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 // 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 // condition in the prev-gcc/as script during bootstrap of combined tree
// with GCC and binutils. See PR gas/14899 for details. // 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-libiberty; };
dependencies = { module=all-binutils; on=all-opcodes; }; dependencies = { module=all-binutils; on=all-opcodes; };
dependencies = { module=all-binutils; on=all-bfd; }; dependencies = { module=all-binutils; on=all-bfd; };
dependencies = { module=all-binutils; on=all-build-flex; }; dependencies = { module=all-binutils; on=all-build-flex; };
dependencies = { module=all-binutils; on=all-build-bison; }; 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-gas; };
dependencies = { module=all-binutils; on=all-libctf; }; dependencies = { module=all-binutils; on=all-libctf; };
dependencies = { module=all-ld; 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-opcodes; on=install-bfd; };
dependencies = { module=install-strip-opcodes; on=install-strip-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-libiberty; };
dependencies = { module=all-gas; on=all-opcodes; }; dependencies = { module=all-gas; on=all-opcodes; };
dependencies = { module=all-gas; on=all-bfd; }; dependencies = { module=all-gas; on=all-bfd; };
dependencies = { module=all-gas; on=all-intl; }; dependencies = { module=all-gas; on=all-gettext; };
dependencies = { module=configure-gprof; on=configure-intl; }; dependencies = { module=configure-gprof; on=configure-gettext; };
dependencies = { module=all-gprof; on=all-libiberty; }; dependencies = { module=all-gprof; on=all-libiberty; };
dependencies = { module=all-gprof; on=all-bfd; }; dependencies = { module=all-gprof; on=all-bfd; };
dependencies = { module=all-gprof; on=all-opcodes; }; 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=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-libiberty; };
dependencies = { module=all-gprofng; on=all-bfd; }; dependencies = { module=all-gprofng; on=all-bfd; };
dependencies = { module=all-gprofng; on=all-opcodes; }; 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=all-gprofng; on=all-gas; };
dependencies = { module=install-gprofng; on=install-opcodes; }; dependencies = { module=install-gprofng; on=install-opcodes; };
dependencies = { module=install-gprofng; on=install-bfd; }; 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-libiberty; };
dependencies = { module=all-ld; on=all-bfd; }; dependencies = { module=all-ld; on=all-bfd; };
dependencies = { module=all-ld; on=all-opcodes; }; dependencies = { module=all-ld; on=all-opcodes; };
dependencies = { module=all-ld; on=all-build-bison; }; dependencies = { module=all-ld; on=all-build-bison; };
dependencies = { module=all-ld; on=all-build-flex; }; 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-gas; };
dependencies = { module=all-ld; on=all-binutils; }; dependencies = { module=all-ld; on=all-binutils; };
dependencies = { module=install-ld; on=install-gold; }; dependencies = { module=install-ld; on=install-gold; };
dependencies = { module=install-strip-ld; on=install-strip-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-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-bfd; };
dependencies = { module=all-gold; on=all-build-bison; }; dependencies = { module=all-gold; on=all-build-bison; };
dependencies = { module=all-gold; on=all-gas; }; dependencies = { module=all-gold; on=all-gas; };
dependencies = { module=check-gold; on=all-binutils; }; dependencies = { module=check-gold; on=all-binutils; };
dependencies = { module=check-gold; on=all-gas; }; 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-bfd; };
dependencies = { module=all-opcodes; on=all-libiberty; }; 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. // Other host modules in the 'src' repository.
dependencies = { module=all-dejagnu; on=all-tcl; }; 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=install-strip-sid; on=install-strip-tk; };
dependencies = { module=configure-sim; on=all-gnulib; }; dependencies = { module=configure-sim; on=all-gnulib; };
dependencies = { module=configure-sim; on=configure-intl; }; dependencies = { module=configure-sim; on=configure-gettext; };
dependencies = { module=all-sim; on=all-intl; }; dependencies = { module=all-sim; on=all-gettext; };
dependencies = { module=all-sim; on=all-libiberty; }; dependencies = { module=all-sim; on=all-libiberty; };
dependencies = { module=all-sim; on=all-bfd; }; dependencies = { module=all-sim; on=all-bfd; };
dependencies = { module=all-sim; on=all-opcodes; }; 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; }; dependencies = { module=all-libctf; on=all-zlib; };
// So that checking for ELF support in BFD from libctf configure is possible. // 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-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-zlib; };
dependencies = { module=configure-libctf; on=all-libiconv; }; dependencies = { module=configure-libctf; on=all-libiconv; };
dependencies = { module=check-libctf; on=all-ld; }; 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; }; dependencies = { module=distclean-gnulib; on=distclean-sim; };
// Warning, these are not well tested. // 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-bison; on=all-build-texinfo; };
dependencies = { module=all-flex; on=all-build-bison; }; 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-m4; };
dependencies = { module=all-flex; on=all-build-texinfo; }; 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; }; dependencies = { module=all-m4; on=all-build-texinfo; };
// Target modules. These can also have dependencies on the language // Target modules. These can also have dependencies on the language

1612
Makefile.in
View file

File diff suppressed because it is too large Load diff

35
config/gettext-sister.m4
View file

@ -10,19 +10,30 @@
# the necessary substitutions and definitions for this directory. # the necessary substitutions and definitions for this directory.
AC_DEFUN([ZW_GNU_GETTEXT_SISTER_DIR], AC_DEFUN([ZW_GNU_GETTEXT_SISTER_DIR],
[# If we haven't got the data from the intl directory, [
# assume NLS is disabled. m4_pushdef([gettext_builddir],
USE_NLS=no AC_SUBST(USE_NLS) m4_default([$1], [../gettext]))
LIBINTL= AC_SUBST(LIBINTL) m4_pushdef([gettext_cfg],
LIBINTL_DEP= AC_SUBST(LIBINTL_DEP) gettext_builddir[/uninstalled-config.sh])
INCINTL= AC_SUBST(INCINTL) if test -f gettext_cfg; then
XGETTEXT= AC_SUBST(XGETTEXT) relative_builddir='[$(top_builddir)/]gettext_builddir'
GMSGFMT= AC_SUBST(GMSGFMT) . gettext_cfg
POSUB= AC_SUBST(POSUB) else
# The sister gettext directory doesn't exist and won't collect information on
if test -f ifelse([$1],,[../intl],[$1])/config.intl; then # using gettext for us. Call a bundled AM_GNU_GETTEXT.
. ifelse([$1],,[../intl],[$1])/config.intl AM_GNU_GETTEXT([external])
fi 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]) AC_MSG_CHECKING([whether NLS is requested])
if test x"$USE_NLS" != xyes; then if test x"$USE_NLS" != xyes; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

359
config/gettext.m4
View file

@ -1,43 +1,39 @@
# gettext.m4 serial 20 (gettext-0.12) # gettext.m4 serial 72 (gettext-0.21.1)
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software; the Free Software Foundation
dnl General Public License. As a special exception to the GNU General dnl gives unlimited permission to copy and/or distribute it,
dnl Public License, this file may be distributed as part of a program dnl with or without modifications, as long as this notice is preserved.
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl dnl
dnl This file can can be used in projects which are not available under dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public 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 License but which still want to provide support for the GNU gettext
dnl functionality. dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered 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 by the GNU Lesser General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License. dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain. dnl They are *not* in the public domain.
dnl Authors: dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 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 Macro to add for using GNU gettext.
dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
dnl default (if it is not specified or empty) is 'no-libtool'. dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and
dnl INTLSYMBOL should be 'external' for packages with no intl directory, dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
dnl If INTLSYMBOL is 'use-libtool', then a libtool library dnl If INTLSYMBOL is 'use-libtool', then a libtool library
dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, 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 depending on --{enable,disable}-{shared,static} and on the presence of
dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library dnl AM-DISABLE-SHARED).
dnl $(top_builddir)/intl/libintl.a will be created.
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
dnl implementations (in libc or libintl) without the ngettext() function dnl implementations (in libc or libintl) without the ngettext() function
dnl will be ignored. If NEEDSYMBOL is specified and is dnl will be ignored. If NEEDSYMBOL is specified and is
dnl 'need-formatstring-macros', then GNU gettext implementations that don't 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 support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
dnl INTLDIR is used to find the intl libraries. If empty, 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
dnl The result of the configuration is one of three cases: dnl The result of the configuration is one of three cases:
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
@ -59,17 +55,22 @@ dnl
AC_DEFUN([AM_GNU_GETTEXT], AC_DEFUN([AM_GNU_GETTEXT],
[ [
dnl Argument checking. 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 [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 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])]) ])])])])
define(gt_included_intl, ifelse([$1], [external], [no], [yes])) define([gt_included_intl],
define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) m4_if([$1], [external], [no], [yes]))
gt_NEEDS_INIT
AM_GNU_GETTEXT_NEED([$2])
AC_REQUIRE([AM_PO_SUBDIRS])dnl AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [ m4_if(gt_included_intl, yes, [
AC_REQUIRE([AM_INTL_SUBDIR])dnl 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 Sometimes libintl requires libiconv, so first search for libiconv.
dnl Ideally we would do this search only after the dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then dnl if test "$USE_NLS" = "yes"; then
dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT 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 the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions: dnl again, outside any 'if'. There are two solutions:
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. 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 Since AC_PROVIDE_IFELSE is not documented, we avoid it.
dnl documented, we avoid it. m4_if(gt_included_intl, yes, , [
ifelse(gt_included_intl, yes, , [
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
]) ])
dnl Set USE_NLS. dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
AM_NLS gt_INTL_MACOSX
ifelse(gt_included_intl, yes, [ dnl Set USE_NLS.
AC_REQUIRE([AM_NLS])
m4_if(gt_included_intl, yes, [
BUILD_INCLUDED_LIBINTL=no BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no
]) ])
@ -103,16 +106,25 @@ AC_DEFUN([AM_GNU_GETTEXT],
LTLIBINTL= LTLIBINTL=
POSUB= 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 dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then if test "$USE_NLS" = "yes"; then
gt_use_preinstalled_gnugettext=no 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_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], [ --with-included-gettext use the GNU gettext library included here],
nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=$withval,
nls_cv_force_use_gnu_gettext=no) 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" nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then 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 use. If GNU gettext is available we use this. Else we have
dnl to fall back to GNU NLS library. dnl to fall back to GNU NLS library.
dnl Add a version number to the cache macros. if test $gt_api_version -ge 3; then
define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) gt_revision_test_code='
define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) #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_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
[AC_TRY_LINK([#include <libintl.h> [AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <libintl.h>
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings; extern int *_nl_domain_bindings;
@ -135,22 +163,18 @@ extern int *_nl_domain_bindings;
#else #else
#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
#endif #endif
]ifelse([$2], [need-formatstring-macros], $gt_revision_test_code
[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ]],
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) [[
#endif bindtextdomain ("", "");
changequote(,)dnl return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ]])],
changequote([,])dnl [eval "$gt_func_gnugettext_libc=yes"],
], []), [eval "$gt_func_gnugettext_libc=no"])])
[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 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
dnl Sometimes libintl requires libiconv, so first search for libiconv. dnl Sometimes libintl requires libiconv, so first search for libiconv.
ifelse(gt_included_intl, yes, , [ m4_if(gt_included_intl, yes, , [
AM_ICONV_LINK AM_ICONV_LINK
]) ])
dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL 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. dnl even if libiconv doesn't exist.
AC_LIB_LINKFLAGS_BODY([intl]) AC_LIB_LINKFLAGS_BODY([intl])
AC_CACHE_CHECK([for GNU gettext in libintl], AC_CACHE_CHECK([for GNU gettext in libintl],
gt_cv_func_gnugettext_libintl, [$gt_func_gnugettext_libintl],
[gt_save_CPPFLAGS="$CPPFLAGS" [gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL" CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS" gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL" LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on libiconv. 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 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
const char *_nl_expand_alias (); const char *_nl_expand_alias (const char *);
#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (0)) #define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
#else #else
#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
#endif #endif
]ifelse([$2], [need-formatstring-macros], $gt_revision_test_code
[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ]],
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) [[
#endif bindtextdomain ("", "");
changequote(,)dnl return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ]])],
changequote([,])dnl [eval "$gt_func_gnugettext_libintl=yes"],
], []), [eval "$gt_func_gnugettext_libintl=no"])
[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)
dnl Now see whether libintl exists and depends on libiconv. 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" LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h> AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <libintl.h>
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
const char *_nl_expand_alias (); const char *_nl_expand_alias (const char *);
#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (0)) #define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
#else #else
#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
#endif #endif
]ifelse([$2], [need-formatstring-macros], $gt_revision_test_code
[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ]],
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) [[
#endif bindtextdomain ("", "");
changequote(,)dnl return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; ]])],
changequote([,])dnl [LIBINTL="$LIBINTL $LIBICONV"
], []), LTLIBINTL="$LTLIBINTL $LTLIBICONV"
[bindtextdomain ("", ""); eval "$gt_func_gnugettext_libintl=yes"
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
])
fi fi
CPPFLAGS="$gt_save_CPPFLAGS" CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"]) 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 use it. But if this macro is used in GNU gettext, and GNU
dnl gettext is already preinstalled in libintl, we update this dnl gettext is already preinstalled in libintl, we update this
dnl libintl. (Cf. the install rule in intl/Makefile.in.) dnl libintl. (Cf. the install rule in intl/Makefile.in.)
if test "$gt_cv_func_gnugettext_libc" = "yes" \ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
&& test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-runtime \
&& test "$PACKAGE" != gettext-tools; }; then && test "$PACKAGE" != gettext-tools; }; then
gt_use_preinstalled_gnugettext=yes gt_use_preinstalled_gnugettext=yes
@ -239,7 +261,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
INCINTL= INCINTL=
fi fi
ifelse(gt_included_intl, yes, [ m4_if(gt_included_intl, yes, [
if test "$gt_use_preinstalled_gnugettext" != "yes"; then if test "$gt_use_preinstalled_gnugettext" != "yes"; then
dnl GNU gettext is not found in the C library. dnl GNU gettext is not found in the C library.
dnl Fall back on included GNU gettext 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. dnl Mark actions used to generate GNU NLS library.
BUILD_INCLUDED_LIBINTL=yes BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" LTLIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi fi
CATOBJEXT=
if test "$gt_use_preinstalled_gnugettext" = "yes" \ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then || test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions to use GNU gettext tools. dnl Mark actions to use GNU gettext tools.
@ -263,9 +286,18 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
fi 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" \ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then || 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 [Define to 1 if translation of program messages to the user's native language
is requested.]) is requested.])
else else
@ -278,7 +310,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
if test "$USE_NLS" = "yes"; then if test "$USE_NLS" = "yes"; then
AC_MSG_CHECKING([where the gettext function comes from]) AC_MSG_CHECKING([where the gettext function comes from])
if test "$gt_use_preinstalled_gnugettext" = "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
gt_source="external libintl" gt_source="external libintl"
else else
gt_source="libc" gt_source="libc"
@ -292,16 +324,16 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
if test "$USE_NLS" = "yes"; then if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "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_CHECKING([how to link with libintl])
AC_MSG_RESULT([$LIBINTL]) AC_MSG_RESULT([$LIBINTL])
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
fi fi
dnl For backward compatibility. Some packages may be using this. 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.]) [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.]) [Define if the GNU dcgettext() function is already present or preinstalled.])
fi fi
@ -309,125 +341,46 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
POSUB=po POSUB=po
fi fi
ifelse(gt_included_intl, yes, [ m4_if(gt_included_intl, yes, [
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
dnl to 'yes' because some of the testsuite requires it. dnl because some of the testsuite requires it.
if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then BUILD_INCLUDED_LIBINTL=yes
BUILD_INCLUDED_LIBINTL=yes
fi
dnl Make all variables we use known to autoconf. dnl Make all variables we use known to autoconf.
AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST([BUILD_INCLUDED_LIBINTL])
AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST([USE_INCLUDED_LIBINTL])
AC_SUBST(CATOBJEXT) 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)
]) ])
dnl For backward compatibility. Some Makefiles may be using this. dnl For backward compatibility. Some Makefiles may be using this.
INTLLIBS="$LIBINTL" INTLLIBS="$LIBINTL"
AC_SUBST(INTLLIBS) AC_SUBST([INTLLIBS])
dnl Make all documented variables known to autoconf. dnl Make all documented variables known to autoconf.
AC_SUBST(LIBINTL) AC_SUBST([LIBINTL])
AC_SUBST(LTLIBINTL) AC_SUBST([LTLIBINTL])
AC_SUBST(POSUB) AC_SUBST([POSUB])
]) ])
dnl Checks for all prerequisites of the intl subdirectory, dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, m4_define([gt_NEEDS_INIT],
dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
AC_DEFUN([AM_INTL_SUBDIR],
[ [
AC_REQUIRE([AC_PROG_INSTALL])dnl m4_divert_text([DEFAULTS], [gt_needs=])
AC_REQUIRE([AM_MKINSTALLDIRS])dnl m4_define([gt_NEEDS_INIT], [])
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 dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
AM_LANGINFO_CODESET AC_DEFUN([AM_GNU_GETTEXT_NEED],
if test $ac_cv_header_locale_h = yes; then [
AM_LC_MESSAGES m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
fi
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_VERSION([gettext-version]) dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])

313
config/iconv.m4
View file

@ -1,13 +1,17 @@
# iconv.m4 serial AM4 (gettext-0.11.3) # iconv.m4 serial 26
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. dnl Copyright (C) 2000-2002, 2007-2014, 2016-2023 Free Software Foundation,
dnl This file is free software, distributed under the terms of the GNU dnl Inc.
dnl General Public License. As a special exception to the GNU General dnl This file is free software; the Free Software Foundation
dnl Public License, this file may be distributed as part of a program dnl gives unlimited permission to copy and/or distribute it,
dnl that contains a configuration script generated by Autoconf, under dnl with or without modifications, as long as this notice is preserved.
dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible. 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], 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 Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed). 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 Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
dnl accordingly. dnl accordingly.
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) 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_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no am_cv_lib_iconv=no
dnl Add $INCICONV to CPPFLAGS before performing the first check, AC_LINK_IFELSE(
dnl because if the user has installed libiconv and not disabled its use [AC_LANG_PROGRAM(
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. #include <stdlib.h>
am_save_CPPFLAGS="$CPPFLAGS" #include <iconv.h>
CPPFLAGS="$CPPFLAGS $INCICONV" ]],
AC_TRY_LINK([#include <stdlib.h> [[iconv_t cd = iconv_open("","");
#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("","");
iconv(cd,NULL,NULL,NULL,NULL); iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);], iconv_close(cd);]])],
INCICONV="-I../libiconv/include" [am_cv_func_iconv=yes])
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
if test "$am_cv_func_iconv" != yes; then if test "$am_cv_func_iconv" != yes; then
am_save_CPPFLAGS="$CPPFLAGS"
am_save_LIBS="$LIBS" am_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $INCICONV"
LIBS="$LIBS $LIBICONV" LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <stdlib.h> AC_LINK_IFELSE(
#include <iconv.h>], [AC_LANG_PROGRAM(
[iconv_t cd = iconv_open("",""); [[
iconv(cd,NULL,NULL,NULL,NULL); #include <stdlib.h>
iconv_close(cd);], #include <iconv.h>
am_cv_lib_iconv=yes ]],
am_cv_func_iconv=yes) [[iconv_t cd = iconv_open("","");
CPPFLAGS="$am_save_CPPFLAGS" iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);]])],
[am_cv_lib_iconv=yes]
[am_cv_func_iconv=yes])
LIBS="$am_save_LIBS" LIBS="$am_save_LIBS"
fi fi
]) ])
if test "$am_cv_func_iconv" = yes; then 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 fi
if test "$am_cv_lib_iconv" = yes; then if test "$am_cv_lib_iconv" = yes; then
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
AC_MSG_CHECKING([how to link with libiconv]) AC_MSG_CHECKING([how to link with libiconv])
AC_MSG_RESULT([$LIBICONV]) AC_MSG_RESULT([$LIBICONV])
else else
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
dnl either.
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV= LIBICONV=
LTLIBICONV= LTLIBICONV=
fi fi
AC_SUBST(LIBICONV) AC_SUBST([LIBICONV])
AC_SUBST(LTLIBICONV) 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 AM_ICONV_LINK
if test "$am_cv_func_iconv" = yes; then if test "$am_cv_func_iconv" = yes; then
AC_MSG_CHECKING([for iconv declaration]) AC_CACHE_CHECK([whether iconv is compatible with its POSIX signature],
AC_CACHE_VAL(am_cv_proto_iconv, [ [gl_cv_iconv_nonconst],
AC_TRY_COMPILE([ [AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <stdlib.h> #include <stdlib.h>
#include <iconv.h> #include <iconv.h>
extern extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else ]],
size_t iconv(); [[]])],
#endif [gl_cv_iconv_nonconst=yes],
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") [gl_cv_iconv_nonconst=no])
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/( /(/'` else
AC_MSG_RESULT([$]{ac_t:- dnl When compiling GNU libiconv on a system that does not have iconv yet,
}[$]am_cv_proto_iconv) dnl pick the POSIX compliant declaration without 'const'.
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, gl_cv_iconv_nonconst=yes
[Define as const if the declaration of iconv() needs const.]) 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 fi
]) ])

69
config/intlmacosx.m4 Normal file
View file

@ -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])
])

44
configure vendored
View file

@ -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 # these libraries are used by various programs built for the host environment
#f #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 # these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to # 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. # files altogether, and which should be passed on to subconfigures.
# Also strip program-prefix, program-suffix, and program-transform-name, # Also strip program-prefix, program-suffix, and program-transform-name,
# so that we can pass down a consistent program-transform-name. # so that we can pass down a consistent program-transform-name.
baseargs= hbaseargs=
bbaseargs=
tbaseargs= tbaseargs=
keep_next=no keep_next=no
skip_next=no skip_next=no
@ -10136,7 +10137,8 @@ do
*\'*) *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac esac
baseargs="$baseargs '$ac_arg'" hbaseargs="$hbaseargs '$ac_arg'"
bbaseargs="$bbaseargs '$ac_arg'"
tbaseargs="$tbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'"
keep_next=no keep_next=no
continue continue
@ -10160,6 +10162,7 @@ do
esac esac
skip_targ=no skip_targ=no
skip_barg=no
case $ac_arg in case $ac_arg in
--with-* | --without-*) --with-* | --without-*)
@ -10172,6 +10175,12 @@ do
*[-_]lib) *[-_]lib)
lib=`echo "$libopt" | sed 's,[-_]lib$,,'` lib=`echo "$libopt" | sed 's,[-_]lib$,,'`
;; ;;
*[-_]prefix)
lib=`echo "$libopt" | sed 's,[-_]prefix$,,'`
;;
*[-_]type)
lib=`echo "$libopt" | sed 's,[-_]type$,,'`
;;
*) *)
lib=$libopt lib=$libopt
;; ;;
@ -10188,6 +10197,11 @@ do
skip_targ=yes skip_targ=yes
fi fi
;; ;;
libintl | libiconv)
# We don't want libintl (and co.) in anything but the host arguments.
skip_targ=yes
skip_barg=yes
;;
esac esac
;; ;;
esac esac
@ -10196,7 +10210,8 @@ do
--cache-file=/dev/null | \ --cache-file=/dev/null | \
-cache-file=/dev/null ) -cache-file=/dev/null )
# Handled here to avoid the test to skip args below. # 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'" tbaseargs="$tbaseargs '$ac_arg'"
# Assert: $separate_arg should always be no. # Assert: $separate_arg should always be no.
keep_next=$separate_arg keep_next=$separate_arg
@ -10227,7 +10242,10 @@ do
*\'*) *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac 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 if test X"$skip_targ" = Xno; then
tbaseargs="$tbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'"
fi fi
@ -10242,7 +10260,8 @@ do
done done
# Remove the initial space we just introduced and, as these will be # Remove the initial space we just introduced and, as these will be
# expanded by make, quote '$'. # 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 # Add in --program-transform-name, after --program-prefix and
# --program-suffix have been applied to it. Autoconf has already # --program-suffix have been applied to it. Autoconf has already
@ -10256,14 +10275,17 @@ ${program_transform_name}
EOF_SED EOF_SED
gcc_transform_name=`cat conftestsed.out` gcc_transform_name=`cat conftestsed.out`
rm -f 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}'" tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'"
if test "$silent" = yes; then if test "$silent" = yes; then
baseargs="$baseargs --silent" bbaseargs="$bbaseargs --silent"
hbaseargs="$hbaseargs --silent"
tbaseargs="$tbaseargs --silent" tbaseargs="$tbaseargs --silent"
fi fi
baseargs="$baseargs --disable-option-checking" bbaseargs="$bbaseargs --disable-option-checking"
hbaseargs="$hbaseargs --disable-option-checking"
tbaseargs="$tbaseargs --disable-option-checking" tbaseargs="$tbaseargs --disable-option-checking"
if test "$enable_year2038" = no; then 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 # 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 # libraries, as they're compiled differently; some with C, some with
# C++ or with different feature-enabling options. # 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. # For host modules, accept cache file option, or specification as blank.
case "${cache_file}" in case "${cache_file}" in
@ -10295,7 +10317,7 @@ esac
# Host dirs don't like to share a cache file either, horribly enough. # Host dirs don't like to share a cache file either, horribly enough.
# This seems to be due to autoconf 2.5x stupidity. # 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}" target_configargs="$target_configargs ${tbaseargs}"

44
configure.ac
View file

@ -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 # these libraries are used by various programs built for the host environment
#f #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 # these tools are built for the host environment
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to # 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. # files altogether, and which should be passed on to subconfigures.
# Also strip program-prefix, program-suffix, and program-transform-name, # Also strip program-prefix, program-suffix, and program-transform-name,
# so that we can pass down a consistent program-transform-name. # so that we can pass down a consistent program-transform-name.
baseargs= hbaseargs=
bbaseargs=
tbaseargs= tbaseargs=
keep_next=no keep_next=no
skip_next=no skip_next=no
@ -3255,7 +3256,8 @@ do
*\'*) *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac esac
baseargs="$baseargs '$ac_arg'" hbaseargs="$hbaseargs '$ac_arg'"
bbaseargs="$bbaseargs '$ac_arg'"
tbaseargs="$tbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'"
keep_next=no keep_next=no
continue continue
@ -3279,6 +3281,7 @@ do
esac esac
skip_targ=no skip_targ=no
skip_barg=no
case $ac_arg in case $ac_arg in
changequote(,) changequote(,)
--with-* | --without-*) --with-* | --without-*)
@ -3291,6 +3294,12 @@ changequote(,)
*[-_]lib) *[-_]lib)
lib=`echo "$libopt" | sed 's,[-_]lib$,,'` lib=`echo "$libopt" | sed 's,[-_]lib$,,'`
;; ;;
*[-_]prefix)
lib=`echo "$libopt" | sed 's,[-_]prefix$,,'`
;;
*[-_]type)
lib=`echo "$libopt" | sed 's,[-_]type$,,'`
;;
*) *)
lib=$libopt lib=$libopt
;; ;;
@ -3307,6 +3316,11 @@ changequote([,])
skip_targ=yes skip_targ=yes
fi fi
;; ;;
libintl | libiconv)
# We don't want libintl (and co.) in anything but the host arguments.
skip_targ=yes
skip_barg=yes
;;
esac esac
;; ;;
esac esac
@ -3315,7 +3329,8 @@ changequote([,])
--cache-file=/dev/null | \ --cache-file=/dev/null | \
-cache-file=/dev/null ) -cache-file=/dev/null )
# Handled here to avoid the test to skip args below. # 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'" tbaseargs="$tbaseargs '$ac_arg'"
# Assert: $separate_arg should always be no. # Assert: $separate_arg should always be no.
keep_next=$separate_arg keep_next=$separate_arg
@ -3346,7 +3361,10 @@ changequote([,])
*\'*) *\'*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac 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 if test X"$skip_targ" = Xno; then
tbaseargs="$tbaseargs '$ac_arg'" tbaseargs="$tbaseargs '$ac_arg'"
fi fi
@ -3361,7 +3379,8 @@ changequote([,])
done done
# Remove the initial space we just introduced and, as these will be # Remove the initial space we just introduced and, as these will be
# expanded by make, quote '$'. # 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 # Add in --program-transform-name, after --program-prefix and
# --program-suffix have been applied to it. Autoconf has already # --program-suffix have been applied to it. Autoconf has already
@ -3375,14 +3394,17 @@ ${program_transform_name}
EOF_SED EOF_SED
gcc_transform_name=`cat conftestsed.out` gcc_transform_name=`cat conftestsed.out`
rm -f 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}'" tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'"
if test "$silent" = yes; then if test "$silent" = yes; then
baseargs="$baseargs --silent" bbaseargs="$bbaseargs --silent"
hbaseargs="$hbaseargs --silent"
tbaseargs="$tbaseargs --silent" tbaseargs="$tbaseargs --silent"
fi fi
baseargs="$baseargs --disable-option-checking" bbaseargs="$bbaseargs --disable-option-checking"
hbaseargs="$hbaseargs --disable-option-checking"
tbaseargs="$tbaseargs --disable-option-checking" tbaseargs="$tbaseargs --disable-option-checking"
if test "$enable_year2038" = no; then 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 # 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 # libraries, as they're compiled differently; some with C, some with
# C++ or with different feature-enabling options. # 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. # For host modules, accept cache file option, or specification as blank.
case "${cache_file}" in case "${cache_file}" in
@ -3417,7 +3439,7 @@ esac
# Host dirs don't like to share a cache file either, horribly enough. # Host dirs don't like to share a cache file either, horribly enough.
# This seems to be due to autoconf 2.5x stupidity. # 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}" target_configargs="$target_configargs ${tbaseargs}"

2
contrib/download_prerequisites
View file

@ -31,6 +31,7 @@ gmp='gmp-6.2.1.tar.bz2'
mpfr='mpfr-4.1.0.tar.bz2' mpfr='mpfr-4.1.0.tar.bz2'
mpc='mpc-1.2.1.tar.gz' mpc='mpc-1.2.1.tar.gz'
isl='isl-0.24.tar.bz2' isl='isl-0.24.tar.bz2'
gettext='gettext-0.22.tar.gz'
base_url='http://gcc.gnu.org/pub/gcc/infrastructure/' base_url='http://gcc.gnu.org/pub/gcc/infrastructure/'
@ -38,6 +39,7 @@ echo_archives() {
echo "${gmp}" echo "${gmp}"
echo "${mpfr}" echo "${mpfr}"
echo "${mpc}" echo "${mpc}"
echo "${gettext}"
if [ ${graphite} -gt 0 ]; then echo "${isl}"; fi if [ ${graphite} -gt 0 ]; then echo "${isl}"; fi
} }

1
contrib/prerequisites.md5
View file

@ -2,3 +2,4 @@
44b892bc5a45bafb4294d134e13aad1d mpfr-4.1.0.tar.bz2 44b892bc5a45bafb4294d134e13aad1d mpfr-4.1.0.tar.bz2
9f16c976c25bb0f76b50be749cd7a3a8 mpc-1.2.1.tar.gz 9f16c976c25bb0f76b50be749cd7a3a8 mpc-1.2.1.tar.gz
dd2f7b78e118c25bd96134a52aae7f4d isl-0.24.tar.bz2 dd2f7b78e118c25bd96134a52aae7f4d isl-0.24.tar.bz2
c092102240f8f66134d22718421d5115 gettext-0.22.tar.gz

1
contrib/prerequisites.sha512
View file

@ -2,3 +2,4 @@
410208ee0d48474c1c10d3d4a59decd2dfa187064183b09358ec4c4666e34d74383128436b404123b831e585d81a9176b24c7ced9d913967c5fce35d4040a0b4 mpfr-4.1.0.tar.bz2 410208ee0d48474c1c10d3d4a59decd2dfa187064183b09358ec4c4666e34d74383128436b404123b831e585d81a9176b24c7ced9d913967c5fce35d4040a0b4 mpfr-4.1.0.tar.bz2
3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee mpc-1.2.1.tar.gz 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee mpc-1.2.1.tar.gz
aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95 isl-0.24.tar.bz2 aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95 isl-0.24.tar.bz2
e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz

8
gcc/Makefile.in
View file

@ -1124,9 +1124,11 @@ else
BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a
endif endif
# Dependencies on the intl and portability libraries. # Dependencies on the intl and portability libraries. The INTL dep might be
LIBDEPS= libcommon.a $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) \ # constructed with a ./ prefix, which GNU Make removes while processing
$(LIBDECNUMBER) $(LIBBACKTRACE) # 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 # Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC. # even if we are cross-building GCC.

4
gcc/aclocal.m4 vendored
View file

@ -76,15 +76,19 @@ m4_include([../config/dfp.m4])
m4_include([../config/enable.m4]) m4_include([../config/enable.m4])
m4_include([../config/gcc-plugin.m4]) m4_include([../config/gcc-plugin.m4])
m4_include([../config/gettext-sister.m4]) m4_include([../config/gettext-sister.m4])
m4_include([../config/gettext.m4])
m4_include([../config/iconv.m4]) m4_include([../config/iconv.m4])
m4_include([../config/intlmacosx.m4])
m4_include([../config/lcmessage.m4]) m4_include([../config/lcmessage.m4])
m4_include([../config/lead-dot.m4]) m4_include([../config/lead-dot.m4])
m4_include([../config/lib-ld.m4]) m4_include([../config/lib-ld.m4])
m4_include([../config/lib-link.m4]) m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.m4]) m4_include([../config/lib-prefix.m4])
m4_include([../config/mmap.m4]) m4_include([../config/mmap.m4])
m4_include([../config/nls.m4])
m4_include([../config/override.m4]) m4_include([../config/override.m4])
m4_include([../config/picflag.m4]) m4_include([../config/picflag.m4])
m4_include([../config/po.m4])
m4_include([../config/progtest.m4]) m4_include([../config/progtest.m4])
m4_include([../config/stdint.m4]) m4_include([../config/stdint.m4])
m4_include([../config/warnings.m4]) m4_include([../config/warnings.m4])

1999
gcc/configure vendored
View file

File diff suppressed because it is too large Load diff

72
gcc/doc/install.texi
View file

@ -477,6 +477,17 @@ is shown below:
@code{sys} and @code{time}. @code{sys} and @code{time}.
@end table @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 @end table
@heading Tools/packages necessary for modifying GCC @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{bfd}, @file{binutils}, @file{gas}, @file{gprof}, @file{ld},
@file{opcodes}, @dots{}) to the directory containing the GCC sources. @file{opcodes}, @dots{}) to the directory containing the GCC sources.
Likewise the GMP, MPFR and MPC libraries can be automatically built Likewise the GMP, MPFR, MPC and Gettext libraries can be automatically
together with GCC. You may simply run the built together with GCC. You may simply run the
@command{contrib/download_prerequisites} script in the GCC source directory @command{contrib/download_prerequisites} script in the GCC source directory
to set up everything. 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 distributions in the directory containing the GCC sources and rename
their directories to @file{gmp}, @file{mpfr} and @file{mpc}, their directories to @file{gmp}, @file{mpfr}, @file{mpc} and
respectively (or use symbolic links with the same name). @file{gettext}, respectively (or use symbolic links with the same name).
@html @html
<hr /> <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 English. Native Language Support is enabled by default if not doing a
canadian cross build. The @option{--disable-nls} option disables NLS@. 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 @item --with-included-gettext
If NLS is enabled, the @option{--with-included-gettext} option causes the build Only available if @file{gettext} is present in the source tree.
procedure to prefer its copy of GNU @command{gettext}.
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 @item --with-catgets
If NLS is enabled, and if the host lacks @code{gettext} but has the If NLS is enabled, and if the host lacks @code{gettext} but has the

5
libcpp/aclocal.m4 vendored
View file

@ -18,9 +18,14 @@ m4_include([../config/codeset.m4])
m4_include([../config/depstand.m4]) m4_include([../config/depstand.m4])
m4_include([../config/enable.m4]) m4_include([../config/enable.m4])
m4_include([../config/gettext-sister.m4]) m4_include([../config/gettext-sister.m4])
m4_include([../config/gettext.m4])
m4_include([../config/iconv.m4]) m4_include([../config/iconv.m4])
m4_include([../config/intlmacosx.m4])
m4_include([../config/lead-dot.m4]) m4_include([../config/lead-dot.m4])
m4_include([../config/lib-ld.m4]) m4_include([../config/lib-ld.m4])
m4_include([../config/lib-link.m4]) m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.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]) m4_include([../config/warnings.m4])

2197
libcpp/configure vendored
View file

File diff suppressed because it is too large Load diff

813
libstdc++-v3/configure vendored
View file

@ -26953,121 +26953,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 am_save_CPPFLAGS="$CPPFLAGS"
$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 for element in $INCICONV; do
haveit= haveit=
@ -27091,11 +26977,249 @@ $as_echo "#define HAVE_ICONV 1" >>confdefs.h
fi fi
done 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
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
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);
;
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
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_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 "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
$as_echo_n "checking how to link with libiconv... " >&6; } $as_echo_n "checking how to link with libiconv... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
$as_echo "$LIBICONV" >&6; } $as_echo "$LIBICONV" >&6; }
else else
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV= LIBICONV=
LTLIBICONV= LTLIBICONV=
fi fi
@ -27103,13 +27227,12 @@ $as_echo "$LIBICONV" >&6; }
if test "$am_cv_func_iconv" = yes; then if test "$am_cv_func_iconv" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
$as_echo_n "checking for iconv declaration... " >&6; } $as_echo_n "checking whether iconv is compatible with its POSIX signature... " >&6; }
if ${am_cv_proto_iconv+:} false; then : if ${gl_cv_iconv_nonconst+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <stdlib.h> #include <stdlib.h>
@ -27118,11 +27241,7 @@ extern
#ifdef __cplusplus #ifdef __cplusplus
"C" "C"
#endif #endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else
size_t iconv();
#endif
int int
main () main ()
@ -27133,24 +27252,42 @@ main ()
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
am_cv_proto_iconv_arg1="" gl_cv_iconv_nonconst=yes
else else
am_cv_proto_iconv_arg1="const" gl_cv_iconv_nonconst=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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/( /(/'` fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
}$am_cv_proto_iconv" >&5 $as_echo "$gl_cv_iconv_nonconst" >&6; }
$as_echo "${ac_t:- else
}$am_cv_proto_iconv" >&6; } 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 cat >>confdefs.h <<_ACEOF
#define ICONV_CONST $am_cv_proto_iconv_arg1 #define ICONV_CONST $iconv_arg1
_ACEOF _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 fi
@ -34923,210 +35060,6 @@ done
#GCC_CHECK_TLS #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 $as_echo "#define HAVE_USELOCALE 1" >>confdefs.h
;; ;;
@ -42370,210 +42303,6 @@ fi
done 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*) *-mingw32*)