From ca01f578739e14a42b23abb1794a2cdc0f7f2148 Mon Sep 17 00:00:00 2001 From: Mark Poliakov Date: Thu, 28 Aug 2025 16:34:14 +0300 Subject: [PATCH] ports: add GNU GMP 6.3.0 --- ports/gnu-gmp/compile.sh | 1 + ports/gnu-gmp/fetch.sh | 1 + ports/gnu-gmp/gnu-project.sh | 4 + ports/gnu-gmp/install.sh | 1 + .../0001-6.3.0-add-yggdrasil-support.patch | 71354 ++++++++++++++++ ports/gnu-gmp/port.toml | 2 + 6 files changed, 71363 insertions(+) create mode 120000 ports/gnu-gmp/compile.sh create mode 120000 ports/gnu-gmp/fetch.sh create mode 100644 ports/gnu-gmp/gnu-project.sh create mode 120000 ports/gnu-gmp/install.sh create mode 100644 ports/gnu-gmp/patches/6.3.0/0001-6.3.0-add-yggdrasil-support.patch create mode 100644 ports/gnu-gmp/port.toml diff --git a/ports/gnu-gmp/compile.sh b/ports/gnu-gmp/compile.sh new file mode 120000 index 00000000..d5f3b6cc --- /dev/null +++ b/ports/gnu-gmp/compile.sh @@ -0,0 +1 @@ +../meta-port-scripts/gnu-compile.sh \ No newline at end of file diff --git a/ports/gnu-gmp/fetch.sh b/ports/gnu-gmp/fetch.sh new file mode 120000 index 00000000..5a8fa3a0 --- /dev/null +++ b/ports/gnu-gmp/fetch.sh @@ -0,0 +1 @@ +../meta-port-scripts/gnu-fetch.sh \ No newline at end of file diff --git a/ports/gnu-gmp/gnu-project.sh b/ports/gnu-gmp/gnu-project.sh new file mode 100644 index 00000000..8fd1afe6 --- /dev/null +++ b/ports/gnu-gmp/gnu-project.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export GNU_PROJECT=gmp +export SRC_SHA256=e56fd59d76810932a0555aa15a14b61c16bed66110d3c75cc2ac49ddaa9ab24c +export GNU_CONFIGURE_OPTIONS= diff --git a/ports/gnu-gmp/install.sh b/ports/gnu-gmp/install.sh new file mode 120000 index 00000000..8a6ebf0d --- /dev/null +++ b/ports/gnu-gmp/install.sh @@ -0,0 +1 @@ +../meta-port-scripts/gnu-install.sh \ No newline at end of file diff --git a/ports/gnu-gmp/patches/6.3.0/0001-6.3.0-add-yggdrasil-support.patch b/ports/gnu-gmp/patches/6.3.0/0001-6.3.0-add-yggdrasil-support.patch new file mode 100644 index 00000000..e0790627 --- /dev/null +++ b/ports/gnu-gmp/patches/6.3.0/0001-6.3.0-add-yggdrasil-support.patch @@ -0,0 +1,71354 @@ +diff -crB gmp-6.3.0-orig/aclocal.m4 gmp-6.3.0/aclocal.m4 +*** gmp-6.3.0-orig/aclocal.m4 2023-07-29 16:42:19.000000000 +0300 +--- gmp-6.3.0/aclocal.m4 2025-08-28 16:19:50.105320938 +0300 +*************** +*** 1,6 **** +! # generated automatically by aclocal 1.15 -*- Autoconf -*- + +! # Copyright (C) 1996-2014 Free Software Foundation, Inc. + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 1,6 ---- +! # generated automatically by aclocal 1.18.1 -*- Autoconf -*- + +! # Copyright (C) 1996-2025 Free Software Foundation, Inc. + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 14,28 **** + m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +! m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +! [m4_warning([this file was generated for autoconf 2.69. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # +! # Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +--- 14,29 ---- + m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +! m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],, +! [m4_warning([this file was generated for autoconf 2.72. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # +! # Copyright (C) 1996-2001, 2003-2019, 2021-2025 Free Software +! # Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is free software; the Free Software Foundation gives +*************** +*** 30,42 **** + # modifications, as long as this notice is preserved. + + m4_define([_LT_COPYING], [dnl +! # Copyright (C) 2014 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # GNU Libtool is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +! # the Free Software Foundation; either version 2 of of the License, or + # (at your option) any later version. + # + # As a special exception to the GNU General Public License, if you +--- 31,43 ---- + # modifications, as long as this notice is preserved. + + m4_define([_LT_COPYING], [dnl +! # Copyright (C) 2025 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # GNU Libtool is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +! # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # As a special exception to the GNU General Public License, if you +*************** +*** 53,59 **** + # along with this program. If not, see . + ]) + +! # serial 58 LT_INIT + + + # LT_PREREQ(VERSION) +--- 54,60 ---- + # along with this program. If not, see . + ]) + +! # serial 65 LT_INIT + + + # LT_PREREQ(VERSION) +*************** +*** 81,87 **** + # LT_INIT([OPTIONS]) + # ------------------ + AC_DEFUN([LT_INIT], +! [AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl + AC_BEFORE([$0], [LT_LANG])dnl + AC_BEFORE([$0], [LT_OUTPUT])dnl +--- 82,88 ---- + # LT_INIT([OPTIONS]) + # ------------------ + AC_DEFUN([LT_INIT], +! [AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl + AC_BEFORE([$0], [LT_LANG])dnl + AC_BEFORE([$0], [LT_OUTPUT])dnl +*************** +*** 203,208 **** +--- 204,210 ---- + m4_require([_LT_CHECK_SHELL_FEATURES])dnl + m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl + m4_require([_LT_CMD_RELOAD])dnl ++ m4_require([_LT_DECL_FILECMD])dnl + m4_require([_LT_CHECK_MAGIC_METHOD])dnl + m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl + m4_require([_LT_CMD_OLD_ARCHIVE])dnl +*************** +*** 241,248 **** + ofile=libtool + can_build_shared=yes + +! # All known linkers require a '.a' archive for static linking (except MSVC, +! # which needs '.lib'). + libext=a + + with_gnu_ld=$lt_cv_prog_gnu_ld +--- 243,250 ---- + ofile=libtool + can_build_shared=yes + +! # All known linkers require a '.a' archive for static linking (except MSVC and +! # ICC, which need '.lib'). + libext=a + + with_gnu_ld=$lt_cv_prog_gnu_ld +*************** +*** 520,525 **** +--- 522,557 ---- + # ------------------------------ + m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + ++ # _LT_OBJECTIVE_C ++ # ------------------------------ ++ m4_defun([_LT_OBJECTIVE_C], [ ++ AC_CACHE_CHECK([for Objective C compilation], ++ [lt_cv_objc_compiles], ++ [ save_CFLAGS=$CFLAGS ++ CFLAGS=$OBJCFLAGS ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([#import ++ @interface Addition : NSObject ++ - (int)this:(int)a that:(int)b; ++ @end ++ ++ @implementation Addition ++ - (int)this:(int)a that:(int)b ++ { ++ return a + b; ++ } ++ @end ++ ],[])], ++ lt_cv_objc_compiles=yes, ++ lt_cv_objc_compiles=no ++ ) ++ CFLAGS=$save_CFLAGS ++ ] ++ ) ++ objc_compiles=$lt_cv_objc_compiles ++ _LT_DECL([], [objc_compiles], [1], ++ [Check for compiling Objective C and C++ code]) ++ ]) + + # _LT_CONFIG_COMMANDS + # ------------------- +*************** +*** 630,636 **** + # LT_OUTPUT + # --------- + # This macro allows early generation of the libtool script (before +! # AC_OUTPUT is called), incase it is used in configure for compilation + # tests. + AC_DEFUN([LT_OUTPUT], + [: ${CONFIG_LT=./config.lt} +--- 662,668 ---- + # LT_OUTPUT + # --------- + # This macro allows early generation of the libtool script (before +! # AC_OUTPUT is called), in case it is used in configure for compilation + # tests. + AC_DEFUN([LT_OUTPUT], + [: ${CONFIG_LT=./config.lt} +*************** +*** 665,673 **** + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +! Copyright (C) 2011 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation +! gives unlimited permision to copy, distribute and modify it." + + while test 0 != $[#] + do +--- 697,705 ---- + m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) + configured by $[0], generated by m4_PACKAGE_STRING. + +! Copyright (C) 2025 Free Software Foundation, Inc. + This config.lt script is free software; the Free Software Foundation +! gives unlimited permission to copy, distribute and modify it." + + while test 0 != $[#] + do +*************** +*** 744,750 **** + cat <<_LT_EOF >> "$cfgfile" + #! $SHELL + # Generated automatically by $as_me ($PACKAGE) $VERSION +- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + + # Provide generalized library-building support services. +--- 776,781 ---- +*************** +*** 794,800 **** + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +! sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || +--- 825,831 ---- + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +! $SED '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || +*************** +*** 841,846 **** +--- 872,879 ---- + m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], ++ [Objective-C], [_LT_LANG(OBJC)], ++ [Objective-C++], [_LT_LANG(OBJCXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], +*************** +*** 920,925 **** +--- 953,966 ---- + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + ++ AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [LT_LANG(OBJC)], ++ [m4_define([AC_PROG_OBJC], defn([AC_PROG_OBJC])[LT_LANG(OBJC)])]) ++ ++ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], ++ [LT_LANG(OBJCXX)], ++ [m4_define([AC_PROG_OBJCXX], defn([AC_PROG_OBJCXX])[LT_LANG(OBJCXX)])]) ++ + AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +*************** +*** 1037,1042 **** +--- 1079,1099 ---- + rm -f conftest.* + fi]) + ++ # Feature test to disable chained fixups since it is not ++ # compatible with '-undefined dynamic_lookup' ++ AC_CACHE_CHECK([for -no_fixup_chains linker flag], ++ [lt_cv_support_no_fixup_chains], ++ [ save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains" ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([],[])], ++ lt_cv_support_no_fixup_chains=yes, ++ lt_cv_support_no_fixup_chains=no ++ ) ++ LDFLAGS=$save_LDFLAGS ++ ] ++ ) ++ + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no +*************** +*** 1056,1067 **** + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD +! echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD +! $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +! int main() { return 0;} + _LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err +--- 1113,1124 ---- + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD +! echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD +! $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +! int main(void) { return 0;} + _LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err +*************** +*** 1081,1103 **** + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! darwin*) # darwin 5.x on +! # if running on 10.5 or later, the deployment target defaults +! # to the OS version, if on x86, and 10.4, the deployment +! # target defaults to 10.4. Don't you love it? +! case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +! 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +! _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; +! 10.[[012]][[,.]]*) +! _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! 10.*) +! _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else +--- 1138,1174 ---- + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! darwin*) +! case $MACOSX_DEPLOYMENT_TARGET,$host in +! 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) +! _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! *) +! _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' +! if test yes = "$lt_cv_support_no_fixup_chains"; then +! AS_VAR_APPEND([_lt_dar_allow_undefined], [' $wl-no_fixup_chains']) +! fi +! ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi ++ _lt_dar_needs_single_mod=no ++ case $host_os in ++ rhapsody* | darwin1.*) ++ _lt_dar_needs_single_mod=yes ;; ++ darwin*) ++ # When targeting Mac OS X 10.4 (darwin 8) or later, ++ # -single_module is the default and -multi_module is unsupported. ++ # The toolchain on macOS 10.14 (darwin 18) and later cannot ++ # target any OS version that needs -single_module. ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*-darwin[[567]].*|10.[[0-3]],*-darwin[[5-9]].*|10.[[0-3]],*-darwin1[[0-7]].*) ++ _lt_dar_needs_single_mod=yes ;; ++ esac ++ ;; ++ esac + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else +*************** +*** 1140,1151 **** + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" +! _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +! _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +! [ if test yes != "$lt_cv_apple_cc_single_mod"; then +! _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" +! _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi + ],[]) + else +--- 1211,1222 ---- + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" +! _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +! _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +! [ if test yes = "$_lt_dar_needs_single_mod" -a yes != "$lt_cv_apple_cc_single_mod"; then +! _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" +! _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi + ],[]) + else +*************** +*** 1259,1265 **** + # _LT_WITH_SYSROOT + # ---------------- + AC_DEFUN([_LT_WITH_SYSROOT], +! [AC_MSG_CHECKING([for sysroot]) + AC_ARG_WITH([sysroot], + [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot +--- 1330,1337 ---- + # _LT_WITH_SYSROOT + # ---------------- + AC_DEFUN([_LT_WITH_SYSROOT], +! [m4_require([_LT_DECL_SED])dnl +! AC_MSG_CHECKING([for sysroot]) + AC_ARG_WITH([sysroot], + [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot +*************** +*** 1272,1282 **** + case $with_sysroot in #( + yes) + if test yes = "$GCC"; then +! lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +! lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( +--- 1344,1356 ---- + case $with_sysroot in #( + yes) + if test yes = "$GCC"; then +! # Trim trailing / since we'll always append absolute paths and we want +! # to avoid //, if only for less confusing output for the user. +! lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'` + fi + ;; #( + /*) +! lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( +*************** +*** 1306,1312 **** + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +! case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; +--- 1380,1386 ---- + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +! case `$FILECMD conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; +*************** +*** 1323,1329 **** + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test yes = "$lt_cv_prog_gnu_ld"; then +! case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; +--- 1397,1403 ---- + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test yes = "$lt_cv_prog_gnu_ld"; then +! case `$FILECMD conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; +*************** +*** 1335,1341 **** + ;; + esac + else +! case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; +--- 1409,1415 ---- + ;; + esac + else +! case `$FILECMD conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; +*************** +*** 1357,1363 **** + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf +! case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; +--- 1431,1437 ---- + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf +! case `$FILECMD conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; +*************** +*** 1365,1371 **** + emul="${emul}64" + ;; + esac +! case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; +--- 1439,1445 ---- + emul="${emul}64" + ;; + esac +! case `$FILECMD conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; +*************** +*** 1373,1379 **** + emul="${emul}ltsmip" + ;; + esac +! case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; +--- 1447,1453 ---- + emul="${emul}ltsmip" + ;; + esac +! case `$FILECMD conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; +*************** +*** 1384,1390 **** + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +! s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when +--- 1458,1464 ---- + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +! s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when +*************** +*** 1393,1406 **** + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +! case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; +! x86_64-*linux*) +! case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; +--- 1467,1480 ---- + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +! case `$FILECMD conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; +! x86_64-*linux*|x86_64-gnu*) +! case `$FILECMD conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; +*************** +*** 1428,1434 **** + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; +! x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) +--- 1502,1508 ---- + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; +! x86_64-*linux*|x86_64-gnu*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) +*************** +*** 1468,1474 **** + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +! case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) +--- 1542,1548 ---- + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +! case `$FILECMD conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) +*************** +*** 1507,1515 **** + m4_defun([_LT_PROG_AR], + [AC_CHECK_TOOLS(AR, [ar], false) + : ${AR=ar} +- : ${AR_FLAGS=cru} + _LT_DECL([], [AR], [1], [The archiver]) +! _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + + AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no +--- 1581,1602 ---- + m4_defun([_LT_PROG_AR], + [AC_CHECK_TOOLS(AR, [ar], false) + : ${AR=ar} + _LT_DECL([], [AR], [1], [The archiver]) +! +! # Use ARFLAGS variable as AR's operation code to sync the variable naming with +! # Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +! # higher priority because that's what people were doing historically (setting +! # ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +! # variable obsoleted/removed. +! +! test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +! lt_ar_flags=$AR_FLAGS +! _LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) +! +! # Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +! # by AR_FLAGS because that was never working and AR_FLAGS is about to die. +! _LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], +! [Flags to create an archive]) + + AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no +*************** +*** 1548,1554 **** + test -z "$STRIP" && STRIP=: + _LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +! AC_CHECK_TOOL(RANLIB, ranlib, :) + test -z "$RANLIB" && RANLIB=: + _LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) +--- 1635,1641 ---- + test -z "$STRIP" && STRIP=: + _LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +! AC_REQUIRE([AC_PROG_RANLIB]) + test -z "$RANLIB" && RANLIB=: + _LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) +*************** +*** 1559,1573 **** + old_postuninstall_cmds= + + if test -n "$RANLIB"; then +- case $host_os in +- bitrig* | openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" +- ;; +- esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + fi + + case $host_os in +--- 1646,1653 ---- + old_postuninstall_cmds= + + if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + fi + + case $host_os in +*************** +*** 1699,1712 **** + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + +! gnu*) +! # Under GNU Hurd, this test is not required because there is +! # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + +! cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +--- 1779,1792 ---- + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + +! gnu* | ironclad*) +! # Under GNU Hurd and Ironclad, this test is not required because there +! # is no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + +! cygwin* | mingw* | windows* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +*************** +*** 1728,1734 **** + lt_cv_sys_max_cmd_len=8192; + ;; + +! bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +--- 1808,1814 ---- + lt_cv_sys_max_cmd_len=8192; + ;; + +! darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +*************** +*** 1771,1777 **** + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then +! lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi +--- 1851,1857 ---- + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then +! lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi +*************** +*** 1888,1898 **** + /* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +! int fnord () __attribute__((visibility("default"))); + #endif + +! int fnord () { return 42; } +! int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; +--- 1968,1978 ---- + /* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +! int fnord (void) __attribute__((visibility("default"))); + #endif + +! int fnord (void) { return 42; } +! int main (void) + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; +*************** +*** 1949,1955 **** + lt_cv_dlopen_self=yes + ;; + +! mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; +--- 2029,2035 ---- + lt_cv_dlopen_self=yes + ;; + +! mingw* | windows* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; +*************** +*** 2221,2246 **** + striplib= + old_striplib= + AC_MSG_CHECKING([whether stripping libraries is possible]) +! if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +! test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +! test -z "$striplib" && striplib="$STRIP --strip-unneeded" +! AC_MSG_RESULT([yes]) + else +! # FIXME - insert some real tests, host_os isn't really good enough +! case $host_os in +! darwin*) +! if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) +! else + AC_MSG_RESULT([no]) +! fi +! ;; +! *) +! AC_MSG_RESULT([no]) +! ;; +! esac + fi + _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) + _LT_DECL([], [striplib], [1]) +--- 2301,2335 ---- + striplib= + old_striplib= + AC_MSG_CHECKING([whether stripping libraries is possible]) +! if test -z "$STRIP"; then +! AC_MSG_RESULT([no]) + else +! if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +! old_striplib="$STRIP --strip-debug" +! striplib="$STRIP --strip-unneeded" +! AC_MSG_RESULT([yes]) +! else +! case $host_os in +! darwin*) +! # FIXME - insert some real tests, host_os isn't really good enough + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) +! ;; +! freebsd*) +! if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then +! old_striplib="$STRIP --strip-debug" +! striplib="$STRIP --strip-unneeded" +! AC_MSG_RESULT([yes]) +! else +! AC_MSG_RESULT([no]) +! fi +! ;; +! *) + AC_MSG_RESULT([no]) +! ;; +! esac +! fi + fi + _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) + _LT_DECL([], [striplib], [1]) +*************** +*** 2308,2314 **** + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in +! mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` +--- 2397,2403 ---- + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in +! mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` +*************** +*** 2366,2372 **** + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in +! mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +--- 2455,2461 ---- + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in +! mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +*************** +*** 2441,2447 **** + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl +! # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the +--- 2530,2536 ---- + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl +! # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the +*************** +*** 2535,2541 **** + # libtool to hard-code these into programs + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no +--- 2624,2630 ---- + # libtool to hard-code these into programs + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no +*************** +*** 2546,2560 **** + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! test -d \$dldir || mkdir -p \$dldir~ +! $install_prog $dir/$dlname \$dldir/$dlname~ +! chmod a+x \$dldir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +! fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' +--- 2635,2663 ---- + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +! # If user builds GCC with multilib enabled, +! # it should just install on $(libdir) +! # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones. +! if test xyes = x"$multilib"; then +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! $install_prog $dir/$dlname $destdir/$dlname~ +! chmod a+x $destdir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib $destdir/$dlname'\'' || exit \$?; +! fi' +! else +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! test -d \$dldir || mkdir -p \$dldir~ +! $install_prog $dir/$dlname \$dldir/$dlname~ +! chmod a+x \$dldir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +! fi' +! fi + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' +*************** +*** 2563,2592 **** + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +! soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; +! mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +! library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + +! *,cl*) +! # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in +! mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' +--- 2666,2695 ---- + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +! soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; +! mingw* | windows* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +! library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + +! *,cl* | *,icl*) +! # Native MSVC or ICC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in +! mingw* | windows*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' +*************** +*** 2599,2605 **** + done + IFS=$lt_save_ifs + # Convert to MSYS style. +! sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form +--- 2702,2708 ---- + done + IFS=$lt_save_ifs + # Convert to MSYS style. +! sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form +*************** +*** 2636,2642 **** + ;; + + *) +! # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; +--- 2739,2745 ---- + ;; + + *) +! # Assume MSVC and ICC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; +*************** +*** 2669,2675 **** + shlibpath_var=LD_LIBRARY_PATH + ;; + +! freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then +--- 2772,2778 ---- + shlibpath_var=LD_LIBRARY_PATH + ;; + +! freebsd* | dragonfly* | midnightbsd*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then +*************** +*** 2693,2699 **** + need_version=yes + ;; + esac +! shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes +--- 2796,2816 ---- + need_version=yes + ;; + esac +! case $host_cpu in +! powerpc64) +! # On FreeBSD bi-arch platforms, a different variable is used for 32-bit +! # binaries. See . +! AC_COMPILE_IFELSE( +! [AC_LANG_SOURCE( +! [[int test_pointer_size[sizeof (void *) - 5]; +! ]])], +! [shlibpath_var=LD_LIBRARY_PATH], +! [shlibpath_var=LD_32_LIBRARY_PATH]) +! ;; +! *) +! shlibpath_var=LD_LIBRARY_PATH +! ;; +! esac + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes +*************** +*** 2723,2730 **** + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no +! sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' +! hardcode_into_libs=yes + ;; + + hpux9* | hpux10* | hpux11*) +--- 2840,2848 ---- + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no +! sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib' +! sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib' +! hardcode_into_libs=no + ;; + + hpux9* | hpux10* | hpux11*) +*************** +*** 2834,2840 **** + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no +! library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH +--- 2952,2958 ---- + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no +! library_names_spec='$libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH +*************** +*** 2846,2853 **** + hardcode_into_libs=yes + + dynamic_linker='Android linker' +! # Don't embed -rpath directories since the linker doesn't support them. +! _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + + # This must be glibc/ELF. +--- 2964,2972 ---- + hardcode_into_libs=yes + + dynamic_linker='Android linker' +! # -rpath works at least for libraries that are not overridden by +! # libraries installed in system locations. +! _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + + # This must be glibc/ELF. +*************** +*** 2881,2887 **** + # before this can be enabled. + hardcode_into_libs=yes + +! # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, +--- 3000,3006 ---- + # before this can be enabled. + hardcode_into_libs=yes + +! # Ideally, we could use ldconfig to report *all* directories which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, +*************** +*** 2901,2906 **** +--- 3020,3039 ---- + dynamic_linker='GNU/Linux ld.so' + ;; + ++ netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ enable_cxx_stdlib=yes ++ stdlibflag= ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +*************** +*** 2917,2922 **** +--- 3050,3069 ---- + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes ++ enable_cxx_stdlib=yes ++ stdlibflag= ++ ;; ++ ++ *-mlibc) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ dynamic_linker='mlibc ld.so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes + ;; + + newsos6) +*************** +*** 2938,2944 **** + dynamic_linker='ldqnx.so' + ;; + +! openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +--- 3085,3091 ---- + dynamic_linker='ldqnx.so' + ;; + +! openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +*************** +*** 2998,3003 **** +--- 3145,3161 ---- + dynamic_linker=no + ;; + ++ serenity*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ dynamic_linker='SerenityOS LibELF' ++ ;; ++ + solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no +*************** +*** 3095,3100 **** +--- 3253,3273 ---- + shlibpath_var=LD_LIBRARY_PATH + ;; + ++ emscripten*) ++ version_type=none ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext' ++ soname_spec='$libname$release$shared_ext' ++ finish_cmds= ++ dynamic_linker="Emscripten linker" ++ _LT_COMPILER_PIC($1)='-fPIC' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(no_undefined_flag, $1)= ++ ;; ++ + *) + dynamic_linker=no + ;; +*************** +*** 3270,3276 **** + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in +! *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) +--- 3443,3449 ---- + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in +! *-*-mingw* | *-*-windows*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) +*************** +*** 3379,3392 **** + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) + if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) + if test yes = "$GCC"; then +! reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +--- 3552,3565 ---- + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) + if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) + if test yes = "$GCC"; then +! reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +*************** +*** 3451,3457 **** + # 'none' -- dependencies not supported. + # 'unknown' -- same as none, but documents that we really don't know. + # 'pass_all' -- all dependencies passed with no checks. +- # 'test_compile' -- check by making test program. + # 'file_magic [[regex]]' -- check by looking for files in library path + # that responds to the $file_magic_cmd with a given extended regex. + # If you have 'file' or equivalent on your system and you're not sure +--- 3624,3629 ---- +*************** +*** 3468,3474 **** + + bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' +! lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +--- 3640,3646 ---- + + bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' +! lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +*************** +*** 3478,3484 **** + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +! mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. +--- 3650,3656 ---- + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +! mingw* | windows* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. +*************** +*** 3487,3493 **** + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. +! lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +--- 3659,3665 ---- + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. +! lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +*************** +*** 3502,3515 **** + lt_cv_deplibs_check_method=pass_all + ;; + +! freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' +! lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac +--- 3674,3687 ---- + lt_cv_deplibs_check_method=pass_all + ;; + +! freebsd* | dragonfly* | midnightbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' +! lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac +*************** +*** 3523,3529 **** + ;; + + hpux10.20* | hpux11*) +! lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' +--- 3695,3701 ---- + ;; + + hpux10.20* | hpux11*) +! lt_cv_file_magic_cmd=$FILECMD + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' +*************** +*** 3560,3566 **** + lt_cv_deplibs_check_method=pass_all + ;; + +! netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +--- 3732,3742 ---- + lt_cv_deplibs_check_method=pass_all + ;; + +! *-mlibc) +! lt_cv_deplibs_check_method=pass_all +! ;; +! +! netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +*************** +*** 3570,3576 **** + + newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +! lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +--- 3746,3752 ---- + + newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +! lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*************** +*** 3578,3584 **** + lt_cv_deplibs_check_method=pass_all + ;; + +! openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +--- 3754,3760 ---- + lt_cv_deplibs_check_method=pass_all + ;; + +! openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +*************** +*** 3594,3599 **** +--- 3770,3779 ---- + lt_cv_deplibs_check_method=pass_all + ;; + ++ serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +*************** +*** 3642,3648 **** + want_nocaseglob=no + if test "$build" = "$host"; then + case $host_os in +! mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else +--- 3822,3828 ---- + want_nocaseglob=no + if test "$build" = "$host"; then + case $host_os in +! mingw* | windows* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else +*************** +*** 3694,3709 **** + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in +! mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac +! case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) +! case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 +--- 3874,3889 ---- + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in +! mingw* | windows*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac +! case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) +! case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 +*************** +*** 3729,3735 **** + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) +! case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; +--- 3909,3915 ---- + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) +! case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; +*************** +*** 3785,3791 **** + [lt_cv_sharedlib_from_linklib_cmd='unknown' + + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in +--- 3965,3971 ---- + [lt_cv_sharedlib_from_linklib_cmd='unknown' + + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in +*************** +*** 3817,3832 **** + m4_defun([_LT_PATH_MANIFEST_TOOL], + [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) + test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +! AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], +! [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then +! lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +! if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: + fi + _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +--- 3997,4012 ---- + m4_defun([_LT_PATH_MANIFEST_TOOL], + [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) + test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +! AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_manifest_tool], +! [lt_cv_path_manifest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then +! lt_cv_path_manifest_tool=yes + fi + rm -f conftest*]) +! if test yes != "$lt_cv_path_manifest_tool"; then + MANIFEST_TOOL=: + fi + _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +*************** +*** 3855,3861 **** + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case $host in +! *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +--- 4035,4041 ---- + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case $host in +! *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +*************** +*** 3930,3936 **** + aix*) + symcode='[[BCDT]]' + ;; +! cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; + hpux*) +--- 4110,4116 ---- + aix*) + symcode='[[BCDT]]' + ;; +! cygwin* | mingw* | windows* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; + hpux*) +*************** +*** 3945,3951 **** + symcode='[[BCDEGQRST]]' + ;; + solaris*) +! symcode='[[BDRT]]' + ;; + sco3.2v5*) + symcode='[[DT]]' +--- 4125,4131 ---- + symcode='[[BCDEGQRST]]' + ;; + solaris*) +! symcode='[[BCDRT]]' + ;; + sco3.2v5*) + symcode='[[DT]]' +*************** +*** 3969,3975 **** + + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. +! lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" +--- 4149,4155 ---- + + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. +! lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" +*************** +*** 3987,4006 **** + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. +! lt_cv_sys_global_symbol_to_cdecl="sed -n"\ + $lt_cdecl_hook\ + " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +! lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ + $lt_c_name_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + + # Transform an extracted symbol line into symbol name with lib prefix and + # symbol address. +! lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ + $lt_c_name_lib_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +--- 4167,4186 ---- + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. +! lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ + $lt_cdecl_hook\ + " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +! lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ + $lt_c_name_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + + # Transform an extracted symbol line into symbol name with lib prefix and + # symbol address. +! lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ + $lt_c_name_lib_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +*************** +*** 4009,4015 **** + # Handle CRLF in mingw tool chain + opt_cr= + case $build_os in +! mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; + esac +--- 4189,4195 ---- + # Handle CRLF in mingw tool chain + opt_cr= + case $build_os in +! mingw* | windows*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; + esac +*************** +*** 4024,4030 **** + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. +! # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ + " {last_section=section; section=\$ 3};"\ +--- 4204,4210 ---- + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. +! # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ + " {last_section=section; section=\$ 3};"\ +*************** +*** 4042,4050 **** + " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx]" + else +! lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +! lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +--- 4222,4230 ---- + " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx]" + else +! lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +! lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +*************** +*** 4060,4072 **** + #ifdef __cplusplus + } + #endif +! int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm +! if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +--- 4240,4253 ---- + #ifdef __cplusplus + } + #endif +! int main(void){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm +! $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD +! if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +*************** +*** 4236,4242 **** + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +! mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +--- 4417,4423 ---- + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +! mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +*************** +*** 4312,4318 **** + ;; + esac + ;; +! mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], +--- 4493,4499 ---- + ;; + esac + ;; +! mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], +*************** +*** 4331,4337 **** + ;; + esac + ;; +! freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +--- 4512,4518 ---- + ;; + esac + ;; +! freebsd* | dragonfly* | midnightbsd*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +*************** +*** 4414,4420 **** + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +--- 4595,4601 ---- + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +*************** +*** 4438,4444 **** + ;; + esac + ;; +! netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +--- 4619,4627 ---- + ;; + esac + ;; +! netbsd* | netbsdelf*-gnu) +! ;; +! *-mlibc) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +*************** +*** 4468,4473 **** +--- 4651,4658 ---- + ;; + psos*) + ;; ++ serenity*) ++ ;; + solaris*) + case $cc_basename in + CC* | sunCC*) +*************** +*** 4560,4566 **** + # PIC is the default for these OSes. + ;; + +! mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +--- 4745,4751 ---- + # PIC is the default for these OSes. + ;; + +! mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +*************** +*** 4664,4670 **** + esac + ;; + +! mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], +--- 4849,4855 ---- + esac + ;; + +! mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], +*************** +*** 4706,4711 **** +--- 4891,4902 ---- + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; ++ *flang* | ftn | f18* | f95*) ++ # Flang compiler. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) +*************** +*** 4750,4756 **** + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +--- 4941,4947 ---- + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +*************** +*** 4788,4793 **** +--- 4979,4990 ---- + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ++ *-mlibc) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. +*************** +*** 4804,4809 **** +--- 5001,5009 ---- + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + ++ serenity*) ++ ;; ++ + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +*************** +*** 4933,4947 **** + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; +! cygwin* | mingw* | cegcc*) + case $cc_basename in +! cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) +--- 5133,5147 ---- + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; +! cygwin* | mingw* | windows* | cegcc*) + case $cc_basename in +! cl* | icl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) +*************** +*** 4997,5017 **** + extract_expsyms_cmds= + + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) +! # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) +! # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; +- openbsd* | bitrig*) +- with_gnu_ld=no +- ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +--- 5197,5214 ---- + extract_expsyms_cmds= + + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) +! # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++ or Intel C++ Compiler. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) +! # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + with_gnu_ld=yes + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +*************** +*** 5058,5064 **** + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no +! case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +--- 5255,5261 ---- + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no +! case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +*************** +*** 5112,5118 **** + fi + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +--- 5309,5315 ---- + fi + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +*************** +*** 5122,5127 **** +--- 5319,5325 ---- + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ++ _LT_TAGVAR(file_list_spec, $1)='@' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +*************** +*** 5141,5147 **** + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + os2*) +--- 5339,5345 ---- + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + + os2*) +*************** +*** 5168,5175 **** + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + interix[[3-9]]*) +--- 5366,5374 ---- + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' + ;; + + interix[[3-9]]*) +*************** +*** 5184,5190 **** + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) +--- 5383,5389 ---- + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) +*************** +*** 5227,5233 **** + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes +--- 5426,5432 ---- + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes +*************** +*** 5239,5251 **** + + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) +--- 5438,5451 ---- + + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) +*************** +*** 5255,5261 **** + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi +--- 5455,5461 ---- + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi +*************** +*** 5266,5272 **** + fi + ;; + +! netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +--- 5466,5477 ---- + fi + ;; + +! *-mlibc) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' +! ;; +! +! netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +*************** +*** 5387,5393 **** + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + +--- 5592,5598 ---- + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + +*************** +*** 5568,5581 **** + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in +! cl*) +! # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes +--- 5773,5786 ---- + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++ or Intel C++ Compiler. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in +! cl* | icl*) +! # Native MSVC or ICC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes +*************** +*** 5585,5598 **** + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +! _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ +! $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +--- 5790,5803 ---- + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +! _LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ +! $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +*************** +*** 5616,5622 **** + fi' + ;; + *) +! # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. +--- 5821,5827 ---- + fi' + ;; + *) +! # Assume MSVC and ICC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. +*************** +*** 5664,5670 **** + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +! freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes +--- 5869,5875 ---- + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +! freebsd* | dragonfly* | midnightbsd*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes +*************** +*** 5804,5814 **** + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + +! netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +--- 6009,6023 ---- + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + esac + ;; + +! *-mlibc) +! ;; +! +! netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +*************** +*** 5830,5836 **** + *nto* | *qnx*) + ;; + +! openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +--- 6039,6045 ---- + *nto* | *qnx*) + ;; + +! openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +*************** +*** 5873,5880 **** + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + osf3*) +--- 6082,6090 ---- + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' + ;; + + osf3*) +*************** +*** 5908,5913 **** +--- 6118,6126 ---- + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + ++ serenity*) ++ ;; ++ + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test yes = "$GCC"; then +*************** +*** 6166,6172 **** + _LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is +! "absolute", i.e impossible to change by setting $shlibpath_var if the + library is relocated]) + _LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR +--- 6379,6385 ---- + _LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is +! "absolute", i.e. impossible to change by setting $shlibpath_var if the + library is relocated]) + _LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR +*************** +*** 6224,6230 **** + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +! lt_simple_link_test_code='int main(){return(0);}' + + _LT_TAG_COMPILER + # Save the default compiler, since it gets overwritten when the other +--- 6437,6443 ---- + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +! lt_simple_link_test_code='int main(void){return(0);}' + + _LT_TAG_COMPILER + # Save the default compiler, since it gets overwritten when the other +*************** +*** 6397,6404 **** + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then +! _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' +--- 6610,6617 ---- + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then +! _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' +*************** +*** 6409,6416 **** + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. +! if eval "`$CC -print-prog-name=ld` --help 2>&1" | +! $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= +--- 6622,6628 ---- + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. +! if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= +*************** +*** 6424,6436 **** + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no +--- 6636,6648 ---- + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' + + else + GXX=no +*************** +*** 6639,6648 **** + esac + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in +! ,cl* | no,cl*) +! # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +--- 6851,6860 ---- + esac + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + case $GXX,$cc_basename in +! ,cl* | no,cl* | ,icl* | no,icl*) +! # Native MSVC or ICC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +*************** +*** 6692,6700 **** + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then +--- 6904,6913 ---- + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then +*************** +*** 6703,6709 **** + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +! $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +--- 6916,6922 ---- + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +! $CC -shared $stdlibflag $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +*************** +*** 6738,6745 **** + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + dgux*) +--- 6951,6959 ---- + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='@' + ;; + + dgux*) +*************** +*** 6770,6776 **** + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + +! freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes +--- 6984,6990 ---- + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + +! freebsd* | dragonfly* | midnightbsd*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes +*************** +*** 6778,6784 **** + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) +--- 6992,6998 ---- + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! _LT_TAGVAR(link_all_deplibs, $1)=no + ;; + + hpux9*) +*************** +*** 6805,6815 **** + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then +! _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +--- 7019,7029 ---- + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "[[-]]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then +! _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $stdlibflag $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no +*************** +*** 6870,6889 **** + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +--- 7084,7103 ---- + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " [[-]]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +*************** +*** 6907,6913 **** + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in +--- 7121,7127 ---- + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in +*************** +*** 6924,6932 **** + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +--- 7138,7146 ---- + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes +*************** +*** 7047,7059 **** + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +--- 7261,7273 ---- + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +*************** +*** 7102,7107 **** +--- 7316,7325 ---- + esac + ;; + ++ *-mlibc) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +*************** +*** 7109,7124 **** + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi +! # Workaround some broken pre-1.5 toolchains +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + +! openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +--- 7327,7344 ---- + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi +! output_verbose_link_cmd=func_echo_all + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + +! openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +*************** +*** 7196,7205 **** + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + +--- 7416,7425 ---- + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + +*************** +*** 7209,7215 **** + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support +--- 7429,7435 ---- + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' + + else + # FIXME: insert proper C++ library support +*************** +*** 7224,7229 **** +--- 7444,7452 ---- + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ++ serenity*) ++ ;; ++ + sunos4*) + case $cc_basename in + CC*) +*************** +*** 7286,7310 **** + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. +! _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' +--- 7509,7533 ---- + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +! _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -shared $pic_flag $stdlibflag $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. +! _LT_TAGVAR(archive_cmds, $1)='$CC -G $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -G $stdlibflag $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [[-]]L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' +*************** +*** 7538,7551 **** + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) +! # Some compilers place space between "-{L,R}" and the path. + # Remove the space. +! if test x-L = "$p" || +! test x-R = "$p"; then + prev=$p + continue + fi +--- 7761,7779 ---- + # the conftest object file. + pre_test_object_deps_done=no + ++ if test yes = "$enable_cxx_stdlib"; then ++ output_verbose_link_cmd= ++ fi ++ + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) +! # Some compilers place space between "-{L,R,l}" and the path. + # Remove the space. +! if test x-L = x"$p" || +! test x-R = x"$p" || +! test x-l = x"$p"; then + prev=$p + continue + fi +*************** +*** 8066,8071 **** +--- 8294,8436 ---- + ])# _LT_LANG_GO_CONFIG + + ++ # _LT_LANG_OBJC_CONFIG([TAG]) ++ # -------------------------- ++ # Ensure that the configuration variables for the GNU Objective-C compiler ++ # are suitably defined. These variables are subsequently used by _LT_CONFIG ++ # to write the compiler configuration to 'libtool'. ++ m4_defun([_LT_LANG_OBJC_CONFIG], ++ [AC_REQUIRE([LT_PROG_OBJC])dnl ++ AC_LANG_SAVE ++ ++ # Source file extension for OBJC test sources. ++ ac_ext=m ++ ++ # Object file extension for compiled OBJC test sources. ++ objext=o ++ _LT_TAGVAR(objext, $1)=$objext ++ ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(void){return(0);}' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Check for compilation issues with OBJC flags ++ _LT_OBJECTIVE_C ++ if test "yes" = "$lt_cv_gnustep_exists"; then ++ OBJCFLAGS="$OBJCFLAGS `gnustep-config --objc-flags`" ++ fi ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS ++ lt_save_GCC=$GCC ++ GCC=yes ++ CC=${OBJC-"gcc"} ++ CFLAGS=$OBJCFLAGS ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_TAGVAR(LD, $1)=$LD ++ _LT_CC_BASENAME([$compiler]) ++ ++ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ _LT_TAGVAR(reload_flag, $1)=$reload_flag ++ _LT_TAGVAR(reload_cmds, $1)=$reload_cmds ++ ++ if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi ++ ++ AC_LANG_RESTORE ++ ++ GCC=$lt_save_GCC ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS ++ ])# _LT_LANG_OBJC_CONFIG ++ ++ ++ # _LT_LANG_OBJCXX_CONFIG([TAG]) ++ # -------------------------- ++ # Ensure that the configuration variables for the GNU Objective-C++ compiler ++ # are suitably defined. These variables are subsequently used by _LT_CONFIG ++ # to write the compiler configuration to 'libtool'. ++ m4_defun([_LT_LANG_OBJCXX_CONFIG], ++ [AC_REQUIRE([LT_PROG_OBJCXX])dnl ++ AC_LANG_SAVE ++ ++ # Source file extension for OBJCXX test sources. ++ ac_ext=mm ++ ++ # Object file extension for compiled OBJCXX test sources. ++ objext=o ++ _LT_TAGVAR(objext, $1)=$objext ++ ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Check for compilation issues with OBJCXX flags ++ _LT_OBJECTIVE_C ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_CFLAGS=$CFLAGS ++ lt_save_GCC=$GCC ++ GCC=yes ++ CC=${OBJCXX-"g++"} ++ CFLAGS=$OBJCXXFLAGS ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_TAGVAR(LD, $1)=$LD ++ _LT_CC_BASENAME([$compiler]) ++ ++ _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ _LT_TAGVAR(reload_flag, $1)=$reload_flag ++ _LT_TAGVAR(reload_cmds, $1)=$reload_cmds ++ ++ if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi ++ ++ AC_LANG_RESTORE ++ ++ GCC=$lt_save_GCC ++ CC=$lt_save_CC ++ CFLAGS=$lt_save_CFLAGS ++ ])# _LT_LANG_OBJCXX_CONFIG ++ ++ + # _LT_LANG_RC_CONFIG([TAG]) + # ------------------------- + # Ensure that the configuration variables for the Windows resource compiler +*************** +*** 8119,8124 **** +--- 8484,8511 ---- + ])# _LT_LANG_RC_CONFIG + + ++ # LT_PROG_OBJC ++ # ----------- ++ AC_DEFUN([LT_PROG_OBJC], ++ [AC_CHECK_TOOL(OBJC, gcc,) ++ AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,) ++ if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then ++ test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`" ++ fi ++ AC_SUBST(OBJCFLAGS)])])[]dnl ++ ]) ++ ++ # LT_PROG_OBJCXX ++ # ----------- ++ AC_DEFUN([LT_PROG_OBJCXX], ++ [AC_CHECK_TOOL(OBJCXX, g++,) ++ AC_CHECK_TOOL(GNUSTEP_CONFIG, gnustep-config,) ++ if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then ++ test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`" ++ fi ++ AC_SUBST(OBJCXXFLAGS)])])[]dnl ++ ]) ++ + # LT_PROG_GCJ + # ----------- + AC_DEFUN([LT_PROG_GCJ], +*************** +*** 8191,8196 **** +--- 8578,8591 ---- + AC_SUBST([DLLTOOL]) + ]) + ++ # _LT_DECL_FILECMD ++ # ---------------- ++ # Check for a file(cmd) program that can be used to detect file type and magic ++ m4_defun([_LT_DECL_FILECMD], ++ [AC_CHECK_PROG([FILECMD], [file], [file], [:]) ++ _LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) ++ ])# _LD_DECL_FILECMD ++ + # _LT_DECL_SED + # ------------ + # Check for a fully-functional sed program, that truncates +*************** +*** 8203,8273 **** + _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) + ])# _LT_DECL_SED +- +- m4_ifndef([AC_PROG_SED], [ +- # NOTE: This macro has been submitted for inclusion into # +- # GNU Autoconf as AC_PROG_SED. When it is available in # +- # a released version of Autoconf we should remove this # +- # macro and use it instead. # +- +- m4_defun([AC_PROG_SED], +- [AC_MSG_CHECKING([for a sed that does not truncate output]) +- AC_CACHE_VAL(lt_cv_path_SED, +- [# Loop through the user's path and test for sed and gsed. +- # Then use that list of sed's as ones to test for truncation. +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +- for as_dir in $PATH +- do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for lt_ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then +- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" +- fi +- done +- done +- done +- IFS=$as_save_IFS +- lt_ac_max=0 +- lt_ac_count=0 +- # Add /usr/xpg4/bin/sed as it is typically found on Solaris +- # along with /bin/sed that truncates output. +- for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f "$lt_ac_sed" && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break +- fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test 10 -lt "$lt_ac_count" && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test "$lt_ac_count" -gt "$lt_ac_max"; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +- done +- ]) +- SED=$lt_cv_path_SED +- AC_SUBST([SED]) +- AC_MSG_RESULT([$SED]) +- ])#AC_PROG_SED +- ])#m4_ifndef +- +- # Old name: +- AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) + dnl aclocal-1.4 backwards compatibility: + dnl AC_DEFUN([LT_AC_PROG_SED], []) + +--- 8598,8603 ---- +*************** +*** 8314,8320 **** + [case $host in + *-*-mingw* ) + case $build in +! *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) +--- 8644,8650 ---- + [case $host in + *-*-mingw* ) + case $build in +! *-*-mingw* | *-*-windows* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) +*************** +*** 8327,8333 **** + ;; + *-*-cygwin* ) + case $build in +! *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) +--- 8657,8663 ---- + ;; + *-*-cygwin* ) + case $build in +! *-*-mingw* | *-*-windows* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) +*************** +*** 8353,8361 **** + [#assume ordinary cross tools, or native build. + lt_cv_to_tool_file_cmd=func_convert_file_noop + case $host in +! *-*-mingw* ) + case $build in +! *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac +--- 8683,8691 ---- + [#assume ordinary cross tools, or native build. + lt_cv_to_tool_file_cmd=func_convert_file_noop + case $host in +! *-*-mingw* | *-*-windows* ) + case $build in +! *-*-mingw* | *-*-windows* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac +*************** +*** 8370,8384 **** + + # Helper functions for option handling. -*- Autoconf -*- + # +! # Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +! # Foundation, Inc. + # Written by Gary V. Vaughan, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +! # serial 8 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +--- 8700,8714 ---- + + # Helper functions for option handling. -*- Autoconf -*- + # +! # Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2025 Free +! # Software Foundation, Inc. + # Written by Gary V. Vaughan, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + +! # serial 12 ltoptions.m4 + + # This is to help aclocal find these macros, as it can't see m4_define. + AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +*************** +*** 8450,8455 **** +--- 8780,8786 ---- + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [cxx-stdlib no-cxx-stdlib], [_LT_ENABLE_CXX_STDLIB]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], +*************** +*** 8495,8501 **** + [enable_win32_dll=yes + + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) +--- 8826,8832 ---- + [enable_win32_dll=yes + + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) +*************** +*** 8690,8718 **** + + # _LT_WITH_AIX_SONAME([DEFAULT]) + # ---------------------------------- +! # implement the --with-aix-soname flag, and support the `aix-soname=aix' +! # and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +! # is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. + m4_define([_LT_WITH_AIX_SONAME], + [m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl + shared_archive_member_spec= + case $host,$enable_shared in + power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) +! AC_ARG_WITH([aix-soname], +! [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], +! [case $withval in +! aix|svr4|both) +! ;; +! *) +! AC_MSG_ERROR([Unknown argument to --with-aix-soname]) +! ;; +! esac +! lt_cv_with_aix_soname=$with_aix_soname], +! [AC_CACHE_VAL([lt_cv_with_aix_soname], +! [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) +! with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member +--- 9021,9059 ---- + + # _LT_WITH_AIX_SONAME([DEFAULT]) + # ---------------------------------- +! # implement the --enable-aix-soname configure option, and support the +! # `aix-soname=aix' and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. +! # DEFAULT is either `aix', `both', or `svr4'. If omitted, it defaults to `aix'. + m4_define([_LT_WITH_AIX_SONAME], + [m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl + shared_archive_member_spec= + case $host,$enable_shared in + power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) +! AC_ARG_ENABLE([aix-soname], +! [AS_HELP_STRING([--enable-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], +! [case $enableval in +! aix|svr4|both) +! ;; +! *) +! AC_MSG_ERROR([Unknown argument to --enable-aix-soname]) +! ;; +! esac +! lt_cv_with_aix_soname=$enable_aix_soname], +! [_AC_ENABLE_IF([with], [aix-soname], +! [case $withval in +! aix|svr4|both) +! ;; +! *) +! AC_MSG_ERROR([Unknown argument to --with-aix-soname]) +! ;; +! esac +! lt_cv_with_aix_soname=$with_aix_soname], +! [AC_CACHE_VAL([lt_cv_with_aix_soname], +! [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)]) +! enable_aix_soname=$lt_cv_with_aix_soname]) +! with_aix_soname=$enable_aix_soname + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member +*************** +*** 8727,8734 **** +--- 9068,9083 ---- + fi + fi + ;; ++ power*-*-aix[[5-9]]*,'') ++ AC_MSG_WARN([for $host, specify if building shared libraries for versioning (svr4|both)]) ++ AC_MSG_CHECKING([which variant of shared library versioning to provide]) ++ with_aix_soname=aix ++ AC_MSG_RESULT([(default) $with_aix_soname]) ++ ;; + *) ++ AC_MSG_CHECKING([which variant of shared library versioning to provide]) + with_aix_soname=aix ++ AC_MSG_RESULT([(default) $with_aix_soname]) + ;; + esac + +*************** +*** 8743,8772 **** + + # _LT_WITH_PIC([MODE]) + # -------------------- +! # implement the --with-pic flag, and support the 'pic-only' and 'no-pic' + # LT_INIT options. + # MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. + m4_define([_LT_WITH_PIC], +! [AC_ARG_WITH([pic], +! [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} +! case $withval in +! yes|no) pic_mode=$withval ;; +! *) +! pic_mode=default +! # Look at the argument we got. We use all the common list separators. +! lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for lt_pkg in $withval; do +! IFS=$lt_save_ifs +! if test "X$lt_pkg" = "X$lt_p"; then +! pic_mode=yes +! fi +! done +! IFS=$lt_save_ifs +! ;; +! esac], +! [pic_mode=m4_default([$1], [default])]) + + _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl + ])# _LT_WITH_PIC +--- 9092,9141 ---- + + # _LT_WITH_PIC([MODE]) + # -------------------- +! # implement the --enable-pic flag, and support the 'pic-only' and 'no-pic' + # LT_INIT options. + # MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. + m4_define([_LT_WITH_PIC], +! [AC_ARG_ENABLE([pic], +! [AS_HELP_STRING([--enable-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} +! case $enableval in +! yes|no) pic_mode=$enableval ;; +! *) +! pic_mode=default +! # Look at the argument we got. We use all the common list separators. +! lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for lt_pkg in $enableval; do +! IFS=$lt_save_ifs +! if test "X$lt_pkg" = "X$lt_p"; then +! pic_mode=yes +! fi +! done +! IFS=$lt_save_ifs +! ;; +! esac], +! [dnl Continue to support --with-pic and --without-pic, for backward +! dnl compatibility. +! _AC_ENABLE_IF([with], [pic], +! [lt_p=${PACKAGE-default} +! case $withval in +! yes|no) pic_mode=$withval ;; +! *) +! pic_mode=default +! # Look at the argument we got. We use all the common list separators. +! lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for lt_pkg in $withval; do +! IFS=$lt_save_ifs +! if test "X$lt_pkg" = "X$lt_p"; then +! pic_mode=yes +! fi +! done +! IFS=$lt_save_ifs +! ;; +! esac], +! [pic_mode=m4_default([$1], [default])])] +! ) + + _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl + ])# _LT_WITH_PIC +*************** +*** 8786,8791 **** +--- 9155,9203 ---- + dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + ++ # _LT_ENABLE_CXX_STDLIB([MODE]) ++ # -------------------- ++ # implement the --enable-cxx-stdlib flag, and support the 'cxx-stdlib' and 'no-cxx-stdlib' ++ # LT_INIT options. ++ # MODE is either 'yes' or 'no'. If omitted, it defaults to 'no'. ++ m4_define([_LT_ENABLE_CXX_STDLIB], ++ [m4_define([_LT_ENABLE_CXX_STDLIB_DEFAULT], [m4_if($1, yes, yes, no)])dnl ++ stdlibflag=-nostdlib ++ AC_ARG_ENABLE([cxx-stdlib], ++ [AS_HELP_STRING([--enable-cxx-stdlib@<:@=PKGS@:>@], ++ [let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules @<:@default=]_LT_ENABLE_CXX_STDLIB_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_cxx_stdlib=yes ;; ++ no) enable_cxx_stdlib=no ;; ++ *) ++ enable_cxx_stdlib=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, ++ for pkg in $enableval; do ++ IFS=$lt_save_ifs ++ if test "X$pkg" = "X$p"; then ++ enable_cxx_stdlib=yes ++ fi ++ done ++ IFS=$lt_save_ifs ++ ;; ++ esac], ++ [enable_cxx_stdlib=]_LT_ENABLE_CXX_STDLIB_DEFAULT) ++ ++ if test yes = "$enable_cxx_stdlib"; then ++ stdlibflag= ++ fi ++ ++ _LT_DECL([], [enable_cxx_stdlib], [0], [Whether to let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules])dnl ++ _LT_DECL([], [stdlibflag], [0], [Flag used for specifying not to link standard libraries])dnl ++ ])# _LT_ENABLE_CXX_STDLIB ++ ++ LT_OPTION_DEFINE([LT_INIT], [cxx-stdlib], [_LT_ENABLE_CXX_STDLIB([yes])]) ++ LT_OPTION_DEFINE([LT_INIT], [no-cxx-stdlib], [_LT_ENABLE_CXX_STDLIB([no])]) ++ ++ ++ + m4_define([_LTDL_MODE], []) + LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +*************** +*** 8802,8808 **** + + # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- + # +! # Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software + # Foundation, Inc. + # Written by Gary V. Vaughan, 2004 + # +--- 9214,9220 ---- + + # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- + # +! # Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2025 Free Software + # Foundation, Inc. + # Written by Gary V. Vaughan, 2004 + # +*************** +*** 8927,8933 **** + + # ltversion.m4 -- version numbers -*- Autoconf -*- + # +! # Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. + # Written by Scott James Remnant, 2004 + # + # This file is free software; the Free Software Foundation gives +--- 9339,9346 ---- + + # ltversion.m4 -- version numbers -*- Autoconf -*- + # +! # Copyright (C) 2004, 2011-2019, 2021-2025 Free Software Foundation, +! # Inc. + # Written by Scott James Remnant, 2004 + # + # This file is free software; the Free Software Foundation gives +*************** +*** 8936,8958 **** + + # @configure_input@ + +! # serial 4179 ltversion.m4 + # This file is part of GNU Libtool + +! m4_define([LT_PACKAGE_VERSION], [2.4.6]) +! m4_define([LT_PACKAGE_REVISION], [2.4.6]) + + AC_DEFUN([LTVERSION_VERSION], +! [macro_version='2.4.6' +! macro_revision='2.4.6' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) + + # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- + # +! # Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +! # Foundation, Inc. + # Written by Scott James Remnant, 2004. + # + # This file is free software; the Free Software Foundation gives +--- 9349,9371 ---- + + # @configure_input@ + +! # serial 4464 ltversion.m4 + # This file is part of GNU Libtool + +! m4_define([LT_PACKAGE_VERSION], [2.5.4.23-5b58]) +! m4_define([LT_PACKAGE_REVISION], [2.5.4.23]) + + AC_DEFUN([LTVERSION_VERSION], +! [macro_version='2.5.4.23-5b58' +! macro_revision='2.5.4.23' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) + + # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- + # +! # Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2025 Free +! # Software Foundation, Inc. + # Written by Scott James Remnant, 2004. + # + # This file is free software; the Free Software Foundation gives +*************** +*** 9049,9055 **** + m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) + m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + +! # Copyright (C) 2002-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9462,9468 ---- + m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) + m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + +! # Copyright (C) 2002-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9061,9070 **** + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +! [am__api_version='1.15' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +! m4_if([$1], [1.15], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +--- 9474,9483 ---- + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +! [am__api_version='1.18' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +! m4_if([$1], [1.18.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +*************** +*** 9080,9093 **** + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +! [AM_AUTOMAKE_VERSION([1.15])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +! # Copyright (C) 2001-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9493,9506 ---- + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +! [AM_AUTOMAKE_VERSION([1.18.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +! # Copyright (C) 2001-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9139,9145 **** + + # AM_CONDITIONAL -*- Autoconf -*- + +! # Copyright (C) 1997-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9552,9558 ---- + + # AM_CONDITIONAL -*- Autoconf -*- + +! # Copyright (C) 1997-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9172,9178 **** + + # Do all the work for Automake. -*- Autoconf -*- + +! # Copyright (C) 1996-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9585,9591 ---- + + # Do all the work for Automake. -*- Autoconf -*- + +! # Copyright (C) 1996-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9200,9205 **** +--- 9613,9622 ---- + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], + [AC_PREREQ([2.65])dnl ++ m4_ifdef([_$0_ALREADY_INIT], ++ [m4_fatal([$0 expanded multiple times ++ ]m4_defn([_$0_ALREADY_INIT]))], ++ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +*************** +*** 9236,9242 **** + [_AM_SET_OPTIONS([$1])dnl + dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. + m4_if( +! m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +--- 9653,9659 ---- + [_AM_SET_OPTIONS([$1])dnl + dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. + m4_if( +! m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +*************** +*** 9259,9266 **** + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +! # +! # + AC_SUBST([mkdir_p], ['$(MKDIR_P)']) + # We need awk for the "check" target (and possibly the TAP driver). The + # system "awk" is bad on some platforms. +--- 9676,9683 ---- + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +! # +! # + AC_SUBST([mkdir_p], ['$(MKDIR_P)']) + # We need awk for the "check" target (and possibly the TAP driver). The + # system "awk" is bad on some platforms. +*************** +*** 9268,9275 **** + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +! [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +! [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], +--- 9685,9693 ---- + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +! [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +! [_AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])], +! [_AM_PROG_TAR([ustar])])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], +*************** +*** 9288,9294 **** + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl + ]) +! AC_REQUIRE([AM_SILENT_RULES])dnl + dnl The testsuite driver may need to know about EXEEXT, so add the + dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This + dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +--- 9706,9726 ---- + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl + ]) +! # Variables for tags utilities; see am/tags.am +! if test -z "$CTAGS"; then +! CTAGS=ctags +! fi +! AC_SUBST([CTAGS]) +! if test -z "$ETAGS"; then +! ETAGS=etags +! fi +! AC_SUBST([ETAGS]) +! if test -z "$CSCOPE"; then +! CSCOPE=cscope +! fi +! AC_SUBST([CSCOPE]) +! +! AC_REQUIRE([_AM_SILENT_RULES])dnl + dnl The testsuite driver may need to know about EXEEXT, so add the + dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This + dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +*************** +*** 9296,9342 **** + [m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +! # POSIX will say in a future version that running "rm -f" with no argument +! # is OK; and we want to be able to make that assumption in our Makefile +! # recipes. So use an aggressive probe to check that the usage we want is +! # actually supported "in the wild" to an acceptable degree. +! # See automake bug#10828. +! # To make any issue more visible, cause the running configure to be aborted +! # by default if the 'rm' program in use doesn't match our expectations; the +! # user can still override this though. +! if rm -f && rm -fr && rm -rf; then : OK; else +! cat >&2 <<'END' +! Oops! +! +! Your 'rm' program seems unable to run without file operands specified +! on the command line, even when the '-f' option is present. This is contrary +! to the behaviour of most rm programs out there, and not conforming with +! the upcoming POSIX standard: +! +! Please tell bug-automake@gnu.org about your system, including the value +! of your $PATH and any error possibly output before this message. This +! can help us improve future automake versions. +! +! END +! if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then +! echo 'Configuration will proceed anyway, since you have set the' >&2 +! echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 +! echo >&2 +! else +! cat >&2 <<'END' +! Aborting the configuration process, to ensure you take notice of the issue. +! +! You can download and install GNU coreutils to get an 'rm' implementation +! that behaves properly: . +! +! If you want to complete the configuration process using your problematic +! 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +! to "yes", and re-run configure. + +- END +- AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) +- fi +- fi + dnl The trailing newline in this macro's definition is deliberate, for + dnl backward compatibility and to allow trailing 'dnl'-style comments + dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +--- 9728,9736 ---- + [m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +! AC_REQUIRE([_AM_PROG_RM_F]) +! AC_REQUIRE([_AM_PROG_XARGS_N]) + + dnl The trailing newline in this macro's definition is deliberate, for + dnl backward compatibility and to allow trailing 'dnl'-style comments + dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +*************** +*** 9369,9375 **** + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +! # Copyright (C) 2001-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9763,9769 ---- + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +! # Copyright (C) 2001-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9390,9396 **** + fi + AC_SUBST([install_sh])]) + +! # Copyright (C) 2003-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9784,9790 ---- + fi + AC_SUBST([install_sh])]) + +! # Copyright (C) 2003-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9409,9428 **** + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + +! # Copyright (C) 1998-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +! # AM_PROG_LEX +! # ----------- + # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a + # "missing" invocation, for better error output. + AC_DEFUN([AM_PROG_LEX], + [AC_PREREQ([2.50])dnl + AC_REQUIRE([AM_MISSING_HAS_RUN])dnl +! AC_REQUIRE([AC_PROG_LEX])dnl + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi]) +--- 9803,9823 ---- + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + +! # Copyright (C) 1998-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +! # AM_PROG_LEX([OPTIONS]) +! # ---------------------- + # Autoconf leaves LEX=: if lex or flex can't be found. Change that to a + # "missing" invocation, for better error output. + AC_DEFUN([AM_PROG_LEX], + [AC_PREREQ([2.50])dnl + AC_REQUIRE([AM_MISSING_HAS_RUN])dnl +! AC_PROVIDE_IFELSE([AC_PROG_LEX], [], [AC_PROG_LEX($@)]) +! dnl Do not dnl on previous line, or output has "fiif". + if test "$LEX" = :; then + LEX=${am_missing_run}flex + fi]) +*************** +*** 9430,9436 **** + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +! # Copyright (C) 1996-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9825,9831 ---- + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +! # Copyright (C) 1996-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9465,9471 **** + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +! # Copyright (C) 1997-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9860,9866 ---- + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +! # Copyright (C) 1997-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9486,9497 **** + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl + if test x"${MISSING+set}" != xset; then +! case $am_aux_dir in +! *\ * | *\ *) +! MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +! *) +! MISSING="\${SHELL} $am_aux_dir/missing" ;; +! esac + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then +--- 9881,9887 ---- + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl + if test x"${MISSING+set}" != xset; then +! MISSING="\${SHELL} '$am_aux_dir/missing'" + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then +*************** +*** 9504,9510 **** + + # Helper functions for option handling. -*- Autoconf -*- + +! # Copyright (C) 2001-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9894,9900 ---- + + # Helper functions for option handling. -*- Autoconf -*- + +! # Copyright (C) 2001-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9533,9539 **** + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +! # Copyright (C) 1999-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9923,9929 ---- + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +! # Copyright (C) 1999-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9565,9571 **** + break + fi + done +! rm -f core conftest* + unset am_i]) + if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. +--- 9955,9964 ---- + break + fi + done +! # aligned with autoconf, so not including core; see bug#72225. +! rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \ +! conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \ +! conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM + unset am_i]) + if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. +*************** +*** 9580,9586 **** + # For backward compatibility. + AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +! # Copyright (C) 2001-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 9973,9995 ---- + # For backward compatibility. + AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +! # Copyright (C) 2022-2025 Free Software Foundation, Inc. +! # +! # This file is free software; the Free Software Foundation +! # gives unlimited permission to copy and/or distribute it, +! # with or without modifications, as long as this notice is preserved. +! +! # _AM_PROG_RM_F +! # --------------- +! # Check whether 'rm -f' without any arguments works. +! # https://bugs.gnu.org/10828 +! AC_DEFUN([_AM_PROG_RM_F], +! [am__rm_f_notfound= +! AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""']) +! AC_SUBST(am__rm_f_notfound) +! ]) +! +! # Copyright (C) 2001-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9599,9624 **** + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +! # Copyright (C) 1996-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # AM_SANITY_CHECK + # --------------- + AC_DEFUN([AM_SANITY_CHECK], +! [AC_MSG_CHECKING([whether build environment is sane]) + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' + ' + case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; + esac + case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; + esac + +--- 10008,10188 ---- + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +! # Copyright (C) 1996-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + ++ # _AM_SLEEP_FRACTIONAL_SECONDS ++ # ---------------------------- ++ AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl ++ AC_CACHE_CHECK([whether sleep supports fractional seconds], ++ am_cv_sleep_fractional_seconds, [dnl ++ AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes], ++ [am_cv_sleep_fractional_seconds=no]) ++ ])]) ++ ++ # _AM_FILESYSTEM_TIMESTAMP_RESOLUTION ++ # ----------------------------------- ++ # Determine the filesystem's resolution for file modification ++ # timestamps. The coarsest we know of is FAT, with a resolution ++ # of only two seconds, even with the most recent "exFAT" extensions. ++ # The finest (e.g. ext4 with large inodes, XFS, ZFS) is one ++ # nanosecond, matching clock_gettime. However, it is probably not ++ # possible to delay execution of a shell script for less than one ++ # millisecond, due to process creation overhead and scheduling ++ # granularity, so we don't check for anything finer than that. (See below.) ++ AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl ++ AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS]) ++ AC_CACHE_CHECK([filesystem timestamp resolution], ++ am_cv_filesystem_timestamp_resolution, [dnl ++ # Default to the worst case. ++ am_cv_filesystem_timestamp_resolution=2 ++ ++ # Only try to go finer than 1 sec if sleep can do it. ++ # Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work, ++ # - 1 sec is not much of a win compared to 2 sec, and ++ # - it takes 2 seconds to perform the test whether 1 sec works. ++ # ++ # Instead, just use the default 2s on platforms that have 1s resolution, ++ # accept the extra 1s delay when using $sleep in the Automake tests, in ++ # exchange for not incurring the 2s delay for running the test for all ++ # packages. ++ # ++ am_try_resolutions= ++ if test "$am_cv_sleep_fractional_seconds" = yes; then ++ # Even a millisecond often causes a bunch of false positives, ++ # so just try a hundredth of a second. The time saved between .001 and ++ # .01 is not terribly consequential. ++ am_try_resolutions="0.01 0.1 $am_try_resolutions" ++ fi ++ ++ # In order to catch current-generation FAT out, we must *modify* files ++ # that already exist; the *creation* timestamp is finer. Use names ++ # that make ls -t sort them differently when they have equal ++ # timestamps than when they have distinct timestamps, keeping ++ # in mind that ls -t prints the *newest* file first. ++ rm -f conftest.ts? ++ : > conftest.ts1 ++ : > conftest.ts2 ++ : > conftest.ts3 ++ ++ # Make sure ls -t actually works. Do 'set' in a subshell so we don't ++ # clobber the current shell's arguments. (Outer-level square brackets ++ # are removed by m4; they're present so that m4 does not expand ++ # ; be careful, easy to get confused.) ++ if ( ++ set X `[ls -t conftest.ts[12]]` && ++ { ++ test "$[]*" != "X conftest.ts1 conftest.ts2" || ++ test "$[]*" != "X conftest.ts2 conftest.ts1"; ++ } ++ ); then :; else ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ _AS_ECHO_UNQUOTED( ++ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""], ++ [AS_MESSAGE_LOG_FD]) ++ AC_MSG_FAILURE([ls -t produces unexpected output. ++ Make sure there is not a broken ls alias in your environment.]) ++ fi ++ ++ for am_try_res in $am_try_resolutions; do ++ # Any one fine-grained sleep might happen to cross the boundary ++ # between two values of a coarser actual resolution, but if we do ++ # two fine-grained sleeps in a row, at least one of them will fall ++ # entirely within a coarse interval. ++ echo alpha > conftest.ts1 ++ sleep $am_try_res ++ echo beta > conftest.ts2 ++ sleep $am_try_res ++ echo gamma > conftest.ts3 ++ ++ # We assume that 'ls -t' will make use of high-resolution ++ # timestamps if the operating system supports them at all. ++ if (set X `ls -t conftest.ts?` && ++ test "$[]2" = conftest.ts3 && ++ test "$[]3" = conftest.ts2 && ++ test "$[]4" = conftest.ts1); then ++ # ++ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done, ++ # because we don't need to test make. ++ make_ok=true ++ if test $am_try_res != 1; then ++ # But if we've succeeded so far with a subsecond resolution, we ++ # have one more thing to check: make. It can happen that ++ # everything else supports the subsecond mtimes, but make doesn't; ++ # notably on macOS, which ships make 3.81 from 2006 (the last one ++ # released under GPLv2). https://bugs.gnu.org/68808 ++ # ++ # We test $MAKE if it is defined in the environment, else "make". ++ # It might get overridden later, but our hope is that in practice ++ # it does not matter: it is the system "make" which is (by far) ++ # the most likely to be broken, whereas if the user overrides it, ++ # probably they did so with a better, or at least not worse, make. ++ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html ++ # ++ # Create a Makefile (real tab character here): ++ rm -f conftest.mk ++ echo 'conftest.ts1: conftest.ts2' >conftest.mk ++ echo ' touch conftest.ts2' >>conftest.mk ++ # ++ # Now, running ++ # touch conftest.ts1; touch conftest.ts2; make ++ # should touch ts1 because ts2 is newer. This could happen by luck, ++ # but most often, it will fail if make's support is insufficient. So ++ # test for several consecutive successes. ++ # ++ # (We reuse conftest.ts[12] because we still want to modify existing ++ # files, not create new ones, per above.) ++ n=0 ++ make=${MAKE-make} ++ until test $n -eq 3; do ++ echo one > conftest.ts1 ++ sleep $am_try_res ++ echo two > conftest.ts2 # ts2 should now be newer than ts1 ++ if $make -f conftest.mk | grep 'up to date' >/dev/null; then ++ make_ok=false ++ break # out of $n loop ++ fi ++ n=`expr $n + 1` ++ done ++ fi ++ # ++ if $make_ok; then ++ # Everything we know to check worked out, so call this resolution good. ++ am_cv_filesystem_timestamp_resolution=$am_try_res ++ break # out of $am_try_res loop ++ fi ++ # Otherwise, we'll go on to check the next resolution. ++ fi ++ done ++ rm -f conftest.ts? ++ # (end _am_filesystem_timestamp_resolution) ++ ])]) ++ + # AM_SANITY_CHECK + # --------------- + AC_DEFUN([AM_SANITY_CHECK], +! [AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION]) +! # This check should not be cached, as it may vary across builds of +! # different projects. +! AC_MSG_CHECKING([whether build environment is sane]) + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' + ' + case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_RESULT([no]) + AC_MSG_ERROR([unsafe absolute working directory name]);; + esac + case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_RESULT([no]) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; + esac + +*************** +*** 9627,9675 **** + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). +! if ( +! am_has_slept=no +! for am_try in 1 2; do +! echo "timestamp, slept: $am_has_slept" > conftest.file +! set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +! if test "$[*]" = "X"; then +! # -L didn't work. +! set X `ls -t "$srcdir/configure" conftest.file` +! fi +! if test "$[*]" != "X $srcdir/configure conftest.file" \ +! && test "$[*]" != "X conftest.file $srcdir/configure"; then + +! # If neither matched, then we have a broken ls. This can happen +! # if, for instance, CONFIG_SHELL is bash and it inherits a +! # broken ls alias from the environment. This has actually +! # happened. Such a system could not be considered "sane". +! AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +! alias in your environment]) +! fi +! if test "$[2]" = conftest.file || test $am_try -eq 2; then +! break +! fi +! # Just in case. +! sleep 1 +! am_has_slept=yes +! done +! test "$[2]" = conftest.file +! ) +! then +! # Ok. +! : +! else +! AC_MSG_ERROR([newly created file is older than distributed files! + Check your system clock]) + fi +! AC_MSG_RESULT([yes]) + # If we didn't sleep, we still need to ensure time stamps of config.status and + # generated files are strictly newer. + am_sleep_pid= +! if grep 'slept: no' conftest.file >/dev/null 2>&1; then +! ( sleep 1 ) & + am_sleep_pid=$! +! fi + AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then +--- 10191,10230 ---- + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). +! am_build_env_is_sane=no +! am_has_slept=no +! rm -f conftest.file +! for am_try in 1 2; do +! echo "timestamp, slept: $am_has_slept" > conftest.file +! if ( +! set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +! if test "$[]*" = "X"; then +! # -L didn't work. +! set X `ls -t "$srcdir/configure" conftest.file` +! fi +! test "$[]2" = conftest.file +! ); then +! am_build_env_is_sane=yes +! break +! fi +! # Just in case. +! sleep "$am_cv_filesystem_timestamp_resolution" +! am_has_slept=yes +! done + +! AC_MSG_RESULT([$am_build_env_is_sane]) +! if test "$am_build_env_is_sane" = no; then +! AC_MSG_ERROR([newly created file is older than distributed files! + Check your system clock]) + fi +! + # If we didn't sleep, we still need to ensure time stamps of config.status and + # generated files are strictly newer. + am_sleep_pid= +! AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl +! ( sleep "$am_cv_filesystem_timestamp_resolution" ) & + am_sleep_pid=$! +! ]) + AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then +*************** +*** 9680,9697 **** + rm -f conftest.file + ]) + +! # Copyright (C) 2009-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +! # AM_SILENT_RULES([DEFAULT]) +! # -------------------------- +! # Enable less verbose build rules; with the default set to DEFAULT +! # ("yes" being less verbose, "no" or empty being verbose). +! AC_DEFUN([AM_SILENT_RULES], +! [AC_ARG_ENABLE([silent-rules], [dnl + AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +--- 10235,10252 ---- + rm -f conftest.file + ]) + +! # Copyright (C) 2009-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +! # _AM_SILENT_RULES +! # ---------------- +! # Enable less verbose build rules support. +! AC_DEFUN([_AM_SILENT_RULES], +! [AM_DEFAULT_VERBOSITY=1 +! AC_ARG_ENABLE([silent-rules], [dnl + AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +*************** +*** 9699,9709 **** + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl + ]) +- case $enable_silent_rules in @%:@ ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +- esac + dnl + dnl A few 'make' implementations (e.g., NonStop OS and NextStep) + dnl do not support nested variable expansions. +--- 10254,10259 ---- +*************** +*** 9722,9735 **** + else + am_cv_make_support_nested_variables=no + fi]) +- if test $am_cv_make_support_nested_variables = yes; then +- dnl Using '$V' instead of '$(V)' breaks IRIX make. +- AM_V='$(V)' +- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +- else +- AM_V=$AM_DEFAULT_VERBOSITY +- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +- fi + AC_SUBST([AM_V])dnl + AM_SUBST_NOTMAKE([AM_V])dnl + AC_SUBST([AM_DEFAULT_V])dnl +--- 10272,10277 ---- +*************** +*** 9738,9746 **** + AM_BACKSLASH='\' + AC_SUBST([AM_BACKSLASH])dnl + _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl + ]) + +! # Copyright (C) 2001-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 10280,10316 ---- + AM_BACKSLASH='\' + AC_SUBST([AM_BACKSLASH])dnl + _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++ dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls ++ dnl to AM_SILENT_RULES to change the default value. ++ AC_CONFIG_COMMANDS_PRE([dnl ++ case $enable_silent_rules in @%:@ ((( ++ yes) AM_DEFAULT_VERBOSITY=0;; ++ no) AM_DEFAULT_VERBOSITY=1;; ++ esac ++ if test $am_cv_make_support_nested_variables = yes; then ++ dnl Using '$V' instead of '$(V)' breaks IRIX make. ++ AM_V='$(V)' ++ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' ++ else ++ AM_V=$AM_DEFAULT_VERBOSITY ++ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY ++ fi ++ ])dnl ++ ]) ++ ++ # AM_SILENT_RULES([DEFAULT]) ++ # -------------------------- ++ # Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or ++ # empty being verbose). ++ AC_DEFUN([AM_SILENT_RULES], ++ [AC_REQUIRE([_AM_SILENT_RULES]) ++ AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])m4_newline ++ dnl We intentionally force a newline after the assignment, since a) nothing ++ dnl good can come of more text following, and b) that was the behavior ++ dnl before 1.17. See https://bugs.gnu.org/72267. + ]) + +! # Copyright (C) 2001-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9768,9774 **** + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +! # Copyright (C) 2006-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 10338,10344 ---- + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +! # Copyright (C) 2006-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9787,9793 **** + + # Check how to create a tarball. -*- Autoconf -*- + +! # Copyright (C) 2004-2014 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 10357,10363 ---- + + # Check how to create a tarball. -*- Autoconf -*- + +! # Copyright (C) 2004-2025 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 9833,9847 **** + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) +! if test $am_uid -le $am_max_uid; then +! AC_MSG_RESULT([yes]) + else +! AC_MSG_RESULT([no]) +! _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) +! if test $am_gid -le $am_max_gid; then +! AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none +--- 10403,10421 ---- + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) +! if test x$am_uid = xunknown; then +! AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work]) +! elif test $am_uid -le $am_max_uid; then +! AC_MSG_RESULT([yes]) + else +! AC_MSG_RESULT([no]) +! _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) +! if test x$gm_gid = xunknown; then +! AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work]) +! elif test $am_gid -le $am_max_gid; then +! AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none +*************** +*** 9918,9921 **** +--- 10492,10515 ---- + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + ++ # Copyright (C) 2022-2025 Free Software Foundation, Inc. ++ # ++ # This file is free software; the Free Software Foundation ++ # gives unlimited permission to copy and/or distribute it, ++ # with or without modifications, as long as this notice is preserved. ++ ++ # _AM_PROG_XARGS_N ++ # ---------------- ++ # Check whether 'xargs -n' works. It should work everywhere, so the fallback ++ # is not optimized at all as we never expect to use it. ++ AC_DEFUN([_AM_PROG_XARGS_N], ++ [AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl ++ AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2 ++ 3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])]) ++ AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl ++ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }' ++ ])dnl ++ AC_SUBST(am__xargs_n) ++ ]) ++ + m4_include([acinclude.m4]) +Only in gmp-6.3.0: autom4te.cache +diff -crB gmp-6.3.0-orig/compile gmp-6.3.0/compile +*** gmp-6.3.0-orig/compile 2015-09-05 22:09:34.000000000 +0300 +--- gmp-6.3.0/compile 2025-08-28 16:19:50.848821725 +0300 +*************** +*** 1,9 **** + #! /bin/sh + # Wrapper for compilers which do not understand '-c -o'. + +! scriptversion=2012-10-14.11; # UTC + +! # Copyright (C) 1999-2014 Free Software Foundation, Inc. + # Written by Tom Tromey . + # + # This program is free software; you can redistribute it and/or modify +--- 1,9 ---- + #! /bin/sh + # Wrapper for compilers which do not understand '-c -o'. + +! scriptversion=2025-06-18.21; # UTC + +! # Copyright (C) 1999-2025 Free Software Foundation, Inc. + # Written by Tom Tromey . + # + # This program is free software; you can redistribute it and/or modify +*************** +*** 17,23 **** + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +! # along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +--- 17,23 ---- + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +! # along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +*************** +*** 37,47 **** + + file_conv= + +! # func_file_conv build_file lazy + # Convert a $build file to $host form and store it in $file + # Currently only supports Windows hosts. If the determined conversion +! # type is listed in (the comma separated) LAZY, no conversion will +! # take place. + func_file_conv () + { + file=$1 +--- 37,47 ---- + + file_conv= + +! # func_file_conv build_file unneeded_conversions + # Convert a $build file to $host form and store it in $file + # Currently only supports Windows hosts. If the determined conversion +! # type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +! # conversion will take place. + func_file_conv () + { + file=$1 +*************** +*** 51,59 **** + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) +! file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) +--- 51,70 ---- + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) +! if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then +! # MSYS2 environment. +! file_conv=cygwin +! else +! # Original MinGW environment. +! file_conv=mingw +! fi +! ;; +! MSYS*) +! # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. +! file_conv=cygwin + ;; + CYGWIN*) ++ # Cygwin environment. + file_conv=cygwin + ;; + *) +*************** +*** 63,74 **** + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) +! file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` +--- 74,87 ---- + fi + case $file_conv/,$2, in + *,$file_conv,*) ++ # This is the optimization mentioned above: ++ # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) +! file=`cygpath -w "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` +*************** +*** 143,149 **** + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in +! *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift +--- 156,162 ---- + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in +! *.o | *.lo | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift +*************** +*** 248,261 **** + right script to run: please start by reading the file 'INSTALL'. + + Report bugs to . + EOF + exit $? + ;; + -v | --v*) +! echo "compile $scriptversion" + exit $? + ;; +! cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; + esac +--- 261,278 ---- + right script to run: please start by reading the file 'INSTALL'. + + Report bugs to . ++ GNU Automake home page: . ++ General help using GNU software: . + EOF + exit $? + ;; + -v | --v*) +! echo "compile (GNU Automake) $scriptversion" + exit $? + ;; +! cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ +! clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ +! icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; + esac +*************** +*** 339,347 **** + # Local Variables: + # mode: shell-script + # sh-indentation: 2 +! # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" +! # time-stamp-format: "%:y-%02m-%02d.%02H" +! # time-stamp-time-zone: "UTC" + # time-stamp-end: "; # UTC" + # End: +--- 356,364 ---- + # Local Variables: + # mode: shell-script + # sh-indentation: 2 +! # eval: (add-hook 'before-save-hook 'time-stamp nil t) + # time-stamp-start: "scriptversion=" +! # time-stamp-format: "%Y-%02m-%02d.%02H" +! # time-stamp-time-zone: "UTC0" + # time-stamp-end: "; # UTC" + # End: +diff -crB gmp-6.3.0-orig/config.guess gmp-6.3.0/config.guess +*** gmp-6.3.0-orig/config.guess 2023-07-29 16:42:16.000000000 +0300 +--- gmp-6.3.0/config.guess 2025-08-28 16:19:50.849630073 +0300 +*************** +*** 1,1203 **** + #! /bin/sh +! # +! # GMP config.guess wrapper. + + +! # Copyright 2000-2019 Free Software Foundation, Inc. +! # +! # This file is part of the GNU MP Library. +! # +! # The GNU MP Library is free software; you can redistribute it and/or modify +! # it under the terms of either: +! # +! # * the GNU Lesser General Public License as published by the Free +! # Software Foundation; either version 3 of the License, or (at your +! # option) any later version. +! # +! # or + # +! # * the GNU General Public License as published by the Free Software +! # Foundation; either version 2 of the License, or (at your option) any +! # later version. + # +! # or both in parallel, as here. + # +! # The GNU MP Library is distributed in the hope that it will be useful, but +! # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +! # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +! # for more details. + # +! # You should have received copies of the GNU General Public License and the +! # GNU Lesser General Public License along with the GNU MP Library. If not, +! # see https://www.gnu.org/licenses/. +! +! +! # Usage: config.guess + # +! # Print the host system CPU-VENDOR-OS. + # +! # configfsf.guess is run and its guess then sharpened up to take advantage +! # of the finer grained CPU types that GMP knows. +! + +- # Expect to find configfsf.guess in the same directory as this config.guess +- configfsf_guess="`echo \"$0\" | sed 's/config.guess$/configfsf.guess/'`" +- if test "$configfsf_guess" = "$0"; then +- echo "Cannot derive configfsf.guess from $0" 1>&2 +- exit 1 +- fi +- if test -f "$configfsf_guess"; then +- : +- else +- echo "$configfsf_guess not found" 1>&2 +- exit 1 +- fi + +! # Setup a $SHELL with which to run configfsf.guess, using the same +! # $CONFIG_SHELL or /bin/sh as autoconf does when running config.guess +! SHELL=${CONFIG_SHELL-/bin/sh} + +- # Identify ourselves on --version, --help or errors + if test $# != 0; then +! echo "(GNU MP wrapped config.guess)" +! $SHELL $configfsf_guess "$@" +! exit 1 +! fi +! +! guess_full=`$SHELL $configfsf_guess` +! if test $? != 0; then + exit 1 + fi + +! guess_cpu=`echo "$guess_full" | sed 's/-.*$//'` +! guess_rest=`echo "$guess_full" | sed 's/^[^-]*//'` +! exact_cpu= +! +! +! # ------------------------------------------------------------------------- +! # The following should look at the current guess and probe the system to +! # establish a better guess in exact_cpu. Leave exact_cpu empty if probes +! # can't be done, or don't work. +! # +! # When a number of probes are done, test -z "$exact_cpu" can be used instead +! # of putting each probe under an "else" of the preceeding. That can stop +! # the code getting horribly nested and marching off the right side of the +! # screen. +! +! # Note that when a compile-and-link is done in one step we need to remove .o +! # files, since lame C compilers generate these even when not asked. +! # + + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a + # compiler to aid in system detection is discouraged as it requires + # temporary files to be created and, as you can see below, it is a + # headache to deal with in a portable fashion. + +! # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +! # use `HOST_CC' if defined, but it is deprecated. + + # Portable tmp directory creation inspired by the Autoconf team. + +! set_cc_for_build=' +! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +! : ${TMPDIR=/tmp} ; +! { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || +! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || +! { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || +! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +! dummy=$tmp/dummy ; +! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy $dummy.core ${dummy}0.s" ; +! case $CC_FOR_BUILD,$HOST_CC,$CC in +! ,,) echo "int x;" > $dummy.c ; +! for c in cc gcc c89 c99 ; do +! if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +! CC_FOR_BUILD="$c"; break ; +! fi ; +! done ; +! if test x"$CC_FOR_BUILD" = x ; then +! CC_FOR_BUILD=no_compiler_found ; +! fi +! ;; +! ,,*) CC_FOR_BUILD=$CC ;; +! ,*,*) CC_FOR_BUILD=$HOST_CC ;; +! esac ; set_cc_for_build= ;' +! +! +! case "$guess_full" in +! +! alpha-*-*) +! eval $set_cc_for_build +! # configfsf.guess detects exact alpha cpu types for OSF and GNU/Linux, but +! # not for *BSD and other systems. We try to get an exact type for any +! # plain "alpha" it leaves. +! # +! # configfsf.guess used to have a block of code not unlike this, but these +! # days does its thing with Linux kernel /proc/cpuinfo or OSF psrinfo. +! # +! cat <${dummy}0.s +! .data +! Lformat: +! .byte 37,100,45,37,120,10,0 # "%d-%x\n" +! .text +! .globl main +! .align 4 +! .ent main +! main: +! .frame \$30,16,\$26,0 +! ldgp \$29,0(\$27) +! .prologue 1 +! .long 0x47e03d91 # implver \$17 +! lda \$2,-1 +! .long 0x47e20c21 # amask \$2,\$1 +! lda \$16,Lformat +! not \$1,\$18 +! jsr \$26,printf +! ldgp \$29,0(\$26) +! mov 0,\$16 +! jsr \$26,exit +! .end main +! EOF +! $CC_FOR_BUILD ${dummy}0.s -o $dummy 2>/dev/null +! if test "$?" = 0 ; then +! case `$dummy` in +! 0-0) exact_cpu=alpha ;; +! 1-0) exact_cpu=alphaev5 ;; +! 1-1) exact_cpu=alphaev56 ;; +! 1-101) exact_cpu=alphapca56 ;; +! 2-303) exact_cpu=alphaev6 ;; +! 2-307) exact_cpu=alphaev67 ;; +! 2-1307) exact_cpu=alphaev68 ;; +! esac +! fi +! ;; +! +! arm*-*-* | aarch64-*-*) +! if [ $( (uname -s) 2>/dev/null) = Darwin ]; then +! case $(system_profiler SPHardwareDataType | grep Chip) in +! *Apple\ M1) +! exact_cpu="applem1";; +! *Apple\ M2) +! exact_cpu="applem2";; +! esac +! fi +! +! cpu_code=`sed -n 's/^CPU part.*\(0x.*\)$/\1/p' /proc/cpuinfo 2>/dev/null | sort -r | head -n 1 2>/dev/null` +! cpu_implementer=`sed -n 's/^CPU implementer.*\(0x.*\)$/\1/p' /proc/cpuinfo 2>/dev/null | head -n 1 2>/dev/null` +! case "${cpu_implementer}_${cpu_code}" in +! 0x53_0x001) exact_cpu=armexynosm1 ;; +! 0x51_0x800) exact_cpu=armcortexa57 ;; +! 0x43_0x0a1) exact_cpu=armthunderx ;; +! 0x50_0x000) exact_cpu=armxgene1 ;; +! 0x61_0x023) exact_cpu=applem1 ;; +! esac +! if test -z "$exact_cpu"; then +! case "$cpu_code" in +! 0xa10 | 0xa11 | 0xb11) # v4 strongarm/sa1100 +! exact_cpu="armsa1";; +! 0x915 | 0x925 | \ +! 0x920 | 0x922 | 0x940) # v4 +! exact_cpu="arm9tdmi";; +! 0x210 | 0x290 | 0x2d0 | \ +! 0x212 | 0x292 | 0x2d2 | \ +! 0x411) exact_cpu="armxscale";; # v5 pxa2xx +! 0x926 | 0x946 | 0x966 | 0x968) # v5te/v5tej +! exact_cpu="arm9te";; +! 0xa20 | 0xa22 | 0xa26) # v5te +! exact_cpu="arm10";; +! 0xb02) exact_cpu="arm11mpcore";; # v6 +! 0xb36) exact_cpu="arm1136";; # v6 +! 0xb56) exact_cpu="arm1156";; # v6t2 +! 0xb76) exact_cpu="arm1176";; # v6 +! 0xc05) exact_cpu="armcortexa5";; # v7a +! 0xc07) exact_cpu="armcortexa7";; # v7a +! 0xc08) exact_cpu="armcortexa8";; # v7a +! 0xc09) exact_cpu="armcortexa9";; # v7a +! 0xc0f) exact_cpu="armcortexa15";; # v7a +! 0xc0d) exact_cpu="armcortexa12";; # v7a +! 0xc0e) exact_cpu="armcortexa17";; # v7a +! 0xc14) exact_cpu="armcortexr4";; # v7r +! 0xc15) exact_cpu="armcortexr5";; # v7r +! 0xc23) exact_cpu="armcortexm3";; # v7m +! +! 0xd04) exact_cpu="armcortexa35";; # v8 +! 0xd03) exact_cpu="armcortexa53";; # v8 +! 0xd05) exact_cpu="armcortexa55";; # v8.2 +! 0xd07) exact_cpu="armcortexa57";; # v8 +! 0xd08) exact_cpu="armcortexa72";; # v8 +! 0xd09) exact_cpu="armcortexa73";; # v8 +! 0xd0a) exact_cpu="armcortexa75";; # v8.2 +! 0xd0b) exact_cpu="armcortexa76";; # v8.3 +! *) exact_cpu=$guess_cpu;; + esac +- fi +- exact_cpu="${exact_cpu}`sed -n 's;^Features.*\(neon\).*;\1;p' /proc/cpuinfo 2>/dev/null | head -n 1 2>/dev/null`" +- ;; +- +- ia64*-*-*) +- eval $set_cc_for_build +- # CPUID[3] bits 24 to 31 is the processor family. itanium2 is documented +- # as 0x1f, plain itanium has been seen returning 0x07 on two systems, but +- # haven't found any documentation on it as such. +- # +- # Defining both getcpuid and _getcpuid lets us ignore whether the system +- # expects underscores or not. +- # +- # "unsigned long long" is always 64 bits, in fact on hpux in ilp32 mode +- # (which is the default there), it's the only 64-bit type. +- # +- cat >${dummy}0.s <$dummy.c < +- unsigned long long getcpuid (); +- int +- main () +- { +- if (getcpuid(0LL) == 0x49656E69756E6547LL && getcpuid(1LL) == 0x6C65746ELL) +- { +- /* "GenuineIntel" */ +- switch ((getcpuid(3LL) >> 24) & 0xFF) { +- case 0x07: puts ("itanium"); break; +- case 0x1F: puts ("itanium2"); break; /* McKinley, Madison */ +- case 0x20: puts ("itanium2"); break; /* Montecito, Montvale, Tukwila */ +- case 0x21: puts ("itanium2"); break; /* Poulson */ +- } +- } +- return 0; + } +- EOF +- if $CC_FOR_BUILD ${dummy}0.s $dummy.c -o $dummy >/dev/null 2>&1; then +- exact_cpu=`$dummy` +- fi +- ;; +- +- mips-*-irix[6789]*) +- # IRIX 6 and up always has a 64-bit mips cpu +- exact_cpu=mips64 +- ;; +- +- mips-*-*) +- case $(uname -m) in +- mips64) exact_cpu=mips64;; +- esac +- ;; + +! mipsel-*-*) +! case $(uname -m) in +! mips64) exact_cpu=mips64el;; +! esac +! ;; + +! m68k-*-*) +! eval $set_cc_for_build +! # NetBSD (and presumably other *BSD) "sysctl hw.model" gives for example +! # hw.model = Apple Macintosh Quadra 610 (68040) +! exact_cpu=`(sysctl hw.model) 2>/dev/null | sed -n 's/^.*\(680[012346]0\).*$/m\1/p'` +! if test -z "$exact_cpu"; then +! # Linux kernel 2.2 gives for example "CPU: 68020" (tabs in between). +! exact_cpu=`sed -n 's/^CPU:.*\(680[012346]0\).*$/m\1/p' /proc/cpuinfo 2>/dev/null` +! fi +! if test -z "$exact_cpu"; then +! # Try: movel #0,%d0; rts +! # This is to check the compiler and our asm code works etc, before +! # assuming failures below indicate cpu characteristics. +! # .byte is used to avoid problems with assembler syntax variations. +! # For testing, provoke failures by adding "illegal" possibly as +! # ".byte 0x4A, 0xFC" +! cat >${dummy}0.s </dev/null 2>&1; then + +! # $SHELL -c is used to execute $dummy below, since ($dummy) +! # 2>/dev/null still prints the SIGILL message on some shells. +! # +! # Try: movel #0,%d0 +! # rtd #0 +! cat >${dummy}0.s </dev/null 2>&1; then +! $SHELL -c $dummy >/dev/null 2>&1 +! if test $? != 0; then +! exact_cpu=m68000 # because rtd didn't work +! fi +! fi +! # +! +! if test -z "$exact_cpu"; then +! # Try: trapf +! # movel #0,%d0 +! # rts +! # Another possibility for identifying 68000 and 68010 is the +! # different value stored by "movem a0,(a0)+" +! cat >${dummy}0.s </dev/null 2>&1; then +! $SHELL -c $dummy >/dev/null 2>&1 +! if test $? != 0; then +! exact_cpu=m68010 # because trapf didn't work +! fi +! fi +! fi +! +! if test -z "$exact_cpu"; then +! # Try: bfffo %d1{0:31},%d0 +! # movel #0,%d0 +! # rts +! cat >${dummy}0.s </dev/null 2>&1; then +! $SHELL -c $dummy >/dev/null 2>&1 +! if test $? != 0; then +! exact_cpu=m68360 # cpu32, because bfffo didn't work +! fi +! fi +! fi +! +! if test -z "$exact_cpu"; then +! # FIXME: Now we know 68020 or up, but how to detect 030, 040 and 060? +! exact_cpu=m68020 +! fi +! fi +! fi +! if test -z "$exact_cpu"; then +! case "$guess_full" in +! *-*-next* | *-*-openstep*) # NeXTs are 68020 or better +! exact_cpu=m68020 ;; +! esac +! fi +! ;; +! +! +! rs6000-*-* | powerpc*-*-*) +! # Enhancement: On MacOS the "machine" command prints for instance +! # "ppc750". Interestingly on powerpc970-apple-darwin6.8.5 it prints +! # "ppc970" where there's no actual #define for 970 from NXGetLocalArchInfo +! # (as noted below). But the man page says the command is still "under +! # development", so it doesn't seem wise to use it just yet, not while +! # there's an alternative. +! +! # Try to read the PVR. mfpvr is a protected instruction, NetBSD, MacOS and +! # AIX don't allow it in user mode, but the Linux kernel does. We prefer this +! # to /proc/cpuinfo since the latter lags for newer CPUs. +! # +! # Note this is no good on AIX, since a C function there is the address of +! # a function descriptor, not actual code. But this doesn't matter since +! # AIX doesn't allow mfpvr anyway. +! # +! if test -z "$exact_cpu"; then +! eval $set_cc_for_build +! cat >$dummy.c <<\EOF +! #include +! int +! main () +! { +! unsigned pvr; +! +! asm ("mfpvr %0" : "=r" (pvr)); +! +! switch (pvr >> 16) { +! case 0x0001: puts ("powerpc601"); break; +! case 0x0003: puts ("powerpc603"); break; +! case 0x0004: puts ("powerpc604"); break; +! case 0x0006: puts ("powerpc603e"); break; +! case 0x0007: puts ("powerpc603e"); break; /* 603ev */ +! case 0x0008: puts ("powerpc750"); break; +! case 0x0009: puts ("powerpc604e"); break; +! case 0x000a: puts ("powerpc604e"); break; /* 604ev5 */ +! case 0x000c: puts ("powerpc7400"); break; +! case 0x0041: puts ("powerpc630"); break; +! case 0x003f: puts ("power7"); break; +! case 0x004b: +! case 0x004c: +! case 0x004d: puts ("power8"); break; +! case 0x004e: puts ("power9"); break; +! case 0x0080: puts ("power10"); break; +! case 0x0050: puts ("powerpc860"); break; +! case 0x8000: puts ("powerpc7450"); break; +! case 0x8001: puts ("powerpc7455"); break; +! case 0x8002: puts ("powerpc7457"); break; +! case 0x8003: puts ("powerpc7447"); break; /* really 7447A */ +! case 0x800c: puts ("powerpc7410"); break; +! } +! return 0; +! } + EOF +! if ($CC_FOR_BUILD $dummy.c -o $dummy) >/dev/null 2>&1; then +! # This style construct is needed on AIX 4.3 to suppress the SIGILL error +! # from (*fun)(). Using $SHELL -c $dummy 2>/dev/null doesn't work. +! { x=`$dummy`; } 2>/dev/null +! if test -n "$x"; then +! exact_cpu=$x +! fi +! fi +! fi +! +! +! # Grep the /proc/cpuinfo pseudo-file. +! # Anything unrecognised is ignored, since of course we mustn't spit out +! # a cpu type config.sub doesn't know. +! if test -z "$exact_cpu" && test -f /proc/cpuinfo; then +! x=`grep "^cpu[ ]" /proc/cpuinfo | head -n 1` +! x=`echo $x | sed -n 's/^cpu[ ]*:[ ]*\([A-Za-z0-9]*\).*/\1/p'` +! x=`echo $x | sed 's/PPC//'` +! case $x in +! 601) exact_cpu="power" ;; +! 603ev) exact_cpu="powerpc603e" ;; +! 604ev5) exact_cpu="powerpc604e" ;; +! 970??) exact_cpu="powerpc970" ;; +! 603 | 603e | 604 | 604e | 750 | 821 | 860) +! exact_cpu="powerpc$x" ;; +! POWER[4-9]*) +! exact_cpu=`echo $x | sed -e "s;POWER;power;" -e "s;[a-zA-Z]*$;;"` ;; +! esac +! fi + + +! if test -z "$exact_cpu"; then +! # On AIX, try looking at _system_configuration. This is present in +! # version 4 at least. +! cat >$dummy.c < +! #include + int + main () + { +! switch (_system_configuration.implementation) { +! /* Old versions of AIX don't have all these constants, +! use ifdef for safety. */ +! #ifdef POWER_RS2 +! case POWER_RS2: puts ("power2"); break; +! #endif +! #ifdef POWER_601 +! case POWER_601: puts ("power"); break; +! #endif +! #ifdef POWER_603 +! case POWER_603: puts ("powerpc603"); break; +! #endif +! #ifdef POWER_604 +! case POWER_604: puts ("powerpc604"); break; +! #endif +! #ifdef POWER_620 +! case POWER_620: puts ("powerpc620"); break; +! #endif +! #ifdef POWER_630 +! case POWER_630: puts ("powerpc630"); break; +! #endif +! /* Dunno what this is, leave it out for now. +! case POWER_A35: puts ("powerpca35"); break; +! */ +! /* This is waiting for a bit more info. +! case POWER_RS64II: puts ("powerpcrs64ii"); break; +! */ +! #ifdef POWER_4 +! case POWER_4: puts ("power4"); break; +! #endif +! #ifdef POWER_5 +! case POWER_5: puts ("power5"); break; +! #endif +! #ifdef POWER_6 +! case POWER_6: puts ("power6"); break; +! #endif +! #ifdef POWER_7 +! case POWER_7: puts ("power7"); break; +! #endif +! #ifdef POWER_8 +! case POWER_8: puts ("power8"); break; +! #endif +! #ifdef POWER_9 +! case POWER_9: puts ("power9"); break; +! #endif +! default: +! if (_system_configuration.architecture == POWER_RS) +! puts ("power"); +! else if (_system_configuration.width == 64) +! puts ("powerpc64"); +! } +! return 0; +! } +! EOF +! if ($CC_FOR_BUILD $dummy.c -o $dummy) >/dev/null 2>&1; then +! x=`$dummy` +! if test -n "$x"; then +! exact_cpu=$x +! fi +! fi +! fi +! +! if test -z "$exact_cpu"; then +! # On MacOS X (or any Mach-O presumably), NXGetLocalArchInfo cpusubtype +! # can tell us the exact cpu. +! cat >$dummy.c < +! #include +! int +! main (void) +! { +! const NXArchInfo *a = NXGetLocalArchInfo(); +! if (a->cputype == CPU_TYPE_POWERPC) +! { +! switch (a->cpusubtype) { +! /* The following known to Darwin 1.3. */ +! case CPU_SUBTYPE_POWERPC_601: puts ("powerpc601"); break; +! case CPU_SUBTYPE_POWERPC_602: puts ("powerpc602"); break; +! case CPU_SUBTYPE_POWERPC_603: puts ("powerpc603"); break; +! case CPU_SUBTYPE_POWERPC_603e: puts ("powerpc603e"); break; +! case CPU_SUBTYPE_POWERPC_603ev: puts ("powerpc603e"); break; +! case CPU_SUBTYPE_POWERPC_604: puts ("powerpc604"); break; +! case CPU_SUBTYPE_POWERPC_604e: puts ("powerpc604e"); break; +! case CPU_SUBTYPE_POWERPC_620: puts ("powerpc620"); break; +! case CPU_SUBTYPE_POWERPC_750: puts ("powerpc750"); break; +! case CPU_SUBTYPE_POWERPC_7400: puts ("powerpc7400"); break; +! case CPU_SUBTYPE_POWERPC_7450: puts ("powerpc7450"); break; +! /* Darwin 6.8.5 doesn't define the following */ +! case 0x8001: puts ("powerpc7455"); break; +! case 0x8002: puts ("powerpc7457"); break; +! case 0x8003: puts ("powerpc7447"); break; +! case 100: puts ("powerpc970"); break; +! } +! } +! return 0; +! } +! EOF +! if ($CC_FOR_BUILD $dummy.c -o $dummy) >/dev/null 2>&1; then +! x=`$dummy` +! if test -n "$x"; then +! exact_cpu=$x +! fi +! fi +! fi +! ;; +! +! sparc-*-* | sparc64-*-*) +! # If we can recognise an actual v7 then $exact_cpu is set to "sparc" so as +! # to short-circuit subsequent tests. +! +! # Grep the linux kernel /proc/cpuinfo pseudo-file. +! # A typical line is "cpu\t\t: TI UltraSparc II (BlackBird)" +! # See arch/sparc/kernel/cpu.c and arch/sparc64/kernel/cpu.c. +! # +! if test -f /proc/cpuinfo; then +! if grep 'cpu.*Cypress' /proc/cpuinfo >/dev/null; then +! exact_cpu="sparc" # ie. v7 +! elif grep 'cpu.*Power-UP' /proc/cpuinfo >/dev/null; then +! exact_cpu="sparc" # ie. v7 +! elif grep 'cpu.*HyperSparc' /proc/cpuinfo >/dev/null; then +! exact_cpu="sparcv8" +! elif grep 'cpu.*SuperSparc' /proc/cpuinfo >/dev/null; then +! exact_cpu="supersparc" +! elif grep 'cpu.*MicroSparc' /proc/cpuinfo >/dev/null; then +! exact_cpu="microsparc" +! elif grep 'cpu.*MB86904' /proc/cpuinfo >/dev/null; then +! # actually MicroSPARC-II +! exact_cpu=microsparc +! elif grep 'cpu.*UltraSparc T5' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparct5" +! elif grep 'cpu.*UltraSparc T4' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparct4" +! elif grep 'cpu.*UltraSparc T3' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparct3" +! elif grep 'cpu.*UltraSparc T2' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparct2" +! elif grep 'cpu.*UltraSparc T1' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparct1" +! elif grep 'cpu.*UltraSparc III' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparc3" +! elif grep 'cpu.*UltraSparc IIi' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparc2i" +! elif grep 'cpu.*UltraSparc II' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparc2" +! elif grep 'cpu.*UltraSparc' /proc/cpuinfo >/dev/null; then +! exact_cpu="ultrasparc" +! fi +! fi +! +! # Need to invoke this for setup of $dummy +! eval $set_cc_for_build +! +! # Grep the output from sysinfo on SunOS. +! # sysinfo has been seen living in /bin or in /usr/kvm +! # cpu0 is a "SuperSPARC Model 41 SPARCmodule" CPU +! # cpu0 is a "75 MHz TI,TMS390Z55" CPU +! # +! if test -z "$exact_cpu"; then +! for i in sysinfo /usr/kvm/sysinfo; do +! if $SHELL -c $i 2>/dev/null >$dummy; then +! if grep 'cpu0 is a "SuperSPARC' $dummy >/dev/null; then +! exact_cpu=supersparc +! break +! elif grep 'cpu0 is a .*TMS390Z5.' $dummy >/dev/null; then +! # TMS390Z50 and TMS390Z55 +! exact_cpu=supersparc +! break +! fi +! fi +! done +! fi +! +! # Grep the output from prtconf on Solaris. +! # Use an explicit /usr/sbin, since that directory might not be in a normal +! # user's path. +! # +! # SUNW,UltraSPARC (driver not attached) +! # SUNW,UltraSPARC-II (driver not attached) +! # SUNW,UltraSPARC-IIi (driver not attached) +! # SUNW,UltraSPARC-III+ (driver not attached) +! # Ross,RT625 (driver not attached) +! # TI,TMS390Z50 (driver not attached) +! # +! # /usr/sbin/sysdef prints similar information, but includes all loadable +! # cpu modules, not just the real cpu. +! # +! # We first try a plain prtconf, since that is known to work on older systems. +! # But for newer T1 systems, that doesn't produce any useful output, we need +! # "prtconf -vp" there. +! # +! for prtconfopt in "" "-vp"; do +! if test -z "$exact_cpu"; then +! if $SHELL -c "/usr/sbin/prtconf $prtconfopt" 2>/dev/null >$dummy; then +! if egrep '(SUNW|ORCL),(Ultra)?SPARC-T5' $dummy >/dev/null; then +! exact_cpu=ultrasparct5 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T4' $dummy >/dev/null; then +! exact_cpu=ultrasparct4 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T3' $dummy >/dev/null; then +! exact_cpu=ultrasparct3 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T2' $dummy >/dev/null; then +! exact_cpu=ultrasparct2 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-T1' $dummy >/dev/null; then +! exact_cpu=ultrasparct1 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-III' $dummy >/dev/null; then +! exact_cpu=ultrasparc3 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-IIi' $dummy >/dev/null; then +! exact_cpu=ultrasparc2i +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC-II' $dummy >/dev/null; then +! exact_cpu=ultrasparc2 +! elif egrep '(SUNW|ORCL),(Ultra)?SPARC' $dummy >/dev/null; then +! exact_cpu=ultrasparc +! elif grep 'Ross,RT62.' $dummy >/dev/null; then +! # RT620, RT625, RT626 hypersparcs (v8). +! exact_cpu=sparcv8 +! elif grep 'TI,TMS390Z5.' $dummy >/dev/null; then +! # TMS390Z50 and TMS390Z55 +! exact_cpu=supersparc +! elif grep 'TI,TMS390S10' $dummy >/dev/null; then +! exact_cpu=microsparc +! elif grep 'FMI,MB86904' $dummy >/dev/null; then +! # actually MicroSPARC-II +! exact_cpu=microsparc +! fi +! fi +! fi +! done +! +! # Grep the output from sysctl hw.model on sparc or sparc64 *BSD. +! # Use an explicit /sbin, since that directory might not be in a normal +! # user's path. Example outputs, +! # +! # hw.model: Sun Microsystems UltraSparc-IIi +! # +! if test -z "$exact_cpu"; then +! if $SHELL -c "/sbin/sysctl hw.model" 2>/dev/null >$dummy; then +! if grep -i 'UltraSparc-T5' $dummy >/dev/null; then +! exact_cpu=ultrasparct5 +! elif grep -i 'UltraSparc-T4' $dummy >/dev/null; then +! exact_cpu=ultrasparct4 +! elif grep -i 'UltraSparc-T3' $dummy >/dev/null; then +! exact_cpu=ultrasparct3 +! elif grep -i 'UltraSparc-T2' $dummy >/dev/null; then +! exact_cpu=ultrasparct2 +! elif grep -i 'UltraSparc-T1' $dummy >/dev/null; then +! exact_cpu=ultrasparct1 +! elif grep -i 'UltraSparc-III' $dummy >/dev/null; then +! exact_cpu=ultrasparc3 +! elif grep -i 'UltraSparc-IIi' $dummy >/dev/null; then +! exact_cpu=ultrasparc2i +! elif grep -i 'UltraSparc-II' $dummy >/dev/null; then +! exact_cpu=ultrasparc2 +! elif grep -i 'UltraSparc' $dummy >/dev/null; then +! exact_cpu=ultrasparc +! elif grep 'TMS390Z5.' $dummy >/dev/null; then +! # TMS390Z50 and TMS390Z55 +! exact_cpu=supersparc +! elif grep 'TMS390S10' $dummy >/dev/null; then +! exact_cpu=microsparc +! elif grep 'MB86904' $dummy >/dev/null; then +! # actually MicroSPARC-II +! exact_cpu=microsparc +! elif grep 'MB86907' $dummy >/dev/null; then +! exact_cpu=turbosparc +! fi +! fi +! fi +! +! # sun4m and sun4d are v8s of some sort, sun4u is a v9 of some sort +! # +! if test -z "$exact_cpu"; then +! case `uname -m` in +! sun4[md]) exact_cpu=sparcv8 ;; +! sun4u) exact_cpu=sparcv9 ;; +! esac +! fi +! ;; + + +! # Recognise x86 processors using a tricky cpuid with 4 arguments, repeating +! # arguments; for x86-64 we effectively pass the 1st in rdx and the 2nd in rcx. +! # This allows the same asm to work for both standard and Windoze calling +! # conventions. +! +! i?86-*-* | amd64-*-* | x86_64-*-*) +! eval $set_cc_for_build +! +! cat <$dummy.c +! #include +! #include +! #define CPUID(a,b) cpuid(b,a,a,b) +! #if __cplusplus +! extern "C" + #endif +- unsigned int cpuid (int, char *, char *, int); + +! int +! gmp_workaround_skylake_cpuid_bug () +! { +! char feature_string[49]; +! char processor_name_string[49]; +! static const char *bad_cpus[] = {" G44", " G45", " G39" /* , "6600" */ }; +! int i; +! +! /* Example strings: */ +! /* "Intel(R) Pentium(R) CPU G4400 @ 3.30GHz" */ +! /* "Intel(R) Core(TM) i5-6600K CPU @ 3.50GHz" */ +! /* ^ ^ ^ */ +! /* 0x80000002 0x80000003 0x80000004 */ +! /* We match out just the 0x80000003 part here. */ +! +! /* In their infinitive wisdom, Intel decided to use one register order for +! the vendor string, and another for the processor name string. We shuffle +! things about here, rather than write a new variant of our assembly cpuid. +! */ +! +! unsigned int eax, ebx, ecx, edx; +! eax = CPUID (feature_string, 0x80000003); +! ebx = ((unsigned int *)feature_string)[0]; +! edx = ((unsigned int *)feature_string)[1]; +! ecx = ((unsigned int *)feature_string)[2]; +! +! ((unsigned int *) (processor_name_string))[0] = eax; +! ((unsigned int *) (processor_name_string))[1] = ebx; +! ((unsigned int *) (processor_name_string))[2] = ecx; +! ((unsigned int *) (processor_name_string))[3] = edx; +! +! processor_name_string[16] = 0; +! +! for (i = 0; i < sizeof (bad_cpus) / sizeof (char *); i++) +! { +! if (strstr (processor_name_string, bad_cpus[i]) != 0) +! return 1; +! } +! return 0; +! } + +! int +! main () +! { +! char vendor_string[13]; +! char feature_string[12]; +! long fms; +! int family, model; +! const char *modelstr, *suffix; +! int cpu_64bit = 0, cpu_avx = 0; +! int cpuid_64bit, cpuid_avx, cpuid_osxsave; +! +! CPUID (vendor_string, 0); +! vendor_string[12] = 0; +! +! fms = CPUID (feature_string, 1); +! +! family = ((fms >> 8) & 0xf) + ((fms >> 20) & 0xff); +! model = ((fms >> 4) & 0xf) + ((fms >> 12) & 0xf0); +! +! cpuid_avx = (feature_string[11] >> 4) & 1; +! cpuid_osxsave = (feature_string[11] >> 3) & 1; +! +! modelstr = "$guess_cpu"; +! +! /**************************************************/ +! /*** WARNING: keep this list in sync with fat.c ***/ +! /**************************************************/ +! if (strcmp (vendor_string, "GenuineIntel") == 0) +! { +! switch (family) +! { +! case 5: +! if (model == 4 || model == 8) modelstr = "pentiummmx"; +! else modelstr = "pentium"; +! break; +! case 6: +! if (model <= 1) modelstr = "pentiumpro"; +! else if (model <= 6) modelstr = "pentium2"; +! else if (model <= 8) modelstr = "pentium3"; +! else if (model <= 9) modelstr = "pentiumm"; +! else if (model <= 0x0c) modelstr = "pentium3"; +! else if (model <= 0x0e) modelstr = "pentiumm"; +! else if (model <= 0x19) cpu_64bit = 1, modelstr = "core2"; +! else if (model == 0x1a) cpu_64bit = 1, modelstr = "nehalem"; /* NHM Gainestown */ +! else if (model == 0x1c) cpu_64bit = 1, modelstr = "atom"; /* Silverthorne */ +! else if (model == 0x1d) cpu_64bit = 1, modelstr = "core2"; /* PNR Dunnington */ +! else if (model == 0x1e) cpu_64bit = 1, modelstr = "nehalem"; /* NHM Lynnfield/Jasper */ +! else if (model == 0x25) cpu_64bit = 1, modelstr = "westmere"; /* WSM Clarkdale/Arrandale */ +! else if (model == 0x26) cpu_64bit = 1, modelstr = "atom"; /* Lincroft */ +! else if (model == 0x27) cpu_64bit = 1, modelstr = "atom"; /* Saltwell */ +! else if (model == 0x2a) cpu_64bit = 1, cpu_avx=1, modelstr = "sandybridge";/* SB */ +! else if (model == 0x2c) cpu_64bit = 1, modelstr = "westmere"; /* WSM Gulftown */ +! else if (model == 0x2d) cpu_64bit = 1, cpu_avx=1, modelstr = "sandybridge";/* SBC-EP */ +! else if (model == 0x2e) cpu_64bit = 1, modelstr = "nehalem"; /* NHM Beckton */ +! else if (model == 0x2f) cpu_64bit = 1, modelstr = "westmere"; /* WSM Eagleton */ +! else if (model == 0x36) cpu_64bit = 1, modelstr = "atom"; /* Cedarview/Saltwell */ +! else if (model == 0x37) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont */ +! else if (model == 0x3a) cpu_64bit = 1, cpu_avx=1, modelstr = "ivybridge"; /* IBR */ +! else if (model == 0x3c) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Haswell client */ +! else if (model == 0x3d) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell */ +! else if (model == 0x3e) cpu_64bit = 1, cpu_avx=1, modelstr = "ivybridge"; /* Ivytown */ +! else if (model == 0x3f) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Haswell server */ +! else if (model == 0x45) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Haswell ULT */ +! else if (model == 0x46) cpu_64bit = 1, cpu_avx=1, modelstr = "haswell"; /* Crystal Well */ +! else if (model == 0x47) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell */ +! else if (model == 0x4a) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont */ +! else if (model == 0x4c) cpu_64bit = 1, modelstr = "silvermont"; /* Airmont */ +! else if (model == 0x4d) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont/Avoton */ +! else if (model == 0x4e) cpu_64bit = 1, cpu_avx=1, modelstr = "skylake"; /* Skylake client */ +! else if (model == 0x4f) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell server */ +! else if (model == 0x55) cpu_64bit = 1, cpu_avx=1, modelstr = "skylake"; /* Skylake server */ +! else if (model == 0x56) cpu_64bit = 1, cpu_avx=1, modelstr = "broadwell"; /* Broadwell microserver */ +! else if (model == 0x57) cpu_64bit = 1, modelstr = "knightslanding"; /* aka Xeon Phi */ +! else if (model == 0x5a) cpu_64bit = 1, modelstr = "silvermont"; /* Silvermont */ +! else if (model == 0x5c) cpu_64bit = 1, modelstr = "goldmont"; /* Goldmont */ +! else if (model == 0x5e) cpu_64bit = 1, cpu_avx=1, modelstr = "skylake"; /* Skylake */ +! else if (model == 0x5f) cpu_64bit = 1, modelstr = "goldmont"; /* Goldmont */ +! else if (model == 0x6a) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake-DE */ +! else if (model == 0x6c) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake-SP */ +! else if (model == 0x7a) cpu_64bit = 1, modelstr = "goldmont"; /* Goldmont Plus */ +! else if (model == 0x7d) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake Y */ +! else if (model == 0x7e) cpu_64bit = 1, cpu_avx=1, modelstr = "icelake"; /* Ice Lake U */ +! else if (model == 0x8a) cpu_64bit = 1, modelstr = "tremont"; /* Tremont */ +! else if (model == 0x8c) cpu_64bit = 1, cpu_avx=1, modelstr = "tigerlake"; /* Tiger Lake U */ +! else if (model == 0x8d) cpu_64bit = 1, cpu_avx=1, modelstr = "tigerlake"; /* Tiger Lake H */ +! else if (model == 0x8e) cpu_64bit = 1, cpu_avx=1, modelstr = "kabylake"; /* Kaby Lake Y/U */ +! else if (model == 0x8f) cpu_64bit = 1, cpu_avx=1, modelstr = "alderlake"; /* Sapphire Rapids */ +! else if (model == 0x96) cpu_64bit = 1, modelstr = "tremont"; /* Tremont */ +! else if (model == 0x97) cpu_64bit = 1, cpu_avx=1, modelstr = "alderlake"; /* Alder Lake S */ +! else if (model == 0x9a) cpu_64bit = 1, cpu_avx=1, modelstr = "alderlake"; /* Alder Lake P */ +! else if (model == 0x9c) cpu_64bit = 1, modelstr = "tremont"; /* Tremont */ +! else if (model == 0x9e) cpu_64bit = 1, cpu_avx=1, modelstr = "kabylake"; /* Kaby Lake desktop */ +! else if (model == 0xa7) cpu_64bit = 1, cpu_avx=1, modelstr = "rocketlake"; /* Rocket Lake S */ +! else if (model == 0xba) cpu_64bit = 1, cpu_avx=1, modelstr = "raptorlake"; /* Raptor Lake */ +! else if (model == 0xb7) cpu_64bit = 1, cpu_avx=1, modelstr = "raptorlake"; /* Raptor Lake */ +! else cpu_64bit = 1, modelstr = "nehalem"; /* default */ +! +! if (strcmp (modelstr, "haswell") == 0 || +! strcmp (modelstr, "broadwell") == 0 || +! strcmp (modelstr, "skylake") == 0) +! { +! /* Some haswell, broadwell, skylake lack BMI2. Let them appear +! as sandybridge for now. */ +! CPUID (feature_string, 7); +! if ((feature_string[0 + 8 / 8] & (1 << (8 % 8))) == 0 +! || gmp_workaround_skylake_cpuid_bug ()) +! modelstr = "sandybridge"; +! } + +! break; +! case 15: +! cpu_64bit = 1, modelstr = "pentium4"; +! break; +! } +! } +! else if (strcmp (vendor_string, "AuthenticAMD") == 0) +! { +! switch (family) +! { +! case 5: +! if (model <= 3) modelstr = "k5"; +! else if (model <= 7) modelstr = "k6"; +! else if (model == 8) modelstr = "k62"; +! else if (model == 9) modelstr = "k63"; +! else if (model == 10) modelstr = "geode"; +! else if (model == 13) modelstr = "k63"; +! break; +! case 6: +! modelstr = "athlon"; +! break; +! case 15: /* K8, K9 */ +! cpu_64bit = 1, modelstr = "k8"; +! break; +! case 16: /* K10 */ +! cpu_64bit = 1, modelstr = "k10"; +! break; +! case 17: /* Hybrid k8/k10, claim k8 */ +! cpu_64bit = 1, modelstr = "k8"; +! break; +! case 18: /* Llano, uses K10 core */ +! cpu_64bit = 1, modelstr = "k10"; +! break; +! case 19: /* AMD Internal, assume future K10 */ +! cpu_64bit = 1, modelstr = "k10"; +! break; +! case 20: /* Bobcat */ +! cpu_64bit = 1, modelstr = "bobcat"; +! break; +! case 21: /* Bulldozer */ +! cpu_64bit = 1, cpu_avx = 1; +! if (model <= 1) +! modelstr = "bulldozer"; +! else if (model < 0x20) /* really 2, [0x10-0x20) */ +! modelstr = "piledriver"; +! else if (model < 0x40) /* really [0x30-0x40) */ +! modelstr = "steamroller"; +! else /* really [0x60-0x70) */ +! modelstr = "excavator"; +! break; +! case 22: /* Jaguar, an improved bobcat */ +! cpu_64bit = 1, cpu_avx = 1, modelstr = "jaguar"; +! break; +! case 23: /* Zen 1, 2 */ +! cpu_64bit = 1, cpu_avx = 1; +! switch (model) { +! case 1: +! case 8: +! case 17: +! case 24: +! modelstr = "zen"; +! break; +! default: +! modelstr = "zen2"; +! break; +! } +! break; +! case 25: /* Zen 3, 4 */ +! cpu_64bit = 1, cpu_avx = 1; +! switch (model) { +! case 0x00: +! case 0x01: +! case 0x08: +! case 0x21: +! case 0x40: +! case 0x44: +! case 0x50: +! modelstr = "zen3"; +! break; +! default: +! modelstr = "zen4"; +! break; +! } +! } +! } +! else if (strcmp (vendor_string, "HygonGenuine") == 0) +! { +! cpu_64bit = 1, cpu_avx = 1; +! modelstr = "zen"; +! } +! else if (strcmp (vendor_string, "CyrixInstead") == 0) +! { +! /* Should recognize Cyrix' processors too. */ +! } +! else if (strcmp (vendor_string, "CentaurHauls") == 0) +! { +! switch (family) +! { +! case 6: +! if (model < 9) modelstr = "viac3"; +! else if (model < 15) modelstr = "viac32"; +! else cpu_64bit = 1, modelstr = "nano"; +! break; +! } +! } + +! CPUID (feature_string, 0x80000001); +! cpuid_64bit = (feature_string[7] >> 5) & 1; + +! suffix = ""; + +! if (cpuid_64bit && ! cpu_64bit) +! /* If our cpuid-based CPU identification thinks this is a 32-bit CPU but +! cpuid claims AMD64 capabilities, then revert to the generic "x86_64". +! This is of course wrong, but it can happen in some virtualisers and +! emulators, and this workaround allows for successful 64-bit builds. */ +! modelstr = "x86_64"; +! else if (cpu_avx && ! (cpuid_avx && cpuid_osxsave)) +! /* For CPUs nominally capable of executing AVX, append "noavx" when not +! both the AVX and OSXSAVE cpuid bits are set. We tolerate weirdness +! here, as some virtualisers set a broken cpuid state, while other +! virtualisers allow guests to set a broken state. */ +! suffix = "noavx"; + +! printf ("%s%s", modelstr, suffix); +! return 0; + } + EOF + +! # The rcx/ecx zeroing here and in the variant below is needed for the BMI2 +! # check. + +! cat <${dummy}0.s +! .globl cpuid +! .globl _cpuid +! cpuid: +! _cpuid: +! push %rbx +! mov %rdx, %r8 +! mov %ecx, %eax +! xor %ecx, %ecx +! .byte 0x0f +! .byte 0xa2 +! mov %ebx, (%r8) +! mov %edx, 4(%r8) +! mov %ecx, 8(%r8) +! pop %rbx +! ret +! EOF + +! if ($CC_FOR_BUILD ${dummy}0.s $dummy.c -o $dummy) >/dev/null 2>&1; then +! # On 80386 and early 80486 cpuid is not available and will result in a +! # SIGILL message, hence 2>/dev/null. +! # +! # On i386-unknown-freebsd4.9, "/bin/sh -c ./dummy" seems to send an +! # "Illegal instruction (core dumped)" message to stdout, so we test $? +! # to check if the program run was successful. +! # +! x=`$SHELL -c $dummy 2>/dev/null` +! if test $? = 0 && test -n "$x"; then +! exact_cpu=$x +! fi +! fi +! +! cat <${dummy}0.s +! .globl cpuid +! .globl _cpuid +! cpuid: +! _cpuid: +! pushl %esi +! pushl %ebx +! movl 24(%esp),%eax +! xor %ecx, %ecx +! .byte 0x0f +! .byte 0xa2 +! movl 20(%esp),%esi +! movl %ebx,(%esi) +! movl %edx,4(%esi) +! movl %ecx,8(%esi) +! popl %ebx +! popl %esi +! ret +! EOF + +! if test -z "$exact_cpu"; then +! if ($CC_FOR_BUILD ${dummy}0.s $dummy.c -o $dummy) >/dev/null 2>&1; then +! # On 80386 and early 80486 cpuid is not available and will result in a +! # SIGILL message, hence 2>/dev/null. +! # +! # On i386-unknown-freebsd4.9, "/bin/sh -c ./dummy" seems to send an +! # "Illegal instruction (core dumped)" message to stdout, so we test $? +! # to check if the program run was successful. +! # +! x=`$SHELL -c $dummy 2>/dev/null` +! if test $? = 0 && test -n "$x"; then +! exact_cpu=$x +! fi +! fi +! fi +! +! # We need to remove some .o files here since lame C compilers +! # generate these even when not asked. +! ;; +! +! s390*-*-*) +! if test -f /proc/cpuinfo; then +! model=`grep "^processor 0: version =" /proc/cpuinfo | sed -e 's/.*machine = //'` +! case $model in +! 2064 | 2066) zcpu="z900" ;; +! 2084 | 2086) zcpu="z990" ;; +! 2094 | 2096) zcpu="z9" ;; +! 2097 | 2098) zcpu="z10" ;; +! 2817 | 2818 | *) zcpu="z196" ;; +! esac +! if grep "^features.* vxp2" /proc/cpuinfo >/dev/null; then +! zcpu="z16" +! elif grep "^features.* vxe2" /proc/cpuinfo >/dev/null; then +! zcpu="z15" +! elif grep "^features.* vxe" /proc/cpuinfo >/dev/null; then +! zcpu="z14" +! elif grep "^features.* vx" /proc/cpuinfo >/dev/null; then +! zcpu="z13" +! fi +! case "$guess_full" in +! s390x-*-*) exact_cpu=${zcpu} ;; +! s390-*-*) exact_cpu=${zcpu}esa ;; +! esac +! fi +! ;; + + esac + + + +! # ------------------------------------------------------------------------- +! # Use an exact cpu, if possible +! +! if test -n "$exact_cpu"; then +! echo "$exact_cpu$guess_rest" +! else +! echo "$guess_full" + fi +- exit 0 +- + + + # Local variables: +! # fill-column: 76 + # End: +--- 1,1815 ---- + #! /bin/sh +! # Attempt to guess a canonical system name. +! # Copyright 1992-2024 Free Software Foundation, Inc. + ++ # shellcheck disable=SC2006,SC2268 # see below for rationale + +! timestamp='2024-07-27' +! +! # This file is free software; you can redistribute it and/or modify it +! # under the terms of the GNU General Public License as published by +! # the Free Software Foundation, either version 3 of the License, or +! # (at your option) any later version. + # +! # This program is distributed in the hope that it will be useful, but +! # WITHOUT ANY WARRANTY; without even the implied warranty of +! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +! # General Public License for more details. + # +! # You should have received a copy of the GNU General Public License +! # along with this program; if not, see . + # +! # As a special exception to the GNU General Public License, if you +! # distribute this file as part of a program that contains a +! # configuration script generated by Autoconf, you may include it under +! # the same distribution terms that you use for the rest of that +! # program. This Exception is an additional permission under section 7 +! # of the GNU General Public License, version 3 ("GPLv3"). + # +! # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # +! # You can get the latest version of this script from: +! # https://git.savannah.gnu.org/cgit/config.git/plain/config.guess + # +! # Please send patches to . + + +! # The "shellcheck disable" line above the timestamp inhibits complaints +! # about features and limitations of the classic Bourne shell that were +! # superseded or lifted in POSIX. However, this script identifies a wide +! # variety of pre-POSIX systems that do not have POSIX shells at all, and +! # even some reasonably current systems (Solaris 10 as case-in-point) still +! # have a pre-POSIX /bin/sh. +! +! +! me=`echo "$0" | sed -e 's,.*/,,'` +! +! usage="\ +! Usage: $0 [OPTION] +! +! Output the configuration name of the system '$me' is run on. +! +! Options: +! -h, --help print this help, then exit +! -t, --time-stamp print date of last modification, then exit +! -v, --version print version number, then exit +! +! Report bugs and patches to ." +! +! version="\ +! GNU config.guess ($timestamp) +! +! Originally written by Per Bothner. +! Copyright 1992-2024 Free Software Foundation, Inc. +! +! This is free software; see the source for copying conditions. There is NO +! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +! +! help=" +! Try '$me --help' for more information." +! +! # Parse command line +! while test $# -gt 0 ; do +! case $1 in +! --time-stamp | --time* | -t ) +! echo "$timestamp" ; exit ;; +! --version | -v ) +! echo "$version" ; exit ;; +! --help | --h* | -h ) +! echo "$usage"; exit ;; +! -- ) # Stop option processing +! shift; break ;; +! - ) # Use stdin as input. +! break ;; +! -* ) +! echo "$me: invalid option $1$help" >&2 +! exit 1 ;; +! * ) +! break ;; +! esac +! done + + if test $# != 0; then +! echo "$me: too many arguments$help" >&2 + exit 1 + fi + +! # Just in case it came from the environment. +! GUESS= + + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a + # compiler to aid in system detection is discouraged as it requires + # temporary files to be created and, as you can see below, it is a + # headache to deal with in a portable fashion. + +! # Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +! # use 'HOST_CC' if defined, but it is deprecated. + + # Portable tmp directory creation inspired by the Autoconf team. + +! tmp= +! # shellcheck disable=SC2172 +! trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 +! +! set_cc_for_build() { +! # prevent multiple calls if $tmp is already set +! test "$tmp" && return 0 +! : "${TMPDIR=/tmp}" +! # shellcheck disable=SC2039,SC3028 +! { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || +! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || +! { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || +! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } +! dummy=$tmp/dummy +! case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in +! ,,) echo "int x;" > "$dummy.c" +! for driver in cc gcc c17 c99 c89 ; do +! if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then +! CC_FOR_BUILD=$driver +! break +! fi +! done +! if test x"$CC_FOR_BUILD" = x ; then +! CC_FOR_BUILD=no_compiler_found +! fi +! ;; +! ,,*) CC_FOR_BUILD=$CC ;; +! ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac + } + +! # This is needed to find uname on a Pyramid OSx when run in the BSD universe. +! # (ghazi@noc.rutgers.edu 1994-08-24) +! if test -f /.attbin/uname ; then +! PATH=$PATH:/.attbin ; export PATH +! fi + +! UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +! UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +! UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +! UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +! +! case $UNAME_SYSTEM in +! Linux|GNU|GNU/*) +! LIBC=unknown +! +! set_cc_for_build +! cat <<-EOF > "$dummy.c" +! #if defined(__ANDROID__) +! LIBC=android +! #else +! #include +! #if defined(__UCLIBC__) +! LIBC=uclibc +! #elif defined(__dietlibc__) +! LIBC=dietlibc +! #elif defined(__GLIBC__) +! LIBC=gnu +! #elif defined(__LLVM_LIBC__) +! LIBC=llvm +! #else +! #include +! /* First heuristic to detect musl libc. */ +! #ifdef __DEFINED_va_list +! LIBC=musl +! #endif +! #endif +! #endif +! EOF +! cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` +! eval "$cc_set_libc" +! +! # Second heuristic to detect musl libc. +! if [ "$LIBC" = unknown ] && +! command -v ldd >/dev/null && +! ldd --version 2>&1 | grep -q ^musl; then +! LIBC=musl +! fi + +! # If the system lacks a compiler, then just pick glibc. +! # We could probably try harder. +! if [ "$LIBC" = unknown ]; then +! LIBC=gnu +! fi +! ;; +! esac + +! # Note: order is significant - the case branches are not exclusive. +! +! case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in +! *:NetBSD:*:*) +! # NetBSD (nbsd) targets should (where applicable) match one or +! # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, +! # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently +! # switched to ELF, *-*-netbsd* would select the old +! # object file format. This provides both forward +! # compatibility and a consistent mechanism for selecting the +! # object file format. +! # +! # Note: NetBSD doesn't particularly care about the vendor +! # portion of the name. We always set it to "unknown". +! UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ +! /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ +! /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ +! echo unknown)` +! case $UNAME_MACHINE_ARCH in +! aarch64eb) machine=aarch64_be-unknown ;; +! armeb) machine=armeb-unknown ;; +! arm*) machine=arm-unknown ;; +! sh3el) machine=shl-unknown ;; +! sh3eb) machine=sh-unknown ;; +! sh5el) machine=sh5le-unknown ;; +! earmv*) +! arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` +! endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` +! machine=${arch}${endian}-unknown +! ;; +! *) machine=$UNAME_MACHINE_ARCH-unknown ;; +! esac +! # The Operating System including object format, if it has switched +! # to ELF recently (or will in the future) and ABI. +! case $UNAME_MACHINE_ARCH in +! earm*) +! os=netbsdelf +! ;; +! arm*|i386|m68k|ns32k|sh3*|sparc|vax) +! set_cc_for_build +! if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +! | grep -q __ELF__ +! then +! # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). +! # Return netbsd for either. FIX? +! os=netbsd +! else +! os=netbsdelf +! fi +! ;; +! *) +! os=netbsd +! ;; +! esac +! # Determine ABI tags. +! case $UNAME_MACHINE_ARCH in +! earm*) +! expr='s/^earmv[0-9]/-eabi/;s/eb$//' +! abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` +! ;; +! esac +! # The OS release +! # Debian GNU/NetBSD machines have a different userland, and +! # thus, need a distinct triplet. However, they do not need +! # kernel version information, so it can be replaced with a +! # suitable tag, in the style of linux-gnu. +! case $UNAME_VERSION in +! Debian*) +! release='-gnu' +! ;; +! *) +! release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` +! ;; +! esac +! # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: +! # contains redundant information, the shorter form: +! # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. +! GUESS=$machine-${os}${release}${abi-} +! ;; +! *:Bitrig:*:*) +! UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` +! GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE +! ;; +! *:OpenBSD:*:*) +! UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` +! GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE +! ;; +! *:SecBSD:*:*) +! UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` +! GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE +! ;; +! *:LibertyBSD:*:*) +! UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` +! GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE +! ;; +! *:MidnightBSD:*:*) +! GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE +! ;; +! *:ekkoBSD:*:*) +! GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE +! ;; +! *:SolidBSD:*:*) +! GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE +! ;; +! *:OS108:*:*) +! GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE +! ;; +! macppc:MirBSD:*:*) +! GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE +! ;; +! *:MirBSD:*:*) +! GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE +! ;; +! *:Sortix:*:*) +! GUESS=$UNAME_MACHINE-unknown-sortix +! ;; +! *:Twizzler:*:*) +! GUESS=$UNAME_MACHINE-unknown-twizzler +! ;; +! *:Redox:*:*) +! GUESS=$UNAME_MACHINE-unknown-redox +! ;; +! mips:OSF1:*.*) +! GUESS=mips-dec-osf1 +! ;; +! alpha:OSF1:*:*) +! # Reset EXIT trap before exiting to avoid spurious non-zero exit code. +! trap '' 0 +! case $UNAME_RELEASE in +! *4.0) +! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +! ;; +! *5.*) +! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` +! ;; +! esac +! # According to Compaq, /usr/sbin/psrinfo has been available on +! # OSF/1 and Tru64 systems produced since 1995. I hope that +! # covers most systems running today. This code pipes the CPU +! # types through head -n 1, so we only detect the type of CPU 0. +! ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` +! case $ALPHA_CPU_TYPE in +! "EV4 (21064)") +! UNAME_MACHINE=alpha ;; +! "EV4.5 (21064)") +! UNAME_MACHINE=alpha ;; +! "LCA4 (21066/21068)") +! UNAME_MACHINE=alpha ;; +! "EV5 (21164)") +! UNAME_MACHINE=alphaev5 ;; +! "EV5.6 (21164A)") +! UNAME_MACHINE=alphaev56 ;; +! "EV5.6 (21164PC)") +! UNAME_MACHINE=alphapca56 ;; +! "EV5.7 (21164PC)") +! UNAME_MACHINE=alphapca57 ;; +! "EV6 (21264)") +! UNAME_MACHINE=alphaev6 ;; +! "EV6.7 (21264A)") +! UNAME_MACHINE=alphaev67 ;; +! "EV6.8CB (21264C)") +! UNAME_MACHINE=alphaev68 ;; +! "EV6.8AL (21264B)") +! UNAME_MACHINE=alphaev68 ;; +! "EV6.8CX (21264D)") +! UNAME_MACHINE=alphaev68 ;; +! "EV6.9A (21264/EV69A)") +! UNAME_MACHINE=alphaev69 ;; +! "EV7 (21364)") +! UNAME_MACHINE=alphaev7 ;; +! "EV7.9 (21364A)") +! UNAME_MACHINE=alphaev79 ;; +! esac +! # A Pn.n version is a patched version. +! # A Vn.n version is a released version. +! # A Tn.n version is a released field test version. +! # A Xn.n version is an unreleased experimental baselevel. +! # 1.2 uses "1.2" for uname -r. +! OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` +! GUESS=$UNAME_MACHINE-dec-osf$OSF_REL +! ;; +! Amiga*:UNIX_System_V:4.0:*) +! GUESS=m68k-unknown-sysv4 +! ;; +! *:[Aa]miga[Oo][Ss]:*:*) +! GUESS=$UNAME_MACHINE-unknown-amigaos +! ;; +! *:[Mm]orph[Oo][Ss]:*:*) +! GUESS=$UNAME_MACHINE-unknown-morphos +! ;; +! *:OS/390:*:*) +! GUESS=i370-ibm-openedition +! ;; +! *:z/VM:*:*) +! GUESS=s390-ibm-zvmoe +! ;; +! *:OS400:*:*) +! GUESS=powerpc-ibm-os400 +! ;; +! arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) +! GUESS=arm-acorn-riscix$UNAME_RELEASE +! ;; +! arm*:riscos:*:*|arm*:RISCOS:*:*) +! GUESS=arm-unknown-riscos +! ;; +! SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +! GUESS=hppa1.1-hitachi-hiuxmpp +! ;; +! Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) +! # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. +! case `(/bin/universe) 2>/dev/null` in +! att) GUESS=pyramid-pyramid-sysv3 ;; +! *) GUESS=pyramid-pyramid-bsd ;; +! esac +! ;; +! NILE*:*:*:dcosx) +! GUESS=pyramid-pyramid-svr4 +! ;; +! DRS?6000:unix:4.0:6*) +! GUESS=sparc-icl-nx6 +! ;; +! DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) +! case `/usr/bin/uname -p` in +! sparc) GUESS=sparc-icl-nx7 ;; +! esac +! ;; +! s390x:SunOS:*:*) +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` +! GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL +! ;; +! sun4H:SunOS:5.*:*) +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` +! GUESS=sparc-hal-solaris2$SUN_REL +! ;; +! sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` +! GUESS=sparc-sun-solaris2$SUN_REL +! ;; +! i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) +! GUESS=i386-pc-auroraux$UNAME_RELEASE +! ;; +! i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +! set_cc_for_build +! SUN_ARCH=i386 +! # If there is a compiler, see if it is configured for 64-bit objects. +! # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. +! # This test works for both compilers. +! if test "$CC_FOR_BUILD" != no_compiler_found; then +! if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ +! (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ +! grep IS_64BIT_ARCH >/dev/null +! then +! SUN_ARCH=x86_64 +! fi +! fi +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` +! GUESS=$SUN_ARCH-pc-solaris2$SUN_REL +! ;; +! sun4*:SunOS:6*:*) +! # According to config.sub, this is the proper way to canonicalize +! # SunOS6. Hard to guess exactly what SunOS6 will be like, but +! # it's likely to be more like Solaris than SunOS4. +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` +! GUESS=sparc-sun-solaris3$SUN_REL +! ;; +! sun4*:SunOS:*:*) +! case `/usr/bin/arch -k` in +! Series*|S4*) +! UNAME_RELEASE=`uname -v` +! ;; +! esac +! # Japanese Language versions have a version number like '4.1.3-JL'. +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` +! GUESS=sparc-sun-sunos$SUN_REL +! ;; +! sun3*:SunOS:*:*) +! GUESS=m68k-sun-sunos$UNAME_RELEASE +! ;; +! sun*:*:4.2BSD:*) +! UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +! test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 +! case `/bin/arch` in +! sun3) +! GUESS=m68k-sun-sunos$UNAME_RELEASE +! ;; +! sun4) +! GUESS=sparc-sun-sunos$UNAME_RELEASE +! ;; +! esac +! ;; +! aushp:SunOS:*:*) +! GUESS=sparc-auspex-sunos$UNAME_RELEASE +! ;; +! # The situation for MiNT is a little confusing. The machine name +! # can be virtually everything (everything which is not +! # "atarist" or "atariste" at least should have a processor +! # > m68000). The system name ranges from "MiNT" over "FreeMiNT" +! # to the lowercase version "mint" (or "freemint"). Finally +! # the system name "TOS" denotes a system which is actually not +! # MiNT. But MiNT is downward compatible to TOS, so this should +! # be no problem. +! atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +! GUESS=m68k-atari-mint$UNAME_RELEASE +! ;; +! atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) +! GUESS=m68k-atari-mint$UNAME_RELEASE +! ;; +! *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +! GUESS=m68k-atari-mint$UNAME_RELEASE +! ;; +! milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +! GUESS=m68k-milan-mint$UNAME_RELEASE +! ;; +! hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +! GUESS=m68k-hades-mint$UNAME_RELEASE +! ;; +! *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +! GUESS=m68k-unknown-mint$UNAME_RELEASE +! ;; +! m68k:machten:*:*) +! GUESS=m68k-apple-machten$UNAME_RELEASE +! ;; +! powerpc:machten:*:*) +! GUESS=powerpc-apple-machten$UNAME_RELEASE +! ;; +! RISC*:Mach:*:*) +! GUESS=mips-dec-mach_bsd4.3 +! ;; +! RISC*:ULTRIX:*:*) +! GUESS=mips-dec-ultrix$UNAME_RELEASE +! ;; +! VAX*:ULTRIX*:*:*) +! GUESS=vax-dec-ultrix$UNAME_RELEASE +! ;; +! 2020:CLIX:*:* | 2430:CLIX:*:*) +! GUESS=clipper-intergraph-clix$UNAME_RELEASE +! ;; +! mips:*:*:UMIPS | mips:*:*:RISCos) +! set_cc_for_build +! sed 's/^ //' << EOF > "$dummy.c" +! #ifdef __cplusplus +! #include /* for printf() prototype */ +! int main (int argc, char *argv[]) { +! #else +! int main (argc, argv) int argc; char *argv[]; { +! #endif +! #if defined (host_mips) && defined (MIPSEB) +! #if defined (SYSTYPE_SYSV) +! printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); +! #endif +! #if defined (SYSTYPE_SVR4) +! printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); +! #endif +! #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) +! printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); +! #endif +! #endif +! exit (-1); +! } +! EOF +! $CC_FOR_BUILD -o "$dummy" "$dummy.c" && +! dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && +! SYSTEM_NAME=`"$dummy" "$dummyarg"` && +! { echo "$SYSTEM_NAME"; exit; } +! GUESS=mips-mips-riscos$UNAME_RELEASE +! ;; +! Motorola:PowerMAX_OS:*:*) +! GUESS=powerpc-motorola-powermax +! ;; +! Motorola:*:4.3:PL8-*) +! GUESS=powerpc-harris-powermax +! ;; +! Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) +! GUESS=powerpc-harris-powermax +! ;; +! Night_Hawk:Power_UNIX:*:*) +! GUESS=powerpc-harris-powerunix +! ;; +! m88k:CX/UX:7*:*) +! GUESS=m88k-harris-cxux7 +! ;; +! m88k:*:4*:R4*) +! GUESS=m88k-motorola-sysv4 +! ;; +! m88k:*:3*:R3*) +! GUESS=m88k-motorola-sysv3 +! ;; +! AViiON:dgux:*:*) +! # DG/UX returns AViiON for all architectures +! UNAME_PROCESSOR=`/usr/bin/uname -p` +! if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 +! then +! if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ +! test "$TARGET_BINARY_INTERFACE"x = x +! then +! GUESS=m88k-dg-dgux$UNAME_RELEASE +! else +! GUESS=m88k-dg-dguxbcs$UNAME_RELEASE +! fi +! else +! GUESS=i586-dg-dgux$UNAME_RELEASE +! fi +! ;; +! M88*:DolphinOS:*:*) # DolphinOS (SVR3) +! GUESS=m88k-dolphin-sysv3 +! ;; +! M88*:*:R3*:*) +! # Delta 88k system running SVR3 +! GUESS=m88k-motorola-sysv3 +! ;; +! XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) +! GUESS=m88k-tektronix-sysv3 +! ;; +! Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) +! GUESS=m68k-tektronix-bsd +! ;; +! *:IRIX*:*:*) +! IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` +! GUESS=mips-sgi-irix$IRIX_REL +! ;; +! ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +! GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id +! ;; # Note that: echo "'`uname -s`'" gives 'AIX ' +! i*86:AIX:*:*) +! GUESS=i386-ibm-aix +! ;; +! ia64:AIX:*:*) +! if test -x /usr/bin/oslevel ; then +! IBM_REV=`/usr/bin/oslevel` +! else +! IBM_REV=$UNAME_VERSION.$UNAME_RELEASE +! fi +! GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV +! ;; +! *:AIX:2:3) +! if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +! set_cc_for_build +! sed 's/^ //' << EOF > "$dummy.c" +! #include +! +! int +! main () +! { +! if (!__power_pc()) +! exit(1); +! puts("powerpc-ibm-aix3.2.5"); +! exit(0); +! } + EOF +! if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` +! then +! GUESS=$SYSTEM_NAME +! else +! GUESS=rs6000-ibm-aix3.2.5 +! fi +! elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then +! GUESS=rs6000-ibm-aix3.2.4 +! else +! GUESS=rs6000-ibm-aix3.2 +! fi +! ;; +! *:AIX:*:[4567]) +! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` +! if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then +! IBM_ARCH=rs6000 +! else +! IBM_ARCH=powerpc +! fi +! if test -x /usr/bin/lslpp ; then +! IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ +! awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` +! else +! IBM_REV=$UNAME_VERSION.$UNAME_RELEASE +! fi +! GUESS=$IBM_ARCH-ibm-aix$IBM_REV +! ;; +! *:AIX:*:*) +! GUESS=rs6000-ibm-aix +! ;; +! ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) +! GUESS=romp-ibm-bsd4.4 +! ;; +! ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and +! GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to +! ;; # report: romp-ibm BSD 4.3 +! *:BOSX:*:*) +! GUESS=rs6000-bull-bosx +! ;; +! DPX/2?00:B.O.S.:*:*) +! GUESS=m68k-bull-sysv3 +! ;; +! 9000/[34]??:4.3bsd:1.*:*) +! GUESS=m68k-hp-bsd +! ;; +! hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) +! GUESS=m68k-hp-bsd4.4 +! ;; +! 9000/[34678]??:HP-UX:*:*) +! HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` +! case $UNAME_MACHINE in +! 9000/31?) HP_ARCH=m68000 ;; +! 9000/[34]??) HP_ARCH=m68k ;; +! 9000/[678][0-9][0-9]) +! if test -x /usr/bin/getconf; then +! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +! sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +! case $sc_cpu_version in +! 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 +! 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 +! 532) # CPU_PA_RISC2_0 +! case $sc_kernel_bits in +! 32) HP_ARCH=hppa2.0n ;; +! 64) HP_ARCH=hppa2.0w ;; +! '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 +! esac ;; +! esac +! fi +! if test "$HP_ARCH" = ""; then +! set_cc_for_build +! sed 's/^ //' << EOF > "$dummy.c" +! +! #define _HPUX_SOURCE +! #include +! #include +! +! int +! main () +! { +! #if defined(_SC_KERNEL_BITS) +! long bits = sysconf(_SC_KERNEL_BITS); +! #endif +! long cpu = sysconf (_SC_CPU_VERSION); +! +! switch (cpu) +! { +! case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +! case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +! case CPU_PA_RISC2_0: +! #if defined(_SC_KERNEL_BITS) +! switch (bits) +! { +! case 64: puts ("hppa2.0w"); break; +! case 32: puts ("hppa2.0n"); break; +! default: puts ("hppa2.0"); break; +! } break; +! #else /* !defined(_SC_KERNEL_BITS) */ +! puts ("hppa2.0"); break; +! #endif +! default: puts ("hppa1.0"); break; +! } +! exit (0); +! } + EOF +! (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` +! test -z "$HP_ARCH" && HP_ARCH=hppa +! fi ;; +! esac +! if test "$HP_ARCH" = hppa2.0w +! then +! set_cc_for_build +! +! # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating +! # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler +! # generating 64-bit code. GNU and HP use different nomenclature: +! # +! # $ CC_FOR_BUILD=cc ./config.guess +! # => hppa2.0w-hp-hpux11.23 +! # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess +! # => hppa64-hp-hpux11.23 +! +! if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | +! grep -q __LP64__ +! then +! HP_ARCH=hppa2.0w +! else +! HP_ARCH=hppa64 +! fi +! fi +! GUESS=$HP_ARCH-hp-hpux$HPUX_REV +! ;; +! ia64:HP-UX:*:*) +! HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` +! GUESS=ia64-hp-hpux$HPUX_REV +! ;; +! 3050*:HI-UX:*:*) +! set_cc_for_build +! sed 's/^ //' << EOF > "$dummy.c" +! #include +! int +! main () +! { +! long cpu = sysconf (_SC_CPU_VERSION); +! /* The order matters, because CPU_IS_HP_MC68K erroneously returns +! true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct +! results, however. */ +! if (CPU_IS_PA_RISC (cpu)) +! { +! switch (cpu) +! { +! case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; +! case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; +! case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; +! default: puts ("hppa-hitachi-hiuxwe2"); break; +! } +! } +! else if (CPU_IS_HP_MC68K (cpu)) +! puts ("m68k-hitachi-hiuxwe2"); +! else puts ("unknown-hitachi-hiuxwe2"); +! exit (0); +! } + EOF +! $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && +! { echo "$SYSTEM_NAME"; exit; } +! GUESS=unknown-hitachi-hiuxwe2 +! ;; +! 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) +! GUESS=hppa1.1-hp-bsd +! ;; +! 9000/8??:4.3bsd:*:*) +! GUESS=hppa1.0-hp-bsd +! ;; +! *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) +! GUESS=hppa1.0-hp-mpeix +! ;; +! hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) +! GUESS=hppa1.1-hp-osf +! ;; +! hp8??:OSF1:*:*) +! GUESS=hppa1.0-hp-osf +! ;; +! i*86:OSF1:*:*) +! if test -x /usr/sbin/sysversion ; then +! GUESS=$UNAME_MACHINE-unknown-osf1mk +! else +! GUESS=$UNAME_MACHINE-unknown-osf1 +! fi +! ;; +! parisc*:Lites*:*:*) +! GUESS=hppa1.1-hp-lites +! ;; +! C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) +! GUESS=c1-convex-bsd +! ;; +! C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) +! if getsysinfo -f scalar_acc +! then echo c32-convex-bsd +! else echo c2-convex-bsd +! fi +! exit ;; +! C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) +! GUESS=c34-convex-bsd +! ;; +! C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) +! GUESS=c38-convex-bsd +! ;; +! C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) +! GUESS=c4-convex-bsd +! ;; +! CRAY*Y-MP:*:*:*) +! CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` +! GUESS=ymp-cray-unicos$CRAY_REL +! ;; +! CRAY*[A-Z]90:*:*:*) +! echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ +! | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ +! -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ +! -e 's/\.[^.]*$/.X/' +! exit ;; +! CRAY*TS:*:*:*) +! CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` +! GUESS=t90-cray-unicos$CRAY_REL +! ;; +! CRAY*T3E:*:*:*) +! CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` +! GUESS=alphaev5-cray-unicosmk$CRAY_REL +! ;; +! CRAY*SV1:*:*:*) +! CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` +! GUESS=sv1-cray-unicos$CRAY_REL +! ;; +! *:UNICOS/mp:*:*) +! CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` +! GUESS=craynv-cray-unicosmp$CRAY_REL +! ;; +! F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) +! FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` +! FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` +! FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` +! GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} +! ;; +! 5000:UNIX_System_V:4.*:*) +! FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` +! FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` +! GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} +! ;; +! i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) +! GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE +! ;; +! sparc*:BSD/OS:*:*) +! GUESS=sparc-unknown-bsdi$UNAME_RELEASE +! ;; +! *:BSD/OS:*:*) +! GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE +! ;; +! arm:FreeBSD:*:*) +! UNAME_PROCESSOR=`uname -p` +! set_cc_for_build +! if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ +! | grep -q __ARM_PCS_VFP +! then +! FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` +! GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi +! else +! FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` +! GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf +! fi +! ;; +! *:FreeBSD:*:*) +! UNAME_PROCESSOR=`uname -p` +! case $UNAME_PROCESSOR in +! amd64) +! UNAME_PROCESSOR=x86_64 ;; +! i386) +! UNAME_PROCESSOR=i586 ;; +! esac +! FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` +! GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL +! ;; +! i*:CYGWIN*:*) +! GUESS=$UNAME_MACHINE-pc-cygwin +! ;; +! *:MINGW64*:*) +! GUESS=$UNAME_MACHINE-pc-mingw64 +! ;; +! *:MINGW*:*) +! GUESS=$UNAME_MACHINE-pc-mingw32 +! ;; +! *:MSYS*:*) +! GUESS=$UNAME_MACHINE-pc-msys +! ;; +! i*:PW*:*) +! GUESS=$UNAME_MACHINE-pc-pw32 +! ;; +! *:SerenityOS:*:*) +! GUESS=$UNAME_MACHINE-pc-serenity +! ;; +! *:Interix*:*) +! case $UNAME_MACHINE in +! x86) +! GUESS=i586-pc-interix$UNAME_RELEASE +! ;; +! authenticamd | genuineintel | EM64T) +! GUESS=x86_64-unknown-interix$UNAME_RELEASE +! ;; +! IA64) +! GUESS=ia64-unknown-interix$UNAME_RELEASE +! ;; +! esac ;; +! i*:UWIN*:*) +! GUESS=$UNAME_MACHINE-pc-uwin +! ;; +! amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) +! GUESS=x86_64-pc-cygwin +! ;; +! prep*:SunOS:5.*:*) +! SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` +! GUESS=powerpcle-unknown-solaris2$SUN_REL +! ;; +! *:GNU:*:*) +! # the GNU system +! GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` +! GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` +! GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL +! ;; +! *:GNU/*:*:*) +! # other systems with GNU libc and userland +! GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` +! GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` +! GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC +! ;; +! x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) +! GUESS="$UNAME_MACHINE-pc-managarm-mlibc" +! ;; +! *:[Mm]anagarm:*:*) +! GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" +! ;; +! *:Minix:*:*) +! GUESS=$UNAME_MACHINE-unknown-minix +! ;; +! aarch64:Linux:*:*) +! set_cc_for_build +! CPU=$UNAME_MACHINE +! LIBCABI=$LIBC +! if test "$CC_FOR_BUILD" != no_compiler_found; then +! ABI=64 +! sed 's/^ //' << EOF > "$dummy.c" +! #ifdef __ARM_EABI__ +! #ifdef __ARM_PCS_VFP +! ABI=eabihf +! #else +! ABI=eabi +! #endif +! #endif + EOF +! cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` +! eval "$cc_set_abi" +! case $ABI in +! eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; +! esac +! fi +! GUESS=$CPU-unknown-linux-$LIBCABI +! ;; +! aarch64_be:Linux:*:*) +! UNAME_MACHINE=aarch64_be +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! alpha:Linux:*:*) +! case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in +! EV5) UNAME_MACHINE=alphaev5 ;; +! EV56) UNAME_MACHINE=alphaev56 ;; +! PCA56) UNAME_MACHINE=alphapca56 ;; +! PCA57) UNAME_MACHINE=alphapca56 ;; +! EV6) UNAME_MACHINE=alphaev6 ;; +! EV67) UNAME_MACHINE=alphaev67 ;; +! EV68*) UNAME_MACHINE=alphaev68 ;; +! esac +! objdump --private-headers /bin/sh | grep -q ld.so.1 +! if test "$?" = 0 ; then LIBC=gnulibc1 ; fi +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! arm*:Linux:*:*) +! set_cc_for_build +! if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +! | grep -q __ARM_EABI__ +! then +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! else +! if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ +! | grep -q __ARM_PCS_VFP +! then +! GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi +! else +! GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf +! fi +! fi +! ;; +! avr32*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! cris:Linux:*:*) +! GUESS=$UNAME_MACHINE-axis-linux-$LIBC +! ;; +! crisv32:Linux:*:*) +! GUESS=$UNAME_MACHINE-axis-linux-$LIBC +! ;; +! e2k:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! frv:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! hexagon:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! i*86:Linux:*:*) +! GUESS=$UNAME_MACHINE-pc-linux-$LIBC +! ;; +! ia64:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! k1om:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! kvx:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! kvx:cos:*:*) +! GUESS=$UNAME_MACHINE-unknown-cos +! ;; +! kvx:mbr:*:*) +! GUESS=$UNAME_MACHINE-unknown-mbr +! ;; +! loongarch32:Linux:*:* | loongarch64:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! m32r*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! m68*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! mips:Linux:*:* | mips64:Linux:*:*) +! set_cc_for_build +! IS_GLIBC=0 +! test x"${LIBC}" = xgnu && IS_GLIBC=1 +! sed 's/^ //' << EOF > "$dummy.c" +! #undef CPU +! #undef mips +! #undef mipsel +! #undef mips64 +! #undef mips64el +! #if ${IS_GLIBC} && defined(_ABI64) +! LIBCABI=gnuabi64 +! #else +! #if ${IS_GLIBC} && defined(_ABIN32) +! LIBCABI=gnuabin32 +! #else +! LIBCABI=${LIBC} +! #endif +! #endif +! +! #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 +! CPU=mipsisa64r6 +! #else +! #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 +! CPU=mipsisa32r6 +! #else +! #if defined(__mips64) +! CPU=mips64 +! #else +! CPU=mips +! #endif +! #endif +! #endif +! +! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +! MIPS_ENDIAN=el +! #else +! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +! MIPS_ENDIAN= +! #else +! MIPS_ENDIAN= +! #endif +! #endif +! EOF +! cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` +! eval "$cc_set_vars" +! test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } +! ;; +! mips64el:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! openrisc*:Linux:*:*) +! GUESS=or1k-unknown-linux-$LIBC +! ;; +! or32:Linux:*:* | or1k*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! padre:Linux:*:*) +! GUESS=sparc-unknown-linux-$LIBC +! ;; +! parisc64:Linux:*:* | hppa64:Linux:*:*) +! GUESS=hppa64-unknown-linux-$LIBC +! ;; +! parisc:Linux:*:* | hppa:Linux:*:*) +! # Look for CPU level +! case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +! PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; +! PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; +! *) GUESS=hppa-unknown-linux-$LIBC ;; +! esac +! ;; +! ppc64:Linux:*:*) +! GUESS=powerpc64-unknown-linux-$LIBC +! ;; +! ppc:Linux:*:*) +! GUESS=powerpc-unknown-linux-$LIBC +! ;; +! ppc64le:Linux:*:*) +! GUESS=powerpc64le-unknown-linux-$LIBC +! ;; +! ppcle:Linux:*:*) +! GUESS=powerpcle-unknown-linux-$LIBC +! ;; +! riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! s390:Linux:*:* | s390x:Linux:*:*) +! GUESS=$UNAME_MACHINE-ibm-linux-$LIBC +! ;; +! sh64*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! sh*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! sparc:Linux:*:* | sparc64:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! tile*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! vax:Linux:*:*) +! GUESS=$UNAME_MACHINE-dec-linux-$LIBC +! ;; +! x86_64:Linux:*:*) +! set_cc_for_build +! CPU=$UNAME_MACHINE +! LIBCABI=$LIBC +! if test "$CC_FOR_BUILD" != no_compiler_found; then +! ABI=64 +! sed 's/^ //' << EOF > "$dummy.c" +! #ifdef __i386__ +! ABI=x86 +! #else +! #ifdef __ILP32__ +! ABI=x32 +! #endif +! #endif +! EOF +! cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` +! eval "$cc_set_abi" +! case $ABI in +! x86) CPU=i686 ;; +! x32) LIBCABI=${LIBC}x32 ;; +! esac +! fi +! GUESS=$CPU-pc-linux-$LIBCABI +! ;; +! xtensa*:Linux:*:*) +! GUESS=$UNAME_MACHINE-unknown-linux-$LIBC +! ;; +! i*86:DYNIX/ptx:4*:*) +! # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +! # earlier versions are messed up and put the nodename in both +! # sysname and nodename. +! GUESS=i386-sequent-sysv4 +! ;; +! i*86:UNIX_SV:4.2MP:2.*) +! # Unixware is an offshoot of SVR4, but it has its own version +! # number series starting with 2... +! # I am not positive that other SVR4 systems won't match this, +! # I just have to hope. -- rms. +! # Use sysv4.2uw... so that sysv4* matches it. +! GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION +! ;; +! i*86:OS/2:*:*) +! # If we were able to find 'uname', then EMX Unix compatibility +! # is probably installed. +! GUESS=$UNAME_MACHINE-pc-os2-emx +! ;; +! i*86:XTS-300:*:STOP) +! GUESS=$UNAME_MACHINE-unknown-stop +! ;; +! i*86:atheos:*:*) +! GUESS=$UNAME_MACHINE-unknown-atheos +! ;; +! i*86:syllable:*:*) +! GUESS=$UNAME_MACHINE-pc-syllable +! ;; +! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) +! GUESS=i386-unknown-lynxos$UNAME_RELEASE +! ;; +! i*86:*DOS:*:*) +! GUESS=$UNAME_MACHINE-pc-msdosdjgpp +! ;; +! i*86:*:4.*:*) +! UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` +! if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +! GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL +! else +! GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL +! fi +! ;; +! i*86:*:5:[678]*) +! # UnixWare 7.x, OpenUNIX and OpenServer 6. +! case `/bin/uname -X | grep "^Machine"` in +! *486*) UNAME_MACHINE=i486 ;; +! *Pentium) UNAME_MACHINE=i586 ;; +! *Pent*|*Celeron) UNAME_MACHINE=i686 ;; +! esac +! GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +! ;; +! i*86:*:3.2:*) +! if test -f /usr/options/cb.name; then +! UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then +! UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` +! (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 +! (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ +! && UNAME_MACHINE=i586 +! (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ +! && UNAME_MACHINE=i686 +! (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ +! && UNAME_MACHINE=i686 +! GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL +! else +! GUESS=$UNAME_MACHINE-pc-sysv32 +! fi +! ;; +! pc:*:*:*) +! # Left here for compatibility: +! # uname -m prints for DJGPP always 'pc', but it prints nothing about +! # the processor, so we play safe by assuming i586. +! # Note: whatever this is, it MUST be the same as what config.sub +! # prints for the "djgpp" host, or else GDB configure will decide that +! # this is a cross-build. +! GUESS=i586-pc-msdosdjgpp +! ;; +! Intel:Mach:3*:*) +! GUESS=i386-pc-mach3 +! ;; +! paragon:*:*:*) +! GUESS=i860-intel-osf1 +! ;; +! i860:*:4.*:*) # i860-SVR4 +! if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then +! GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 +! else # Add other i860-SVR4 vendors below as they are discovered. +! GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 +! fi +! ;; +! mini*:CTIX:SYS*5:*) +! # "miniframe" +! GUESS=m68010-convergent-sysv +! ;; +! mc68k:UNIX:SYSTEM5:3.51m) +! GUESS=m68k-convergent-sysv +! ;; +! M680?0:D-NIX:5.3:*) +! GUESS=m68k-diab-dnix +! ;; +! M68*:*:R3V[5678]*:*) +! test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; +! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) +! OS_REL='' +! test -r /etc/.relid \ +! && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +! && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } +! /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +! && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; +! 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +! && { echo i486-ncr-sysv4; exit; } ;; +! NCR*:*:4.2:* | MPRAS*:*:4.2:*) +! OS_REL='.3' +! test -r /etc/.relid \ +! && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +! /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +! && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } +! /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +! && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } +! /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ +! && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; +! m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) +! GUESS=m68k-unknown-lynxos$UNAME_RELEASE +! ;; +! mc68030:UNIX_System_V:4.*:*) +! GUESS=m68k-atari-sysv4 +! ;; +! TSUNAMI:LynxOS:2.*:*) +! GUESS=sparc-unknown-lynxos$UNAME_RELEASE +! ;; +! rs6000:LynxOS:2.*:*) +! GUESS=rs6000-unknown-lynxos$UNAME_RELEASE +! ;; +! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) +! GUESS=powerpc-unknown-lynxos$UNAME_RELEASE +! ;; +! SM[BE]S:UNIX_SV:*:*) +! GUESS=mips-dde-sysv$UNAME_RELEASE +! ;; +! RM*:ReliantUNIX-*:*:*) +! GUESS=mips-sni-sysv4 +! ;; +! RM*:SINIX-*:*:*) +! GUESS=mips-sni-sysv4 +! ;; +! *:SINIX-*:*:*) +! if uname -p 2>/dev/null >/dev/null ; then +! UNAME_MACHINE=`(uname -p) 2>/dev/null` +! GUESS=$UNAME_MACHINE-sni-sysv4 +! else +! GUESS=ns32k-sni-sysv +! fi +! ;; +! PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort +! # says +! GUESS=i586-unisys-sysv4 +! ;; +! *:UNIX_System_V:4*:FTX*) +! # From Gerald Hewes . +! # How about differentiating between stratus architectures? -djm +! GUESS=hppa1.1-stratus-sysv4 +! ;; +! *:*:*:FTX*) +! # From seanf@swdc.stratus.com. +! GUESS=i860-stratus-sysv4 +! ;; +! i*86:VOS:*:*) +! # From Paul.Green@stratus.com. +! GUESS=$UNAME_MACHINE-stratus-vos +! ;; +! *:VOS:*:*) +! # From Paul.Green@stratus.com. +! GUESS=hppa1.1-stratus-vos +! ;; +! mc68*:A/UX:*:*) +! GUESS=m68k-apple-aux$UNAME_RELEASE +! ;; +! news*:NEWS-OS:6*:*) +! GUESS=mips-sony-newsos6 +! ;; +! R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) +! if test -d /usr/nec; then +! GUESS=mips-nec-sysv$UNAME_RELEASE +! else +! GUESS=mips-unknown-sysv$UNAME_RELEASE +! fi +! ;; +! BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. +! GUESS=powerpc-be-beos +! ;; +! BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. +! GUESS=powerpc-apple-beos +! ;; +! BePC:BeOS:*:*) # BeOS running on Intel PC compatible. +! GUESS=i586-pc-beos +! ;; +! BePC:Haiku:*:*) # Haiku running on Intel PC compatible. +! GUESS=i586-pc-haiku +! ;; +! ppc:Haiku:*:*) # Haiku running on Apple PowerPC +! GUESS=powerpc-apple-haiku +! ;; +! *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) +! GUESS=$UNAME_MACHINE-unknown-haiku +! ;; +! SX-4:SUPER-UX:*:*) +! GUESS=sx4-nec-superux$UNAME_RELEASE +! ;; +! SX-5:SUPER-UX:*:*) +! GUESS=sx5-nec-superux$UNAME_RELEASE +! ;; +! SX-6:SUPER-UX:*:*) +! GUESS=sx6-nec-superux$UNAME_RELEASE +! ;; +! SX-7:SUPER-UX:*:*) +! GUESS=sx7-nec-superux$UNAME_RELEASE +! ;; +! SX-8:SUPER-UX:*:*) +! GUESS=sx8-nec-superux$UNAME_RELEASE +! ;; +! SX-8R:SUPER-UX:*:*) +! GUESS=sx8r-nec-superux$UNAME_RELEASE +! ;; +! SX-ACE:SUPER-UX:*:*) +! GUESS=sxace-nec-superux$UNAME_RELEASE +! ;; +! Power*:Rhapsody:*:*) +! GUESS=powerpc-apple-rhapsody$UNAME_RELEASE +! ;; +! *:Rhapsody:*:*) +! GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE +! ;; +! arm64:Darwin:*:*) +! GUESS=aarch64-apple-darwin$UNAME_RELEASE +! ;; +! *:Darwin:*:*) +! UNAME_PROCESSOR=`uname -p` +! case $UNAME_PROCESSOR in +! unknown) UNAME_PROCESSOR=powerpc ;; +! esac +! if command -v xcode-select > /dev/null 2> /dev/null && \ +! ! xcode-select --print-path > /dev/null 2> /dev/null ; then +! # Avoid executing cc if there is no toolchain installed as +! # cc will be a stub that puts up a graphical alert +! # prompting the user to install developer tools. +! CC_FOR_BUILD=no_compiler_found +! else +! set_cc_for_build +! fi +! if test "$CC_FOR_BUILD" != no_compiler_found; then +! if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ +! (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ +! grep IS_64BIT_ARCH >/dev/null +! then +! case $UNAME_PROCESSOR in +! i386) UNAME_PROCESSOR=x86_64 ;; +! powerpc) UNAME_PROCESSOR=powerpc64 ;; +! esac +! fi +! # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc +! if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ +! (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ +! grep IS_PPC >/dev/null +! then +! UNAME_PROCESSOR=powerpc +! fi +! elif test "$UNAME_PROCESSOR" = i386 ; then +! # uname -m returns i386 or x86_64 +! UNAME_PROCESSOR=$UNAME_MACHINE +! fi +! GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE +! ;; +! *:procnto*:*:* | *:QNX:[0123456789]*:*) +! UNAME_PROCESSOR=`uname -p` +! if test "$UNAME_PROCESSOR" = x86; then +! UNAME_PROCESSOR=i386 +! UNAME_MACHINE=pc +! fi +! GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE +! ;; +! *:QNX:*:4*) +! GUESS=i386-pc-qnx +! ;; +! NEO-*:NONSTOP_KERNEL:*:*) +! GUESS=neo-tandem-nsk$UNAME_RELEASE +! ;; +! NSE-*:NONSTOP_KERNEL:*:*) +! GUESS=nse-tandem-nsk$UNAME_RELEASE +! ;; +! NSR-*:NONSTOP_KERNEL:*:*) +! GUESS=nsr-tandem-nsk$UNAME_RELEASE +! ;; +! NSV-*:NONSTOP_KERNEL:*:*) +! GUESS=nsv-tandem-nsk$UNAME_RELEASE +! ;; +! NSX-*:NONSTOP_KERNEL:*:*) +! GUESS=nsx-tandem-nsk$UNAME_RELEASE +! ;; +! *:NonStop-UX:*:*) +! GUESS=mips-compaq-nonstopux +! ;; +! BS2000:POSIX*:*:*) +! GUESS=bs2000-siemens-sysv +! ;; +! DS/*:UNIX_System_V:*:*) +! GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE +! ;; +! *:Plan9:*:*) +! # "uname -m" is not consistent, so use $cputype instead. 386 +! # is converted to i386 for consistency with other x86 +! # operating systems. +! if test "${cputype-}" = 386; then +! UNAME_MACHINE=i386 +! elif test "x${cputype-}" != x; then +! UNAME_MACHINE=$cputype +! fi +! GUESS=$UNAME_MACHINE-unknown-plan9 +! ;; +! *:TOPS-10:*:*) +! GUESS=pdp10-unknown-tops10 +! ;; +! *:TENEX:*:*) +! GUESS=pdp10-unknown-tenex +! ;; +! KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) +! GUESS=pdp10-dec-tops20 +! ;; +! XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) +! GUESS=pdp10-xkl-tops20 +! ;; +! *:TOPS-20:*:*) +! GUESS=pdp10-unknown-tops20 +! ;; +! *:ITS:*:*) +! GUESS=pdp10-unknown-its +! ;; +! SEI:*:*:SEIUX) +! GUESS=mips-sei-seiux$UNAME_RELEASE +! ;; +! *:DragonFly:*:*) +! DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` +! GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL +! ;; +! *:*VMS:*:*) +! UNAME_MACHINE=`(uname -p) 2>/dev/null` +! case $UNAME_MACHINE in +! A*) GUESS=alpha-dec-vms ;; +! I*) GUESS=ia64-dec-vms ;; +! V*) GUESS=vax-dec-vms ;; +! esac ;; +! *:XENIX:*:SysV) +! GUESS=i386-pc-xenix +! ;; +! i*86:skyos:*:*) +! SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` +! GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL +! ;; +! i*86:rdos:*:*) +! GUESS=$UNAME_MACHINE-pc-rdos +! ;; +! i*86:Fiwix:*:*) +! GUESS=$UNAME_MACHINE-pc-fiwix +! ;; +! *:AROS:*:*) +! GUESS=$UNAME_MACHINE-unknown-aros +! ;; +! x86_64:VMkernel:*:*) +! GUESS=$UNAME_MACHINE-unknown-esx +! ;; +! amd64:Isilon\ OneFS:*:*) +! GUESS=x86_64-unknown-onefs +! ;; +! *:Unleashed:*:*) +! GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE +! ;; +! *:Ironclad:*:*) +! GUESS=$UNAME_MACHINE-unknown-ironclad +! ;; +! esac + ++ # Do we have a guess based on uname results? ++ if test "x$GUESS" != x; then ++ echo "$GUESS" ++ exit ++ fi + +! # No uname command or uname output not recognized. +! set_cc_for_build +! cat > "$dummy.c" < +! #include +! #endif +! #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +! #if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +! #include +! #if defined(_SIZE_T_) || defined(SIGLOST) +! #include +! #endif +! #endif +! #endif + int + main () + { +! #if defined (sony) +! #if defined (MIPSEB) +! /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +! I don't know.... */ +! printf ("mips-sony-bsd\n"); exit (0); +! #else +! #include +! printf ("m68k-sony-newsos%s\n", +! #ifdef NEWSOS4 +! "4" +! #else +! "" +! #endif +! ); exit (0); +! #endif +! #endif + ++ #if defined (NeXT) ++ #if !defined (__ARCHITECTURE__) ++ #define __ARCHITECTURE__ "m68k" ++ #endif ++ int version; ++ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); ++ exit (0); ++ #endif + +! #if defined (MULTIMAX) || defined (n16) +! #if defined (UMAXV) +! printf ("ns32k-encore-sysv\n"); exit (0); +! #else +! #if defined (CMU) +! printf ("ns32k-encore-mach\n"); exit (0); +! #else +! printf ("ns32k-encore-bsd\n"); exit (0); +! #endif +! #endif + #endif + +! #if defined (__386BSD__) +! printf ("i386-pc-bsd\n"); exit (0); +! #endif + +! #if defined (sequent) +! #if defined (i386) +! printf ("i386-sequent-dynix\n"); exit (0); +! #endif +! #if defined (ns32000) +! printf ("ns32k-sequent-dynix\n"); exit (0); +! #endif +! #endif + +! #if defined (_SEQUENT_) +! struct utsname un; + +! uname(&un); +! if (strncmp(un.version, "V2", 2) == 0) { +! printf ("i386-sequent-ptx2\n"); exit (0); +! } +! if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +! printf ("i386-sequent-ptx1\n"); exit (0); +! } +! printf ("i386-sequent-ptx\n"); exit (0); +! #endif + +! #if defined (vax) +! #if !defined (ultrix) +! #include +! #if defined (BSD) +! #if BSD == 43 +! printf ("vax-dec-bsd4.3\n"); exit (0); +! #else +! #if BSD == 199006 +! printf ("vax-dec-bsd4.3reno\n"); exit (0); +! #else +! printf ("vax-dec-bsd\n"); exit (0); +! #endif +! #endif +! #else +! printf ("vax-dec-bsd\n"); exit (0); +! #endif +! #else +! #if defined(_SIZE_T_) || defined(SIGLOST) +! struct utsname un; +! uname (&un); +! printf ("vax-dec-ultrix%s\n", un.release); exit (0); +! #else +! printf ("vax-dec-ultrix\n"); exit (0); +! #endif +! #endif +! #endif +! #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +! #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +! #if defined(_SIZE_T_) || defined(SIGLOST) +! struct utsname *un; +! uname (&un); +! printf ("mips-dec-ultrix%s\n", un.release); exit (0); +! #else +! printf ("mips-dec-ultrix\n"); exit (0); +! #endif +! #endif +! #endif + +! #if defined (alliant) && defined (i860) +! printf ("i860-alliant-bsd\n"); exit (0); +! #endif + +! exit (1); + } + EOF + +! $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && +! { echo "$SYSTEM_NAME"; exit; } + +! # Apollos put the system type in the environment. +! test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +! echo "$0: unable to guess system type" >&2 + +! case $UNAME_MACHINE:$UNAME_SYSTEM in +! mips:Linux | mips64:Linux) +! # If we got here on MIPS GNU/Linux, output extra information. +! cat >&2 <&2 <&2 </dev/null || echo unknown` +! uname -r = `(uname -r) 2>/dev/null || echo unknown` +! uname -s = `(uname -s) 2>/dev/null || echo unknown` +! uname -v = `(uname -v) 2>/dev/null || echo unknown` +! +! /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +! /bin/uname -X = `(/bin/uname -X) 2>/dev/null` +! +! hostinfo = `(hostinfo) 2>/dev/null` +! /bin/universe = `(/bin/universe) 2>/dev/null` +! /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +! /bin/arch = `(/bin/arch) 2>/dev/null` +! /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +! /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +! +! UNAME_MACHINE = "$UNAME_MACHINE" +! UNAME_RELEASE = "$UNAME_RELEASE" +! UNAME_SYSTEM = "$UNAME_SYSTEM" +! UNAME_VERSION = "$UNAME_VERSION" +! EOF + fi + ++ exit 1 + + # Local variables: +! # eval: (add-hook 'before-save-hook 'time-stamp) +! # time-stamp-start: "timestamp='" +! # time-stamp-format: "%:y-%02m-%02d" +! # time-stamp-end: "'" + # End: +diff -crB gmp-6.3.0-orig/config.in gmp-6.3.0/config.in +*** gmp-6.3.0-orig/config.in 2023-07-29 16:42:22.000000000 +0300 +--- gmp-6.3.0/config.in 2025-08-28 16:19:50.694484472 +0300 +*************** +*** 38,44 **** + */ + #undef GMP_MPARAM_H_SUGGEST + +! /* Define to 1 if you have the `alarm' function. */ + #undef HAVE_ALARM + + /* Define to 1 if alloca() works (via gmp-impl.h). */ +--- 38,44 ---- + */ + #undef GMP_MPARAM_H_SUGGEST + +! /* Define to 1 if you have the 'alarm' function. */ + #undef HAVE_ALARM + + /* Define to 1 if alloca() works (via gmp-impl.h). */ +*************** +*** 61,107 **** + /* Define to 1 if the compiler accepts gcc style __attribute__ ((noreturn)) */ + #undef HAVE_ATTRIBUTE_NORETURN + +! /* Define to 1 if you have the `attr_get' function. */ + #undef HAVE_ATTR_GET + + /* Define to 1 if tests/libtests has calling conventions checking for the CPU + */ + #undef HAVE_CALLING_CONVENTIONS + +! /* Define to 1 if you have the `clock' function. */ + #undef HAVE_CLOCK + + /* Define to 1 if you have the `clock_gettime' function */ + #undef HAVE_CLOCK_GETTIME + +! /* Define to 1 if you have the `cputime' function. */ + #undef HAVE_CPUTIME + +! /* Define to 1 if you have the declaration of `fgetc', and to 0 if you don't. + */ + #undef HAVE_DECL_FGETC + +! /* Define to 1 if you have the declaration of `fscanf', and to 0 if you don't. + */ + #undef HAVE_DECL_FSCANF + +! /* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. + */ + #undef HAVE_DECL_OPTARG + +! /* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you + don't. */ + #undef HAVE_DECL_SYS_ERRLIST + +! /* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you + don't. */ + #undef HAVE_DECL_SYS_NERR + +! /* Define to 1 if you have the declaration of `ungetc', and to 0 if you don't. + */ + #undef HAVE_DECL_UNGETC + +! /* Define to 1 if you have the declaration of `vfprintf', and to 0 if you + don't. */ + #undef HAVE_DECL_VFPRINTF + +--- 61,107 ---- + /* Define to 1 if the compiler accepts gcc style __attribute__ ((noreturn)) */ + #undef HAVE_ATTRIBUTE_NORETURN + +! /* Define to 1 if you have the 'attr_get' function. */ + #undef HAVE_ATTR_GET + + /* Define to 1 if tests/libtests has calling conventions checking for the CPU + */ + #undef HAVE_CALLING_CONVENTIONS + +! /* Define to 1 if you have the 'clock' function. */ + #undef HAVE_CLOCK + + /* Define to 1 if you have the `clock_gettime' function */ + #undef HAVE_CLOCK_GETTIME + +! /* Define to 1 if you have the 'cputime' function. */ + #undef HAVE_CPUTIME + +! /* Define to 1 if you have the declaration of 'fgetc', and to 0 if you don't. + */ + #undef HAVE_DECL_FGETC + +! /* Define to 1 if you have the declaration of 'fscanf', and to 0 if you don't. + */ + #undef HAVE_DECL_FSCANF + +! /* Define to 1 if you have the declaration of 'optarg', and to 0 if you don't. + */ + #undef HAVE_DECL_OPTARG + +! /* Define to 1 if you have the declaration of 'sys_errlist', and to 0 if you + don't. */ + #undef HAVE_DECL_SYS_ERRLIST + +! /* Define to 1 if you have the declaration of 'sys_nerr', and to 0 if you + don't. */ + #undef HAVE_DECL_SYS_NERR + +! /* Define to 1 if you have the declaration of 'ungetc', and to 0 if you don't. + */ + #undef HAVE_DECL_UNGETC + +! /* Define to 1 if you have the declaration of 'vfprintf', and to 0 if you + don't. */ + #undef HAVE_DECL_VFPRINTF + +*************** +*** 126,141 **** + /* Define to 1 if you have the header file. */ + #undef HAVE_FLOAT_H + +! /* Define to 1 if you have the `getpagesize' function. */ + #undef HAVE_GETPAGESIZE + +! /* Define to 1 if you have the `getrusage' function. */ + #undef HAVE_GETRUSAGE + +! /* Define to 1 if you have the `getsysinfo' function. */ + #undef HAVE_GETSYSINFO + +! /* Define to 1 if you have the `gettimeofday' function. */ + #undef HAVE_GETTIMEOFDAY + + /* Define to 1 if the compiler accepts gcc style __attribute__ ((visibility)) +--- 126,141 ---- + /* Define to 1 if you have the header file. */ + #undef HAVE_FLOAT_H + +! /* Define to 1 if you have the 'getpagesize' function. */ + #undef HAVE_GETPAGESIZE + +! /* Define to 1 if you have the 'getrusage' function. */ + #undef HAVE_GETRUSAGE + +! /* Define to 1 if you have the 'getsysinfo' function. */ + #undef HAVE_GETSYSINFO + +! /* Define to 1 if you have the 'gettimeofday' function. */ + #undef HAVE_GETTIMEOFDAY + + /* Define to 1 if the compiler accepts gcc style __attribute__ ((visibility)) +*************** +*** 208,217 **** + /* Define to 1 iff we have a s390 with 64-bit registers. */ + #undef HAVE_HOST_CPU_s390_zarch + +! /* Define to 1 if the system has the type `intmax_t'. */ + #undef HAVE_INTMAX_T + +! /* Define to 1 if the system has the type `intptr_t'. */ + #undef HAVE_INTPTR_T + + /* Define to 1 if you have the header file. */ +--- 208,217 ---- + /* Define to 1 iff we have a s390 with 64-bit registers. */ + #undef HAVE_HOST_CPU_s390_zarch + +! /* Define to 1 if the system has the type 'intmax_t'. */ + #undef HAVE_INTMAX_T + +! /* Define to 1 if the system has the type 'intptr_t'. */ + #undef HAVE_INTPTR_T + + /* Define to 1 if you have the header file. */ +*************** +*** 229,259 **** + #undef HAVE_LIMB_BIG_ENDIAN + #undef HAVE_LIMB_LITTLE_ENDIAN + +! /* Define to 1 if you have the `localeconv' function. */ + #undef HAVE_LOCALECONV + + /* Define to 1 if you have the header file. */ + #undef HAVE_LOCALE_H + +! /* Define to 1 if the system has the type `long double'. */ + #undef HAVE_LONG_DOUBLE + +! /* Define to 1 if the system has the type `long long'. */ + #undef HAVE_LONG_LONG + + /* Define to 1 if you have the header file. */ + #undef HAVE_MACHINE_HAL_SYSINFO_H + +! /* Define to 1 if you have the header file. */ +! #undef HAVE_MEMORY_H +! +! /* Define to 1 if you have the `memset' function. */ + #undef HAVE_MEMSET + +! /* Define to 1 if you have the `mmap' function. */ + #undef HAVE_MMAP + +! /* Define to 1 if you have the `mprotect' function. */ + #undef HAVE_MPROTECT + + /* Define to 1 each of the following for which a native (ie. CPU specific) +--- 229,256 ---- + #undef HAVE_LIMB_BIG_ENDIAN + #undef HAVE_LIMB_LITTLE_ENDIAN + +! /* Define to 1 if you have the 'localeconv' function. */ + #undef HAVE_LOCALECONV + + /* Define to 1 if you have the header file. */ + #undef HAVE_LOCALE_H + +! /* Define to 1 if the system has the type 'long double'. */ + #undef HAVE_LONG_DOUBLE + +! /* Define to 1 if the system has the type 'long long'. */ + #undef HAVE_LONG_LONG + + /* Define to 1 if you have the header file. */ + #undef HAVE_MACHINE_HAL_SYSINFO_H + +! /* Define to 1 if you have the 'memset' function. */ + #undef HAVE_MEMSET + +! /* Define to 1 if you have the 'mmap' function. */ + #undef HAVE_MMAP + +! /* Define to 1 if you have the 'mprotect' function. */ + #undef HAVE_MPROTECT + + /* Define to 1 each of the following for which a native (ie. CPU specific) +*************** +*** 378,424 **** + #undef HAVE_NATIVE_mpn_xor_n + #undef HAVE_NATIVE_mpn_xnor_n + +! /* Define to 1 if you have the `nl_langinfo' function. */ + #undef HAVE_NL_LANGINFO + + /* Define to 1 if you have the header file. */ + #undef HAVE_NL_TYPES_H + +! /* Define to 1 if you have the `obstack_vprintf' function. */ +! #undef HAVE_OBSTACK_VPRINTF +! +! /* Define to 1 if you have the `popen' function. */ + #undef HAVE_POPEN + +! /* Define to 1 if you have the `processor_info' function. */ + #undef HAVE_PROCESSOR_INFO + + /* Define to 1 if `struct pst_processor' exists and contains + `psp_iticksperclktick'. */ + #undef HAVE_PSP_ITICKSPERCLKTICK + +! /* Define to 1 if you have the `pstat_getprocessor' function. */ + #undef HAVE_PSTAT_GETPROCESSOR + +! /* Define to 1 if the system has the type `ptrdiff_t'. */ + #undef HAVE_PTRDIFF_T + +! /* Define to 1 if the system has the type `quad_t'. */ + #undef HAVE_QUAD_T + +! /* Define to 1 if you have the `raise' function. */ + #undef HAVE_RAISE + +! /* Define to 1 if you have the `read_real_time' function. */ + #undef HAVE_READ_REAL_TIME + +! /* Define to 1 if you have the `sigaction' function. */ + #undef HAVE_SIGACTION + +! /* Define to 1 if you have the `sigaltstack' function. */ + #undef HAVE_SIGALTSTACK + +! /* Define to 1 if you have the `sigstack' function. */ + #undef HAVE_SIGSTACK + + /* Tune directory speed_cyclecounter, undef=none, 1=32bits, 2=64bits) */ +--- 375,418 ---- + #undef HAVE_NATIVE_mpn_xor_n + #undef HAVE_NATIVE_mpn_xnor_n + +! /* Define to 1 if you have the 'nl_langinfo' function. */ + #undef HAVE_NL_LANGINFO + + /* Define to 1 if you have the header file. */ + #undef HAVE_NL_TYPES_H + +! /* Define to 1 if you have the 'popen' function. */ + #undef HAVE_POPEN + +! /* Define to 1 if you have the 'processor_info' function. */ + #undef HAVE_PROCESSOR_INFO + + /* Define to 1 if `struct pst_processor' exists and contains + `psp_iticksperclktick'. */ + #undef HAVE_PSP_ITICKSPERCLKTICK + +! /* Define to 1 if you have the 'pstat_getprocessor' function. */ + #undef HAVE_PSTAT_GETPROCESSOR + +! /* Define to 1 if the system has the type 'ptrdiff_t'. */ + #undef HAVE_PTRDIFF_T + +! /* Define to 1 if the system has the type 'quad_t'. */ + #undef HAVE_QUAD_T + +! /* Define to 1 if you have the 'raise' function. */ + #undef HAVE_RAISE + +! /* Define to 1 if you have the 'read_real_time' function. */ + #undef HAVE_READ_REAL_TIME + +! /* Define to 1 if you have the 'sigaction' function. */ + #undef HAVE_SIGACTION + +! /* Define to 1 if you have the 'sigaltstack' function. */ + #undef HAVE_SIGALTSTACK + +! /* Define to 1 if you have the 'sigstack' function. */ + #undef HAVE_SIGSTACK + + /* Tune directory speed_cyclecounter, undef=none, 1=32bits, 2=64bits) */ +*************** +*** 427,448 **** + /* Define to 1 if you have the header file. */ + #undef HAVE_SSTREAM + +! /* Define to 1 if the system has the type `stack_t'. */ + #undef HAVE_STACK_T + + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H + + /* Define to 1 if you have the header file. */ + #undef HAVE_STDLIB_H + +! /* Define to 1 if the system has the type `std::locale'. */ + #undef HAVE_STD__LOCALE + +! /* Define to 1 if you have the `strchr' function. */ + #undef HAVE_STRCHR + +! /* Define to 1 if you have the `strerror' function. */ + #undef HAVE_STRERROR + + /* Define to 1 if you have the header file. */ +--- 421,445 ---- + /* Define to 1 if you have the header file. */ + #undef HAVE_SSTREAM + +! /* Define to 1 if the system has the type 'stack_t'. */ + #undef HAVE_STACK_T + + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H + ++ /* Define to 1 if you have the header file. */ ++ #undef HAVE_STDIO_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_STDLIB_H + +! /* Define to 1 if the system has the type 'std::locale'. */ + #undef HAVE_STD__LOCALE + +! /* Define to 1 if you have the 'strchr' function. */ + #undef HAVE_STRCHR + +! /* Define to 1 if you have the 'strerror' function. */ + #undef HAVE_STRERROR + + /* Define to 1 if you have the header file. */ +*************** +*** 451,475 **** + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H + +! /* Define to 1 if you have the `strnlen' function. */ + #undef HAVE_STRNLEN + +! /* Define to 1 if you have the `strtol' function. */ + #undef HAVE_STRTOL + +! /* Define to 1 if you have the `strtoul' function. */ + #undef HAVE_STRTOUL + +! /* Define to 1 if you have the `sysconf' function. */ + #undef HAVE_SYSCONF + +! /* Define to 1 if you have the `sysctl' function. */ + #undef HAVE_SYSCTL + +! /* Define to 1 if you have the `sysctlbyname' function. */ + #undef HAVE_SYSCTLBYNAME + +! /* Define to 1 if you have the `syssgi' function. */ + #undef HAVE_SYSSGI + + /* Define to 1 if you have the header file. */ +--- 448,472 ---- + /* Define to 1 if you have the header file. */ + #undef HAVE_STRING_H + +! /* Define to 1 if you have the 'strnlen' function. */ + #undef HAVE_STRNLEN + +! /* Define to 1 if you have the 'strtol' function. */ + #undef HAVE_STRTOL + +! /* Define to 1 if you have the 'strtoul' function. */ + #undef HAVE_STRTOUL + +! /* Define to 1 if you have the 'sysconf' function. */ + #undef HAVE_SYSCONF + +! /* Define to 1 if you have the 'sysctl' function. */ + #undef HAVE_SYSCTL + +! /* Define to 1 if you have the 'sysctlbyname' function. */ + #undef HAVE_SYSCTLBYNAME + +! /* Define to 1 if you have the 'syssgi' function. */ + #undef HAVE_SYSSGI + + /* Define to 1 if you have the header file. */ +*************** +*** 517,526 **** + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TYPES_H + +! /* Define to 1 if you have the `times' function. */ + #undef HAVE_TIMES + +! /* Define to 1 if the system has the type `uint_least32_t'. */ + #undef HAVE_UINT_LEAST32_T + + /* Define to 1 if you have the header file. */ +--- 514,523 ---- + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TYPES_H + +! /* Define to 1 if you have the 'times' function. */ + #undef HAVE_TIMES + +! /* Define to 1 if the system has the type 'uint_least32_t'. */ + #undef HAVE_UINT_LEAST32_T + + /* Define to 1 if you have the header file. */ +*************** +*** 562,592 **** + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +! /* Define as the return type of signal handlers (`int' or `void'). */ + #undef RETSIGTYPE + +! /* The size of `mp_limb_t', as computed by sizeof. */ + #undef SIZEOF_MP_LIMB_T + +! /* The size of `unsigned', as computed by sizeof. */ + #undef SIZEOF_UNSIGNED + +! /* The size of `unsigned long', as computed by sizeof. */ + #undef SIZEOF_UNSIGNED_LONG + +! /* The size of `unsigned short', as computed by sizeof. */ + #undef SIZEOF_UNSIGNED_SHORT + +! /* The size of `void *', as computed by sizeof. */ + #undef SIZEOF_VOID_P + + /* Define to 1 if sscanf requires writable inputs */ + #undef SSCANF_WRITABLE_INPUT + +! /* Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + +! /* Define to 1 if you can safely include both and . */ + #undef TIME_WITH_SYS_TIME + + /* Maximum size the tune program can test for SQR_TOOM2_THRESHOLD */ +--- 559,592 ---- + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +! /* Define as the return type of signal handlers ('int' or 'void'). */ + #undef RETSIGTYPE + +! /* The size of 'mp_limb_t', as computed by sizeof. */ + #undef SIZEOF_MP_LIMB_T + +! /* The size of 'unsigned', as computed by sizeof. */ + #undef SIZEOF_UNSIGNED + +! /* The size of 'unsigned long', as computed by sizeof. */ + #undef SIZEOF_UNSIGNED_LONG + +! /* The size of 'unsigned short', as computed by sizeof. */ + #undef SIZEOF_UNSIGNED_SHORT + +! /* The size of 'void *', as computed by sizeof. */ + #undef SIZEOF_VOID_P + + /* Define to 1 if sscanf requires writable inputs */ + #undef SSCANF_WRITABLE_INPUT + +! /* Define to 1 if all of the C89 standard headers exist (not just the ones +! required in a freestanding environment). This macro is provided for +! backward compatibility; new code need not use it. */ + #undef STDC_HEADERS + +! /* Define to 1 if you can safely include both and . This +! macro is obsolete. */ + #undef TIME_WITH_SYS_TIME + + /* Maximum size the tune program can test for SQR_TOOM2_THRESHOLD */ +*************** +*** 642,652 **** + /* Define to 1 if the assembler understands the mulx instruction */ + #undef X86_ASM_MULX + +! /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a +! `char[]'. */ + #undef YYTEXT_POINTER + +! /* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ + #ifndef __cplusplus + #undef inline +--- 642,652 ---- + /* Define to 1 if the assembler understands the mulx instruction */ + #undef X86_ASM_MULX + +! /* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a +! 'char[]'. */ + #undef YYTEXT_POINTER + +! /* Define to '__inline__' or '__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ + #ifndef __cplusplus + #undef inline +*************** +*** 654,671 **** + + /* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is +! supported directly. */ + #undef restrict +! /* Work around a bug in Sun C++: it does not support _Restrict or +! __restrict__, even though the corresponding Sun C compiler ends up with +! "#define restrict _Restrict" or "#define restrict __restrict__" in the +! previous line. Perhaps some future version of Sun C++ will work with +! restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ +! #if defined __SUNPRO_CC && !defined __RESTRICT + # define _Restrict + # define __restrict__ + #endif + +! /* Define to empty if the keyword `volatile' does not work. Warning: valid +! code using `volatile' can become incorrect without. Disable with care. */ + #undef volatile +--- 654,672 ---- + + /* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is +! supported only directly. */ + #undef restrict +! /* Work around a bug in older versions of Sun C++, which did not +! #define __restrict__ or support _Restrict or __restrict__ +! even though the corresponding Sun C compiler ended up with +! "#define restrict _Restrict" or "#define restrict __restrict__" +! in the previous line. This workaround can be removed once +! we assume Oracle Developer Studio 12.5 (2016) or later. */ +! #if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ + # define _Restrict + # define __restrict__ + #endif + +! /* Define to empty if the keyword 'volatile' does not work. Warning: valid +! code using 'volatile' can become incorrect without. Disable with care. */ + #undef volatile +Only in gmp-6.3.0: config.in~ +diff -crB gmp-6.3.0-orig/config.sub gmp-6.3.0/config.sub +*** gmp-6.3.0-orig/config.sub 2023-07-29 16:42:16.000000000 +0300 +--- gmp-6.3.0/config.sub 2025-08-28 16:20:02.118778947 +0300 +*************** +*** 1,165 **** + #! /bin/sh +! # +! # GMP config.sub wrapper. + + +! # Copyright 2000-2003, 2006, 2009-2016 Free Software Foundation, Inc. +! # +! # This file is part of the GNU MP Library. +! # +! # The GNU MP Library is free software; you can redistribute it and/or modify +! # it under the terms of either: +! # +! # * the GNU Lesser General Public License as published by the Free +! # Software Foundation; either version 3 of the License, or (at your +! # option) any later version. +! # +! # or +! # +! # * the GNU General Public License as published by the Free Software +! # Foundation; either version 2 of the License, or (at your option) any +! # later version. + # +! # or both in parallel, as here. + # +! # The GNU MP Library is distributed in the hope that it will be useful, but +! # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +! # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +! # for more details. + # +! # You should have received copies of the GNU General Public License and the +! # GNU Lesser General Public License along with the GNU MP Library. If not, +! # see https://www.gnu.org/licenses/. + + +! # Usage: config.sub CPU-VENDOR-OS +! # config.sub ALIAS +! # +! # Validate and canonicalize the given configuration name, with special +! # handling for GMP extra CPU names. +! # +! # When the CPU isn't special the whole name is simply passed straight +! # through to configfsf.sub. +! # +! # When the CPU is a GMP extra, configfsf.sub is run on a similar CPU that it +! # will recognise. For example "athlon-pc-freebsd3.5" is validated using +! # "i386-pc-freebsd3.5". + # +! # Any canonicalizations made by configfsf.sub are preserved. For example +! # given "athlon-linux", configfsf.sub is called with "i386-linux" and will +! # give back "i386-pc-linux-gnu". "athlon" is then reinstated, so we print +! # "athlon-pc-linux-gnu". + + +! # Expect to find configfsf.sub in the same directory as this config.sub +! configfsf_sub="`echo \"$0\" | sed 's/config.sub$/configfsf.sub/'`" +! if test "$configfsf_sub" = "$0"; then +! echo "Cannot derive configfsf.sub from $0" 1>&2 +! exit 1 +! fi +! if test -f "$configfsf_sub"; then +! : +! else +! echo "$configfsf_sub not found" 1>&2 +! exit 1 +! fi + +! # Always run configfsf.sub with $SHELL, like autoconf does for config.sub +! SHELL=${CONFIG_SHELL-/bin/sh} + +- # Identify ourselves on --version, --help, etc +- case "$1" in +- "" | -*) +- echo "(GNU MP wrapped config.sub)" 1>&2 +- $SHELL $configfsf_sub "$@" +- exit +- ;; +- esac +- +- given_full="$1" +- given_cpu=`echo "$given_full" | sed 's/-.*$//'` +- given_rest=`echo "$given_full" | sed 's/^[^-]*//'` +- +- +- # Aliases for GMP extras +- case "$given_cpu" in +- # configfsf.sub turns p5 into i586, instead use our exact cpu type +- p5 | p54) given_cpu=pentium ;; +- p55) given_cpu=pentiummmx ;; +- +- # configfsf.sub turns p6, pentiumii and pentiumiii into i686, instead use +- # our exact cpu types +- p6) given_cpu=pentiumpro ;; +- pentiumii) given_cpu=pentium2 ;; +- pentiumiii) given_cpu=pentium3 ;; +- esac +- given_full="$given_cpu$given_rest" +- +- +- # GMP extras and what to use for the config.sub test +- case "$given_cpu" in +- itanium | itanium2) +- test_cpu=ia64 ;; +- pentium | pentiummmx | pentiumpro | pentium[234m] | k[567] | k6[23] | geode | athlon | viac3*) +- test_cpu=i386 ;; +- athlon64 | atom | silvermont | goldmont | tremont | core2 | corei* | opteron | k[89] | k10 | bobcat | jaguar* | bulldozer* | piledriver* | steamroller* | excavator* | zen* | nano | nehalem | westmere | sandybridge* | ivybridge* | haswell* | broadwell* | skylake* | kabylake* | icelake* | rocketlake* | tigerlake* | alderlake* | raptorlake* | knightslanding) +- test_cpu=x86_64 ;; +- power[2-9] | power1[0-9] | power2sc) +- test_cpu=power ;; +- powerpc401 | powerpc403 | powerpc405 | \ +- powerpc505 | \ +- powerpc601 | powerpc602 | \ +- powerpc603 | powerpc603e | \ +- powerpc604 | powerpc604e | \ +- powerpc620 | powerpc630 | powerpc970 | \ +- powerpc740 | powerpc74[0-9][0-9] | powerpc750 | \ +- powerpc801 | powerpc821 | powerpc823 | powerpc860 | \ +- powerpc64) +- test_cpu=powerpc ;; +- sparcv8 | supersparc | microsparc | \ +- ultrasparc | ultrasparc2 | ultrasparc2i | ultrasparc3 | ultrasparct[12345]) +- test_cpu=sparc ;; +- sh2) +- test_cpu=sh ;; +- +- z900 | z990 | z9 | z1[0-6] | z196) +- test_cpu=s390x;; +- z900esa | z990esa | z9esa | z1[0-6]esa | z196esa) +- test_cpu=s390;; +- +- armsa1 | armxscale | arm9tdmi | arm9te | \ +- arm10* | arm11mpcore | armsa1 | arm1136 | arm1156 | arm1176 | \ +- armcortex[arm][0-9] | armcortex[arm][0-9][0-9] | \ +- arm*neon | armxgene1 | armexynosm1 | armthunderx | applem[1-9]) +- test_cpu="arm";; +- +- *) +- # Don't need or want to change the given name, just run configfsf.sub +- $SHELL $configfsf_sub "$given_full" +- if test $? = 0; then +- exit 0 +- else +- echo "(GNU MP wrapped config.sub, testing \"$given_full\")" +- exit 1 +- fi +- esac +- +- +- test_full="$test_cpu$given_rest" +- canonical_full=`$SHELL $configfsf_sub "$test_full"` +- if test $? = 0; then +- : + else +! echo "(GNU MP wrapped config.sub, testing \"$given_full\" as \"$test_full\")" +! exit 1 + fi + +! canonical_rest=`echo "$canonical_full" | sed 's/^[^-]*//'` +! echo "$given_cpu$canonical_rest" +! exit 0 + + + + # Local variables: +! # fill-column: 76 + # End: +--- 1,2355 ---- + #! /bin/sh +! # Configuration validation subroutine script. +! # Copyright 1992-2024 Free Software Foundation, Inc. + ++ # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale + +! timestamp='2024-05-27' +! +! # This file is free software; you can redistribute it and/or modify it +! # under the terms of the GNU General Public License as published by +! # the Free Software Foundation, either version 3 of the License, or +! # (at your option) any later version. + # +! # This program is distributed in the hope that it will be useful, but +! # WITHOUT ANY WARRANTY; without even the implied warranty of +! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +! # General Public License for more details. + # +! # You should have received a copy of the GNU General Public License +! # along with this program; if not, see . + # +! # As a special exception to the GNU General Public License, if you +! # distribute this file as part of a program that contains a +! # configuration script generated by Autoconf, you may include it under +! # the same distribution terms that you use for the rest of that +! # program. This Exception is an additional permission under section 7 +! # of the GNU General Public License, version 3 ("GPLv3"). + + +! # Please send patches to . + # +! # Configuration subroutine to validate and canonicalize a configuration type. +! # Supply the specified configuration type as an argument. +! # If it is invalid, we print an error message on stderr and exit with code 1. +! # Otherwise, we print the canonical config type on stdout and succeed. +! +! # You can get the latest version of this script from: +! # https://git.savannah.gnu.org/cgit/config.git/plain/config.sub +! +! # This file is supposed to be the same for all GNU packages +! # and recognize all the CPU types, system types and aliases +! # that are meaningful with *any* GNU software. +! # Each package is responsible for reporting which valid configurations +! # it does not support. The user should be able to distinguish +! # a failure to support a valid configuration from a meaningless +! # configuration. +! +! # The goal of this file is to map all the various variations of a given +! # machine specification into a single specification in the form: +! # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +! # or in some cases, the newer four-part form: +! # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +! # It is wrong to echo any other type of specification. +! +! # The "shellcheck disable" line above the timestamp inhibits complaints +! # about features and limitations of the classic Bourne shell that were +! # superseded or lifted in POSIX. However, this script identifies a wide +! # variety of pre-POSIX systems that do not have POSIX shells at all, and +! # even some reasonably current systems (Solaris 10 as case-in-point) still +! # have a pre-POSIX /bin/sh. +! +! me=`echo "$0" | sed -e 's,.*/,,'` +! +! usage="\ +! Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS +! +! Canonicalize a configuration name. +! +! Options: +! -h, --help print this help, then exit +! -t, --time-stamp print date of last modification, then exit +! -v, --version print version number, then exit +! +! Report bugs and patches to ." +! +! version="\ +! GNU config.sub ($timestamp) +! +! Copyright 1992-2024 Free Software Foundation, Inc. +! +! This is free software; see the source for copying conditions. There is NO +! warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +! +! help=" +! Try '$me --help' for more information." +! +! # Parse command line +! while test $# -gt 0 ; do +! case $1 in +! --time-stamp | --time* | -t ) +! echo "$timestamp" ; exit ;; +! --version | -v ) +! echo "$version" ; exit ;; +! --help | --h* | -h ) +! echo "$usage"; exit ;; +! -- ) # Stop option processing +! shift; break ;; +! - ) # Use stdin as input. +! break ;; +! -* ) +! echo "$me: invalid option $1$help" >&2 +! exit 1 ;; +! +! *local*) +! # First pass through any local machine types. +! echo "$1" +! exit ;; +! +! * ) +! break ;; +! esac +! done +! +! case $# in +! 0) echo "$me: missing argument$help" >&2 +! exit 1;; +! 1) ;; +! *) echo "$me: too many arguments$help" >&2 +! exit 1;; +! esac + ++ # Split fields of configuration type ++ saved_IFS=$IFS ++ IFS="-" read field1 field2 field3 field4 <&2 ++ exit 1 ++ ;; ++ *-*-*-*) ++ basic_machine=$field1-$field2 ++ basic_os=$field3-$field4 ++ ;; ++ *-*-*) ++ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two ++ # parts ++ maybe_os=$field2-$field3 ++ case $maybe_os in ++ cloudabi*-eabi* \ ++ | kfreebsd*-gnu* \ ++ | knetbsd*-gnu* \ ++ | kopensolaris*-gnu* \ ++ | linux-* \ ++ | managarm-* \ ++ | netbsd*-eabi* \ ++ | netbsd*-gnu* \ ++ | nto-qnx* \ ++ | os2-emx* \ ++ | rtmk-nova* \ ++ | storm-chaos* \ ++ | uclinux-gnu* \ ++ | uclinux-uclibc* \ ++ | windows-* ) ++ basic_machine=$field1 ++ basic_os=$maybe_os ++ ;; ++ android-linux) ++ basic_machine=$field1-unknown ++ basic_os=linux-android ++ ;; ++ *) ++ basic_machine=$field1-$field2 ++ basic_os=$field3 ++ ;; ++ esac ++ ;; ++ *-*) ++ case $field1-$field2 in ++ # Shorthands that happen to contain a single dash ++ convex-c[12] | convex-c3[248]) ++ basic_machine=$field2-convex ++ basic_os= ++ ;; ++ decstation-3100) ++ basic_machine=mips-dec ++ basic_os= ++ ;; ++ *-*) ++ # Second component is usually, but not always the OS ++ case $field2 in ++ # Do not treat sunos as a manufacturer ++ sun*os*) ++ basic_machine=$field1 ++ basic_os=$field2 ++ ;; ++ # Manufacturers ++ 3100* \ ++ | 32* \ ++ | 3300* \ ++ | 3600* \ ++ | 7300* \ ++ | acorn \ ++ | altos* \ ++ | apollo \ ++ | apple \ ++ | atari \ ++ | att* \ ++ | axis \ ++ | be \ ++ | bull \ ++ | cbm \ ++ | ccur \ ++ | cisco \ ++ | commodore \ ++ | convergent* \ ++ | convex* \ ++ | cray \ ++ | crds \ ++ | dec* \ ++ | delta* \ ++ | dg \ ++ | digital \ ++ | dolphin \ ++ | encore* \ ++ | gould \ ++ | harris \ ++ | highlevel \ ++ | hitachi* \ ++ | hp \ ++ | ibm* \ ++ | intergraph \ ++ | isi* \ ++ | knuth \ ++ | masscomp \ ++ | microblaze* \ ++ | mips* \ ++ | motorola* \ ++ | ncr* \ ++ | news \ ++ | next \ ++ | ns \ ++ | oki \ ++ | omron* \ ++ | pc533* \ ++ | rebel \ ++ | rom68k \ ++ | rombug \ ++ | semi \ ++ | sequent* \ ++ | siemens \ ++ | sgi* \ ++ | siemens \ ++ | sim \ ++ | sni \ ++ | sony* \ ++ | stratus \ ++ | sun \ ++ | sun[234]* \ ++ | tektronix \ ++ | tti* \ ++ | ultra \ ++ | unicom* \ ++ | wec \ ++ | winbond \ ++ | wrs) ++ basic_machine=$field1-$field2 ++ basic_os= ++ ;; ++ zephyr*) ++ basic_machine=$field1-unknown ++ basic_os=$field2 ++ ;; ++ *) ++ basic_machine=$field1 ++ basic_os=$field2 ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ *) ++ # Convert single-component short-hands not valid as part of ++ # multi-component configurations. ++ case $field1 in ++ 386bsd) ++ basic_machine=i386-pc ++ basic_os=bsd ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ basic_os=udi ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ basic_os=scout ++ ;; ++ alliant) ++ basic_machine=fx80-alliant ++ basic_os= ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ basic_os= ++ ;; ++ am29k) ++ basic_machine=a29k-none ++ basic_os=bsd ++ ;; ++ amdahl) ++ basic_machine=580-amdahl ++ basic_os=sysv ++ ;; ++ amiga) ++ basic_machine=m68k-unknown ++ basic_os= ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ basic_os=amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ basic_os=sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ basic_os=sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ basic_os=bsd ++ ;; ++ aros) ++ basic_machine=i386-pc ++ basic_os=aros ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ basic_os=aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ basic_os=dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ basic_os=linux ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ basic_os=cegcc ++ ;; ++ cray) ++ basic_machine=j90-cray ++ basic_os=unicos ++ ;; ++ crds | unos) ++ basic_machine=m68k-crds ++ basic_os= ++ ;; ++ da30) ++ basic_machine=m68k-da30 ++ basic_os= ++ ;; ++ decstation | pmax | pmin | dec3100 | decstatn) ++ basic_machine=mips-dec ++ basic_os= ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ basic_os=sysv3 ++ ;; ++ dicos) ++ basic_machine=i686-pc ++ basic_os=dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ basic_os=msdosdjgpp ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ basic_os=ebmon ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ basic_os=ose ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ basic_os=sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ basic_os=go32 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ basic_os=hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ basic_os=xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ basic_os=hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ basic_os=sysv3 ++ ;; ++ hp300 | hp300hpux) ++ basic_machine=m68k-hp ++ basic_os=hpux ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ basic_os=bsd ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ basic_os=osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ basic_os=proelf ++ ;; ++ i386mach) ++ basic_machine=i386-mach ++ basic_os=mach ++ ;; ++ isi68 | isi) ++ basic_machine=m68k-isi ++ basic_os=sysv ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ basic_os=linux ++ ;; ++ magnum | m3230) ++ basic_machine=mips-mips ++ basic_os=sysv ++ ;; ++ merlin) ++ basic_machine=ns32k-utek ++ basic_os=sysv ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ basic_os=mingw64 ++ ;; ++ mingw32) ++ basic_machine=i686-pc ++ basic_os=mingw32 ++ ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ basic_os=mingw32ce ++ ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ basic_os=coff ++ ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ basic_os=morphos ++ ;; ++ moxiebox) ++ basic_machine=moxie-unknown ++ basic_os=moxiebox ++ ;; ++ msdos) ++ basic_machine=i386-pc ++ basic_os=msdos ++ ;; ++ msys) ++ basic_machine=i686-pc ++ basic_os=msys ++ ;; ++ mvs) ++ basic_machine=i370-ibm ++ basic_os=mvs ++ ;; ++ nacl) ++ basic_machine=le32-unknown ++ basic_os=nacl ++ ;; ++ ncr3000) ++ basic_machine=i486-ncr ++ basic_os=sysv4 ++ ;; ++ netbsd386) ++ basic_machine=i386-pc ++ basic_os=netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ basic_os=linux ++ ;; ++ news | news700 | news800 | news900) ++ basic_machine=m68k-sony ++ basic_os=newsos ++ ;; ++ news1000) ++ basic_machine=m68030-sony ++ basic_os=newsos ++ ;; ++ necv70) ++ basic_machine=v70-nec ++ basic_os=sysv ++ ;; ++ nh3000) ++ basic_machine=m68k-harris ++ basic_os=cxux ++ ;; ++ nh[45]000) ++ basic_machine=m88k-harris ++ basic_os=cxux ++ ;; ++ nindy960) ++ basic_machine=i960-intel ++ basic_os=nindy ++ ;; ++ mon960) ++ basic_machine=i960-intel ++ basic_os=mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ basic_os=nonstopux ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ basic_os=os400 ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ basic_os=ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ basic_os=os68k ++ ;; ++ paragon) ++ basic_machine=i860-intel ++ basic_os=osf ++ ;; ++ parisc) ++ basic_machine=hppa-unknown ++ basic_os=linux ++ ;; ++ psp) ++ basic_machine=mipsallegrexel-sony ++ basic_os=psp ++ ;; ++ pw32) ++ basic_machine=i586-unknown ++ basic_os=pw32 ++ ;; ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ basic_os=rdos ++ ;; ++ rdos32) ++ basic_machine=i386-pc ++ basic_os=rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ basic_os=coff ++ ;; ++ sa29200) ++ basic_machine=a29k-amd ++ basic_os=udi ++ ;; ++ sei) ++ basic_machine=mips-sei ++ basic_os=seiux ++ ;; ++ sequent) ++ basic_machine=i386-sequent ++ basic_os= ++ ;; ++ sps7) ++ basic_machine=m68k-bull ++ basic_os=sysv2 ++ ;; ++ st2000) ++ basic_machine=m68k-tandem ++ basic_os= ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ basic_os=sysv4 ++ ;; ++ sun2) ++ basic_machine=m68000-sun ++ basic_os= ++ ;; ++ sun2os3) ++ basic_machine=m68000-sun ++ basic_os=sunos3 ++ ;; ++ sun2os4) ++ basic_machine=m68000-sun ++ basic_os=sunos4 ++ ;; ++ sun3) ++ basic_machine=m68k-sun ++ basic_os= ++ ;; ++ sun3os3) ++ basic_machine=m68k-sun ++ basic_os=sunos3 ++ ;; ++ sun3os4) ++ basic_machine=m68k-sun ++ basic_os=sunos4 ++ ;; ++ sun4) ++ basic_machine=sparc-sun ++ basic_os= ++ ;; ++ sun4os3) ++ basic_machine=sparc-sun ++ basic_os=sunos3 ++ ;; ++ sun4os4) ++ basic_machine=sparc-sun ++ basic_os=sunos4 ++ ;; ++ sun4sol2) ++ basic_machine=sparc-sun ++ basic_os=solaris2 ++ ;; ++ sun386 | sun386i | roadrunner) ++ basic_machine=i386-sun ++ basic_os= ++ ;; ++ sv1) ++ basic_machine=sv1-cray ++ basic_os=unicos ++ ;; ++ symmetry) ++ basic_machine=i386-sequent ++ basic_os=dynix ++ ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ basic_os=unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ basic_os=unicos ++ ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ basic_os=tops20 ++ ;; ++ tpf) ++ basic_machine=s390x-ibm ++ basic_os=tpf ++ ;; ++ udi29k) ++ basic_machine=a29k-amd ++ basic_os=udi ++ ;; ++ ultra3) ++ basic_machine=a29k-nyu ++ basic_os=sym1 ++ ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ basic_os=none ++ ;; ++ vaxv) ++ basic_machine=vax-dec ++ basic_os=sysv ++ ;; ++ vms) ++ basic_machine=vax-dec ++ basic_os=vms ++ ;; ++ vsta) ++ basic_machine=i386-pc ++ basic_os=vsta ++ ;; ++ vxworks960) ++ basic_machine=i960-wrs ++ basic_os=vxworks ++ ;; ++ vxworks68) ++ basic_machine=m68k-wrs ++ basic_os=vxworks ++ ;; ++ vxworks29k) ++ basic_machine=a29k-wrs ++ basic_os=vxworks ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ basic_os=mingw32 ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ basic_os=unicos ++ ;; ++ *) ++ basic_machine=$1 ++ basic_os= ++ ;; ++ esac ++ ;; ++ esac + +! # Decode 1-component or ad-hoc basic machines +! case $basic_machine in +! # Here we handle the default manufacturer of certain CPU types. It is in +! # some cases the only manufacturer, in others, it is the most popular. +! w89k) +! cpu=hppa1.1 +! vendor=winbond +! ;; +! op50n) +! cpu=hppa1.1 +! vendor=oki +! ;; +! op60c) +! cpu=hppa1.1 +! vendor=oki +! ;; +! ibm*) +! cpu=i370 +! vendor=ibm +! ;; +! orion105) +! cpu=clipper +! vendor=highlevel +! ;; +! mac | mpw | mac-mpw) +! cpu=m68k +! vendor=apple +! ;; +! pmac | pmac-mpw) +! cpu=powerpc +! vendor=apple +! ;; +! +! # Recognize the various machine names and aliases which stand +! # for a CPU type and a company and sometimes even an OS. +! 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) +! cpu=m68000 +! vendor=att +! ;; +! 3b*) +! cpu=we32k +! vendor=att +! ;; +! bluegene*) +! cpu=powerpc +! vendor=ibm +! basic_os=cnk +! ;; +! decsystem10* | dec10*) +! cpu=pdp10 +! vendor=dec +! basic_os=tops10 +! ;; +! decsystem20* | dec20*) +! cpu=pdp10 +! vendor=dec +! basic_os=tops20 +! ;; +! delta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300) +! cpu=m68k +! vendor=motorola +! ;; +! # This used to be dpx2*, but that gets the RS6000-based +! # DPX/20 and the x86-based DPX/2-100 wrong. See +! # https://oldskool.silicium.org/stations/bull_dpx20.htm +! # https://www.feb-patrimoine.com/english/bull_dpx2.htm +! # https://www.feb-patrimoine.com/english/unix_and_bull.htm +! dpx2 | dpx2[23]00 | dpx2[23]xx) +! cpu=m68k +! vendor=bull +! ;; +! dpx2100 | dpx21xx) +! cpu=i386 +! vendor=bull +! ;; +! dpx20) +! cpu=rs6000 +! vendor=bull +! ;; +! encore | umax | mmax) +! cpu=ns32k +! vendor=encore +! ;; +! elxsi) +! cpu=elxsi +! vendor=elxsi +! basic_os=${basic_os:-bsd} +! ;; +! fx2800) +! cpu=i860 +! vendor=alliant +! ;; +! genix) +! cpu=ns32k +! vendor=ns +! ;; +! h3050r* | hiux*) +! cpu=hppa1.1 +! vendor=hitachi +! basic_os=hiuxwe2 +! ;; +! hp3k9[0-9][0-9] | hp9[0-9][0-9]) +! cpu=hppa1.0 +! vendor=hp +! ;; +! hp9k2[0-9][0-9] | hp9k31[0-9]) +! cpu=m68000 +! vendor=hp +! ;; +! hp9k3[2-9][0-9]) +! cpu=m68k +! vendor=hp +! ;; +! hp9k6[0-9][0-9] | hp6[0-9][0-9]) +! cpu=hppa1.0 +! vendor=hp +! ;; +! hp9k7[0-79][0-9] | hp7[0-79][0-9]) +! cpu=hppa1.1 +! vendor=hp +! ;; +! hp9k78[0-9] | hp78[0-9]) +! # FIXME: really hppa2.0-hp +! cpu=hppa1.1 +! vendor=hp +! ;; +! hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) +! # FIXME: really hppa2.0-hp +! cpu=hppa1.1 +! vendor=hp +! ;; +! hp9k8[0-9][13679] | hp8[0-9][13679]) +! cpu=hppa1.1 +! vendor=hp +! ;; +! hp9k8[0-9][0-9] | hp8[0-9][0-9]) +! cpu=hppa1.0 +! vendor=hp +! ;; +! i*86v32) +! cpu=`echo "$1" | sed -e 's/86.*/86/'` +! vendor=pc +! basic_os=sysv32 +! ;; +! i*86v4*) +! cpu=`echo "$1" | sed -e 's/86.*/86/'` +! vendor=pc +! basic_os=sysv4 +! ;; +! i*86v) +! cpu=`echo "$1" | sed -e 's/86.*/86/'` +! vendor=pc +! basic_os=sysv +! ;; +! i*86sol2) +! cpu=`echo "$1" | sed -e 's/86.*/86/'` +! vendor=pc +! basic_os=solaris2 +! ;; +! j90 | j90-cray) +! cpu=j90 +! vendor=cray +! basic_os=${basic_os:-unicos} +! ;; +! iris | iris4d) +! cpu=mips +! vendor=sgi +! case $basic_os in +! irix*) +! ;; +! *) +! basic_os=irix4 +! ;; +! esac +! ;; +! miniframe) +! cpu=m68000 +! vendor=convergent +! ;; +! *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) +! cpu=m68k +! vendor=atari +! basic_os=mint +! ;; +! news-3600 | risc-news) +! cpu=mips +! vendor=sony +! basic_os=newsos +! ;; +! next | m*-next) +! cpu=m68k +! vendor=next +! ;; +! np1) +! cpu=np1 +! vendor=gould +! ;; +! op50n-* | op60c-*) +! cpu=hppa1.1 +! vendor=oki +! basic_os=proelf +! ;; +! pa-hitachi) +! cpu=hppa1.1 +! vendor=hitachi +! basic_os=hiuxwe2 +! ;; +! pbd) +! cpu=sparc +! vendor=tti +! ;; +! pbb) +! cpu=m68k +! vendor=tti +! ;; +! pc532) +! cpu=ns32k +! vendor=pc532 +! ;; +! pn) +! cpu=pn +! vendor=gould +! ;; +! power) +! cpu=power +! vendor=ibm +! ;; +! ps2) +! cpu=i386 +! vendor=ibm +! ;; +! rm[46]00) +! cpu=mips +! vendor=siemens +! ;; +! rtpc | rtpc-*) +! cpu=romp +! vendor=ibm +! ;; +! sde) +! cpu=mipsisa32 +! vendor=sde +! basic_os=${basic_os:-elf} +! ;; +! simso-wrs) +! cpu=sparclite +! vendor=wrs +! basic_os=vxworks +! ;; +! tower | tower-32) +! cpu=m68k +! vendor=ncr +! ;; +! vpp*|vx|vx-*) +! cpu=f301 +! vendor=fujitsu +! ;; +! w65) +! cpu=w65 +! vendor=wdc +! ;; +! w89k-*) +! cpu=hppa1.1 +! vendor=winbond +! basic_os=proelf +! ;; +! none) +! cpu=none +! vendor=none +! ;; +! leon|leon[3-9]) +! cpu=sparc +! vendor=$basic_machine +! ;; +! leon-*|leon[3-9]-*) +! cpu=sparc +! vendor=`echo "$basic_machine" | sed 's/-.*//'` +! ;; +! +! *-*) +! saved_IFS=$IFS +! IFS="-" read cpu vendor <&2 +! exit 1 +! ;; +! esac +! ;; +! esac + +! # Here we canonicalize certain aliases for manufacturers. +! case $vendor in +! digital*) +! vendor=dec +! ;; +! commodore*) +! vendor=cbm +! ;; +! *) +! ;; +! esac +! +! # Decode manufacturer-specific aliases for certain operating systems. +! +! if test x"$basic_os" != x +! then +! +! # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +! # set os. +! obj= +! case $basic_os in +! gnu/linux*) +! kernel=linux +! os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` +! ;; +! os2-emx) +! kernel=os2 +! os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` +! ;; +! nto-qnx*) +! kernel=nto +! os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` +! ;; +! *-*) +! saved_IFS=$IFS +! IFS="-" read kernel os <&2 ++ fi ++ ;; ++ *) ++ echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 ++ exit 1 ++ ;; ++ esac ++ ++ case $obj in ++ aout* | coff* | elf* | pe*) ++ ;; ++ '') ++ # empty is fine ++ ;; ++ *) ++ echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 ++ exit 1 ++ ;; ++ esac ++ ++ # Here we handle the constraint that a (synthetic) cpu and os are ++ # valid only in combination with each other and nowhere else. ++ case $cpu-$os in ++ # The "javascript-unknown-ghcjs" triple is used by GHC; we ++ # accept it here in order to tolerate that, but reject any ++ # variations. ++ javascript-ghcjs) ++ ;; ++ javascript-* | *-ghcjs) ++ echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 ++ exit 1 ++ ;; ++ esac ++ ++ # As a final step for OS-related things, validate the OS-kernel combination ++ # (given a valid OS), if there is a kernel. ++ case $kernel-$os-$obj in ++ linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ ++ | linux-mlibc*- | linux-musl*- | linux-newlib*- \ ++ | linux-relibc*- | linux-uclibc*- | linux-ohos*- ) ++ ;; ++ uclinux-uclibc*- | uclinux-gnu*- ) ++ ;; ++ managarm-mlibc*- | managarm-kernel*- ) ++ ;; ++ windows*-msvc*-) ++ ;; ++ -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ ++ | -uclibc*- ) ++ # These are just libc implementations, not actual OSes, and thus ++ # require a kernel. ++ echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 ++ exit 1 ++ ;; ++ -kernel*- ) ++ echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 ++ exit 1 ++ ;; ++ *-kernel*- ) ++ echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 ++ exit 1 ++ ;; ++ *-msvc*- ) ++ echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 ++ exit 1 ++ ;; ++ kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-) ++ ;; ++ vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) ++ ;; ++ nto-qnx*-) ++ ;; ++ os2-emx-) ++ ;; ++ rtmk-nova-) ++ ;; ++ *-eabi*- | *-gnueabi*-) ++ ;; ++ none--*) ++ # None (no kernel, i.e. freestanding / bare metal), ++ # can be paired with an machine code file format ++ ;; ++ -*-) ++ # Blank kernel with real OS is always fine. ++ ;; ++ --*) ++ # Blank kernel and OS with real machine code file format is always fine. ++ ;; ++ *-*-*) ++ echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 ++ exit 1 ++ ;; ++ esac ++ ++ # Here we handle the case where we know the os, and the CPU type, but not the ++ # manufacturer. We pick the logical manufacturer. ++ case $vendor in ++ unknown) ++ case $cpu-$os in ++ *-riscix*) ++ vendor=acorn ++ ;; ++ *-sunos* | *-solaris*) ++ vendor=sun ++ ;; ++ *-cnk* | *-aix*) ++ vendor=ibm ++ ;; ++ *-beos*) ++ vendor=be ++ ;; ++ *-hpux*) ++ vendor=hp ++ ;; ++ *-mpeix*) ++ vendor=hp ++ ;; ++ *-hiux*) ++ vendor=hitachi ++ ;; ++ *-unos*) ++ vendor=crds ++ ;; ++ *-dgux*) ++ vendor=dg ++ ;; ++ *-luna*) ++ vendor=omron ++ ;; ++ *-genix*) ++ vendor=ns ++ ;; ++ *-clix*) ++ vendor=intergraph ++ ;; ++ *-mvs* | *-opened*) ++ vendor=ibm ++ ;; ++ *-os400*) ++ vendor=ibm ++ ;; ++ s390-* | s390x-*) ++ vendor=ibm ++ ;; ++ *-ptx*) ++ vendor=sequent ++ ;; ++ *-tpf*) ++ vendor=ibm ++ ;; ++ *-vxsim* | *-vxworks* | *-windiss*) ++ vendor=wrs ++ ;; ++ *-aux*) ++ vendor=apple ++ ;; ++ *-hms*) ++ vendor=hitachi ++ ;; ++ *-mpw* | *-macos*) ++ vendor=apple ++ ;; ++ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) ++ vendor=atari ++ ;; ++ *-vos*) ++ vendor=stratus ++ ;; ++ esac ++ ;; ++ esac + ++ echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" ++ exit + + # Local variables: +! # eval: (add-hook 'before-save-hook 'time-stamp) +! # time-stamp-start: "timestamp='" +! # time-stamp-format: "%:y-%02m-%02d" +! # time-stamp-end: "'" + # End: +diff -crB gmp-6.3.0-orig/configure gmp-6.3.0/configure +*** gmp-6.3.0-orig/configure 2023-07-29 16:42:22.000000000 +0300 +--- gmp-6.3.0/configure 2025-08-28 16:19:50.450778164 +0300 +*************** +*** 1,7 **** + #! /bin/sh + # From configure.ac Revision. + # Guess values for system-dependent variables and create Makefiles. +! # Generated by GNU Autoconf 2.69 for GNU MP 6.3.0. + # + # Report bugs to . + # +--- 1,7 ---- + #! /bin/sh + # From configure.ac Revision. + # Guess values for system-dependent variables and create Makefiles. +! # Generated by GNU Autoconf 2.72 for GNU MP 6.3.0. + # + # Report bugs to . + # +*************** +*** 37,43 **** + # + # + # +! # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +--- 37,44 ---- + # + # + # +! # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +! # Inc. + # + # + # This configure script is free software; the Free Software Foundation +*************** +*** 48,110 **** + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +! if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +! else +! case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; + esac + fi + + + as_nl=' + ' + export as_nl +! # Printing a long string crashes Solaris 7 /usr/bin/printf. +! as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +! as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +! as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +! # Prefer a ksh shell builtin over an external printf program on Solaris, +! # but without wasting forks for bash or zsh. +! if test -z "$BASH_VERSION$ZSH_VERSION" \ +! && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then +! as_echo='print -r --' +! as_echo_n='print -rn --' +! elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +! as_echo='printf %s\n' +! as_echo_n='printf %s' +! else +! if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +! as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +! as_echo_n='/usr/ucb/echo -n' +! else +! as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +! as_echo_n_body='eval +! arg=$1; +! case $arg in #( +! *"$as_nl"*) +! expr "X$arg" : "X\\(.*\\)$as_nl"; +! arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +! esac; +! expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +! ' +! export as_echo_n_body +! as_echo_n='sh -c $as_echo_n_body as_echo' +! fi +! export as_echo_body +! as_echo='sh -c $as_echo_body as_echo' +! fi + + # The user is always right. +! if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +--- 49,113 ---- + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +! if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +! then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +! else case e in #( +! e) case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; ++ esac ;; + esac + fi + + ++ ++ # Reset variables that may have inherited troublesome values from ++ # the environment. ++ ++ # IFS needs to be set, to space, tab, and newline, in precisely that order. ++ # (If _AS_PATH_WALK were called with IFS unset, it would have the ++ # side effect of setting IFS to empty, thus disabling word splitting.) ++ # Quoting is to prevent editors from complaining about space-tab. + as_nl=' + ' + export as_nl +! IFS=" "" $as_nl" +! +! PS1='$ ' +! PS2='> ' +! PS4='+ ' +! +! # Ensure predictable behavior from utilities with locale-dependent output. +! LC_ALL=C +! export LC_ALL +! LANGUAGE=C +! export LANGUAGE +! +! # We cannot yet rely on "unset" to work, but we need these variables +! # to be unset--not just set to an empty or harmless value--now, to +! # avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +! # also avoids known problems related to "unset" and subshell syntax +! # in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +! for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +! do eval test \${$as_var+y} \ +! && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +! done +! +! # Ensure that fds 0, 1, and 2 are open. +! if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +! if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + + # The user is always right. +! if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +*************** +*** 113,125 **** + fi + + +- # IFS +- # We need space, tab and new line, in precisely that order. Quoting is +- # there to prevent editors from complaining about space-tab. +- # (If _AS_PATH_WALK were called with IFS unset, it would disable word +- # splitting by setting IFS to empty value.) +- IFS=" "" $as_nl" +- + # Find who we are. Look in the path if we contain no directory separator. + as_myself= + case $0 in #(( +--- 116,121 ---- +*************** +*** 128,170 **** + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done + IFS=$as_save_IFS + + ;; + esac +! # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +! $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 + fi + +- # Unset variables that we do not need and which cause bugs (e.g. in +- # pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +- # suppresses any "Segmentation fault" message there. '((' could +- # trigger a bug in pdksh 5.2.14. +- for as_var in BASH_ENV ENV MAIL MAILPATH +- do eval test x\${$as_var+set} = xset \ +- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +- done +- PS1='$ ' +- PS2='> ' +- PS4='+ ' +- +- # NLS nuisances. +- LC_ALL=C +- export LC_ALL +- LANGUAGE=C +- export LANGUAGE +- +- # CDPATH. +- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + # Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. +--- 124,150 ---- + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done + IFS=$as_save_IFS + + ;; + esac +! # We did not find ourselves, most probably we were run as 'sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +! printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 + fi + + + # Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. +*************** +*** 185,210 **** + esac + exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} + # Admittedly, this is quite paranoid, since all the known shells bail +! # out after a failed `exec'. +! $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +! as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then +! as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +! else +! case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; + esac + fi + " +--- 165,192 ---- + esac + exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} + # Admittedly, this is quite paranoid, since all the known shells bail +! # out after a failed 'exec'. +! printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +! exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} + if test "x$CONFIG_SHELL" = x; then +! as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +! then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +! else case e in #( +! e) case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; ++ esac ;; + esac + fi + " +*************** +*** 219,230 **** + as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } + as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } + as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +! if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +! else +! exitcode=1; echo positional parameters were not saved. + fi + test x\$exitcode = x0 || exit 1 + test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO +--- 201,216 ---- + as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } + as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } + as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +! if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +! then : + +! else case e in #( +! e) exitcode=1; echo positional parameters were not saved. ;; +! esac + fi + test x\$exitcode = x0 || exit 1 ++ blah=\$(echo \$(echo blah)) ++ test x\"\$blah\" = xblah || exit 1 + test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO +*************** +*** 239,268 **** + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" +! if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +! else +! as_have_required=no + fi +! if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +! else +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. +! as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +! { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes +! if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 + fi + fi +--- 225,263 ---- + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" +! if (eval "$as_required") 2>/dev/null +! then : + as_have_required=yes +! else case e in #( +! e) as_have_required=no ;; +! esac + fi +! if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +! then : + +! else case e in #( +! e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. +! as_shell=$as_dir$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +! as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +! then : + CONFIG_SHELL=$as_shell as_have_required=yes +! if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +! then : + break 2 + fi + fi +*************** +*** 270,283 **** + esac + as_found=false + done +- $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : +- CONFIG_SHELL=$SHELL as_have_required=yes +- fi; } + IFS=$as_save_IFS + + +! if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also +--- 265,286 ---- + esac + as_found=false + done + IFS=$as_save_IFS ++ if $as_found ++ then : ++ ++ else case e in #( ++ e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null ++ then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++ fi ;; ++ esac ++ fi + + +! if test "x$CONFIG_SHELL" != x +! then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also +*************** +*** 294,312 **** + esac + exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} + # Admittedly, this is quite paranoid, since all the known shells bail +! # out after a failed `exec'. +! $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 + exit 255 + fi + +! if test x$as_have_required = xno; then : +! $as_echo "$0: This script requires a shell more modern than all" +! $as_echo "$0: the shells that I found on your system." +! if test x${ZSH_VERSION+set} = xset ; then +! $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" +! $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else +! $as_echo "$0: Please tell bug-autoconf@gnu.org and + $0: gmp-bugs@gmplib.org (see + $0: https://gmplib.org/manual/Reporting-Bugs.html) about + $0: your system, including any error possibly output before +--- 297,316 ---- + esac + exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} + # Admittedly, this is quite paranoid, since all the known shells bail +! # out after a failed 'exec'. +! printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 + exit 255 + fi + +! if test x$as_have_required = xno +! then : +! printf "%s\n" "$0: This script requires a shell more modern than all" +! printf "%s\n" "$0: the shells that I found on your system." +! if test ${ZSH_VERSION+y} ; then +! printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" +! printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + else +! printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and + $0: gmp-bugs@gmplib.org (see + $0: https://gmplib.org/manual/Reporting-Bugs.html) about + $0: your system, including any error possibly output before +*************** +*** 314,320 **** + $0: run the script under such a shell if you do have one." + fi + exit 1 +! fi + fi + fi + SHELL=${CONFIG_SHELL-/bin/sh} +--- 318,325 ---- + $0: run the script under such a shell if you do have one." + fi + exit 1 +! fi ;; +! esac + fi + fi + SHELL=${CONFIG_SHELL-/bin/sh} +*************** +*** 366,372 **** + as_dirs= + while :; do + case $as_dir in #( +! *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +--- 372,378 ---- + as_dirs= + while :; do + case $as_dir in #( +! *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +*************** +*** 375,381 **** + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +--- 381,387 ---- + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +*************** +*** 414,429 **** + # advantage of any shell optimizations that allow amortized linear growth over + # repeated appends, instead of the typical quadratic growth present in naive + # implementations. +! if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +! else +! as_fn_append () + { + eval $1=\$$1\$2 +! } + fi # as_fn_append + + # as_fn_arith ARG... +--- 420,437 ---- + # advantage of any shell optimizations that allow amortized linear growth over + # repeated appends, instead of the typical quadratic growth present in naive + # implementations. +! if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +! then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +! else case e in #( +! e) as_fn_append () + { + eval $1=\$$1\$2 +! } ;; +! esac + fi # as_fn_append + + # as_fn_arith ARG... +*************** +*** 431,446 **** + # Perform arithmetic evaluation on the ARGs, and store the result in the + # global $as_val. Take advantage of shells that can avoid forks. The arguments + # must be portable across $(()) and expr. +! if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +! else +! as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` +! } + fi # as_fn_arith + + +--- 439,456 ---- + # Perform arithmetic evaluation on the ARGs, and store the result in the + # global $as_val. Take advantage of shells that can avoid forks. The arguments + # must be portable across $(()) and expr. +! if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +! then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +! else case e in #( +! e) as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` +! } ;; +! esac + fi # as_fn_arith + + +*************** +*** 454,462 **** + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +! $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +--- 464,472 ---- + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +! printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +*************** +*** 483,489 **** + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +--- 493,499 ---- + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +*************** +*** 516,521 **** +--- 526,533 ---- + /[$]LINENO/= + ' <$as_myself | + sed ' ++ t clear ++ :clear + s/[$]LINENO.*/&-/ + t lineno + b +*************** +*** 527,533 **** + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +! { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall +--- 539,545 ---- + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +! { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall +*************** +*** 541,546 **** +--- 553,562 ---- + exit + } + ++ ++ # Determine whether it's possible to make 'echo' print without a newline. ++ # These variables are no longer used directly by Autoconf, but are AC_SUBSTed ++ # for compatibility with existing Makefiles. + ECHO_C= ECHO_N= ECHO_T= + case `echo -n x` in #((((( + -n*) +*************** +*** 554,559 **** +--- 570,581 ---- + ECHO_N='-n';; + esac + ++ # For backward compatibility with old third-party macros, we provide ++ # the shell variables $as_echo and $as_echo_n. New code should use ++ # AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++ + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +*************** +*** 565,573 **** + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: +! # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +! # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +! # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then +--- 587,595 ---- + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: +! # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. +! # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. +! # In both cases, we have to default to 'cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then +*************** +*** 592,601 **** + as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. +! as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + + # Sed expression to map a string onto a valid variable name. +! as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + SHELL=${CONFIG_SHELL-/bin/sh} + +--- 614,625 ---- + as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. +! as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +! as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated + + # Sed expression to map a string onto a valid variable name. +! as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +! as_tr_sh="eval sed '$as_sed_sh'" # deprecated + + SHELL=${CONFIG_SHELL-/bin/sh} + +*************** +*** 626,670 **** + PACKAGE_VERSION='6.3.0' + PACKAGE_STRING='GNU MP 6.3.0' + PACKAGE_BUGREPORT='gmp-bugs@gmplib.org (see https://gmplib.org/manual/Reporting-Bugs.html)' +! PACKAGE_URL='http://www.gnu.org/software/gmp/' + + ac_unique_file="gmp-impl.h" + # Factoring default headers for most tests. + ac_includes_default="\ +! #include +! #ifdef HAVE_SYS_TYPES_H +! # include +! #endif +! #ifdef HAVE_SYS_STAT_H +! # include + #endif +! #ifdef STDC_HEADERS + # include +- # include +- #else +- # ifdef HAVE_STDLIB_H +- # include +- # endif + #endif + #ifdef HAVE_STRING_H +- # if !defined STDC_HEADERS && defined HAVE_MEMORY_H +- # include +- # endif + # include + #endif +- #ifdef HAVE_STRINGS_H +- # include +- #endif + #ifdef HAVE_INTTYPES_H + # include + #endif + #ifdef HAVE_STDINT_H + # include + #endif + #ifdef HAVE_UNISTD_H + # include + #endif" + + ac_subst_vars='am__EXEEXT_FALSE + am__EXEEXT_TRUE + LTLIBOBJS +--- 650,690 ---- + PACKAGE_VERSION='6.3.0' + PACKAGE_STRING='GNU MP 6.3.0' + PACKAGE_BUGREPORT='gmp-bugs@gmplib.org (see https://gmplib.org/manual/Reporting-Bugs.html)' +! PACKAGE_URL='https://www.gnu.org/software/gmp/' + + ac_unique_file="gmp-impl.h" + # Factoring default headers for most tests. + ac_includes_default="\ +! #include +! #ifdef HAVE_STDIO_H +! # include + #endif +! #ifdef HAVE_STDLIB_H + # include + #endif + #ifdef HAVE_STRING_H + # include + #endif + #ifdef HAVE_INTTYPES_H + # include + #endif + #ifdef HAVE_STDINT_H + # include + #endif ++ #ifdef HAVE_STRINGS_H ++ # include ++ #endif ++ #ifdef HAVE_SYS_TYPES_H ++ # include ++ #endif ++ #ifdef HAVE_SYS_STAT_H ++ # include ++ #endif + #ifdef HAVE_UNISTD_H + # include + #endif" + ++ ac_header_c_list= + ac_subst_vars='am__EXEEXT_FALSE + am__EXEEXT_TRUE + LTLIBOBJS +*************** +*** 706,714 **** +--- 726,737 ---- + MANIFEST_TOOL + RANLIB + ac_ct_AR ++ FILECMD + LN_S + LD + FGREP ++ EGREP ++ GREP + SED + LIBTOOL + LIBGMP_DLL +*************** +*** 720,727 **** + DUMPBIN + AR + ASMFLAGS +- EGREP +- GREP + CXXCPP + WANT_CXX_FALSE + WANT_CXX_TRUE +--- 743,748 ---- +*************** +*** 755,764 **** +--- 776,790 ---- + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE ++ am__xargs_n ++ am__rm_f_notfound + AM_BACKSLASH + AM_DEFAULT_VERBOSITY + AM_DEFAULT_V + AM_V ++ CSCOPE ++ ETAGS ++ CTAGS + am__untar + am__tar + AMTAR +*************** +*** 809,814 **** +--- 835,841 ---- + docdir + oldincludedir + includedir ++ runstatedir + localstatedir + sharedstatedir + sysconfdir +*************** +*** 847,854 **** +--- 874,884 ---- + enable_fake_cpuid + enable_shared + enable_static ++ enable_pic + with_pic ++ enable_cxx_stdlib + enable_fast_install ++ enable_aix_soname + with_aix_soname + with_gnu_ld + with_sysroot +*************** +*** 912,917 **** +--- 942,948 ---- + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' ++ runstatedir='${localstatedir}/run' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +*************** +*** 941,948 **** + *) ac_optarg=yes ;; + esac + +- # Accept the important Cygnus configure options, so we can diagnose typos. +- + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; +--- 972,977 ---- +*************** +*** 983,991 **** + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt +! ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "enable_$ac_useropt" +--- 1012,1020 ---- + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid feature name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt +! ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "enable_$ac_useropt" +*************** +*** 1009,1017 **** + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt +! ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "enable_$ac_useropt" +--- 1038,1046 ---- + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid feature name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt +! ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "enable_$ac_useropt" +*************** +*** 1164,1169 **** +--- 1193,1207 ---- + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + ++ -runstatedir | --runstatedir | --runstatedi | --runstated \ ++ | --runstate | --runstat | --runsta | --runst | --runs \ ++ | --run | --ru | --r) ++ ac_prev=runstatedir ;; ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ ++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ ++ | --run=* | --ru=* | --r=*) ++ runstatedir=$ac_optarg ;; ++ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +*************** +*** 1213,1221 **** + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt +! ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "with_$ac_useropt" +--- 1251,1259 ---- + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid package name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt +! ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "with_$ac_useropt" +*************** +*** 1229,1237 **** + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt +! ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "with_$ac_useropt" +--- 1267,1275 ---- + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +! as_fn_error $? "invalid package name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt +! ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" + "with_$ac_useropt" +*************** +*** 1259,1266 **** + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +! -*) as_fn_error $? "unrecognized option: \`$ac_option' +! Try \`$0 --help' for more information" + ;; + + *=*) +--- 1297,1304 ---- + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +! -*) as_fn_error $? "unrecognized option: '$ac_option' +! Try '$0 --help' for more information" + ;; + + *=*) +*************** +*** 1268,1283 **** + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +! as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +! $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +! $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + +--- 1306,1321 ---- + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) +! as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +! printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +! printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + +*************** +*** 1293,1299 **** + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; +! *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi + +--- 1331,1337 ---- + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; +! *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi + +*************** +*** 1301,1307 **** + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +! libdir localedir mandir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +--- 1339,1345 ---- + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +! libdir localedir mandir runstatedir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +*************** +*** 1318,1324 **** + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + +! # There might be people who depend on the old broken behavior: `$host' + # used to hold the argument of --host etc. + # FIXME: To remove some day. + build=$build_alias +--- 1356,1362 ---- + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + done + +! # There might be people who depend on the old broken behavior: '$host' + # used to hold the argument of --host etc. + # FIXME: To remove some day. + build=$build_alias +*************** +*** 1357,1363 **** + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +--- 1395,1401 ---- + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +*************** +*** 1386,1392 **** + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi +! ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +--- 1424,1430 ---- + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + fi +! ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" + ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +*************** +*** 1414,1420 **** + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +! \`configure' configures GNU MP 6.3.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +--- 1452,1458 ---- + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +! 'configure' configures GNU MP 6.3.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +*************** +*** 1428,1438 **** + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +! -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] +! -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +! --srcdir=DIR find the sources in DIR [configure dir or \`..'] + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +--- 1466,1476 ---- + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +! -q, --quiet, --silent do not print 'checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] +! -C, --config-cache alias for '--cache-file=config.cache' + -n, --no-create do not create output files +! --srcdir=DIR find the sources in DIR [configure dir or '..'] + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +*************** +*** 1440,1449 **** + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +! By default, \`make install' will install all the files in +! \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +! an installation prefix other than \`$ac_default_prefix' using \`--prefix', +! for instance \`--prefix=\$HOME'. + + For better control, use the options below. + +--- 1478,1487 ---- + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +! By default, 'make install' will install all the files in +! '$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +! an installation prefix other than '$ac_default_prefix' using '--prefix', +! for instance '--prefix=\$HOME'. + + For better control, use the options below. + +*************** +*** 1454,1459 **** +--- 1492,1498 ---- + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +*************** +*** 1512,1530 **** + --enable-fake-cpuid enable GMP_CPU_TYPE faking cpuid [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-readline readline support in demo programs [default=detect] +- --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use +- both] +- --with-aix-soname=aix|svr4|both +- shared library versioning (aka "SONAME") variant to +- provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). +--- 1551,1573 ---- + --enable-fake-cpuid enable GMP_CPU_TYPE faking cpuid [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] ++ --enable-pic[=PKGS] try to use only PIC/non-PIC objects [default=use ++ both] ++ --enable-cxx-stdlib[=PKGS] ++ let the compiler frontend decide what standard ++ libraries to link when building C++ shared libraries ++ and modules [default=no] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] ++ --enable-aix-soname=aix|svr4|both ++ shared library versioning (aka "SONAME") variant to ++ provide on AIX, [default=aix]. + --disable-libtool-lock avoid locking (might break parallel builds) + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-readline readline support in demo programs [default=detect] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). +*************** +*** 1549,1567 **** + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + M4 m4 macro processor +! YACC The `Yet Another Compiler Compiler' implementation to use. +! Defaults to the first program found out of: `bison -y', `byacc', +! `yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a +! default value of `-d' given by some make applications. + +! Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + + Report bugs to . +! GNU MP home page: . +! General help using GNU software: . + _ACEOF + ac_status=$? + fi +--- 1592,1610 ---- + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + M4 m4 macro processor +! YACC The 'Yet Another Compiler Compiler' implementation to use. +! Defaults to the first program found out of: 'bison -y', 'byacc', +! 'yacc'. + YFLAGS The list of arguments that will be passed by default to $YACC. + This script will default YFLAGS to the empty string to avoid a +! default value of '-d' given by some make applications. + +! Use these variables to override the choices made by 'configure' or to help + it to find libraries and programs with nonstandard names/locations. + + Report bugs to . +! GNU MP home page: . +! General help using GNU software: . + _ACEOF + ac_status=$? + fi +*************** +*** 1577,1585 **** + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +! ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +! ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +--- 1620,1628 ---- + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +! ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +! ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +*************** +*** 1607,1613 **** + ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } +! # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive +--- 1650,1657 ---- + ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } +! # Check for configure.gnu first; this name is used for a wrapper for +! # Metaconfig's "Configure" on case-insensitive file systems. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive +*************** +*** 1615,1621 **** + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +! $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +--- 1659,1665 ---- + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +! printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +*************** +*** 1625,1633 **** + if $ac_init_version; then + cat <<\_ACEOF + GNU MP configure 6.3.0 +! generated by GNU Autoconf 2.69 + +! Copyright (C) 2012 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + +--- 1669,1677 ---- + if $ac_init_version; then + cat <<\_ACEOF + GNU MP configure 6.3.0 +! generated by GNU Autoconf 2.72 + +! Copyright (C) 2023 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + +*************** +*** 1675,1688 **** + ac_fn_c_try_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 1719,1732 ---- + ac_fn_c_try_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 1690,1706 **** + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +! } && test -s conftest.$ac_objext; then : + ac_retval=0 +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +--- 1734,1752 ---- + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +! } && test -s conftest.$ac_objext +! then : + ac_retval=0 +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 ;; +! esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +*************** +*** 1719,1725 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 1765,1771 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 1727,1743 **** + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +! }; then : + ac_retval=0 +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +--- 1773,1791 ---- + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +! } +! then : + ac_retval=0 +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 ;; +! esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +*************** +*** 1750,1763 **** + ac_fn_cxx_try_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 1798,1811 ---- + ac_fn_cxx_try_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext conftest.beam + if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 1765,1781 **** + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +! } && test -s conftest.$ac_objext; then : + ac_retval=0 +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +--- 1813,1831 ---- + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +! } && test -s conftest.$ac_objext +! then : + ac_retval=0 +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 ;; +! esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +*************** +*** 1794,1800 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 1844,1850 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 1802,1818 **** + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +! }; then : + ac_retval=0 +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +--- 1852,1870 ---- + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +! } +! then : + ac_retval=0 +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 ;; +! esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +*************** +*** 1825,1838 **** + ac_fn_c_try_link () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 1877,1890 ---- + ac_fn_c_try_link () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 1840,1859 **** + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext +! }; then : + ac_retval=0 +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 + fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +--- 1892,1913 ---- + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext +! } +! then : + ac_retval=0 +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 ;; +! esac + fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +*************** +*** 1872,1971 **** + ac_fn_c_check_header_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +! else +! eval "$3=no" + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_compile + +- # ac_fn_c_try_run LINENO +- # ---------------------- +- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +- # that executables *can* be run. +- ac_fn_c_try_run () +- { +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_link" +- case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +- esac +- eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +- $as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +- esac +- eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +- $as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then : +- ac_retval=0 +- else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +- $as_echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=$ac_status +- fi +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +- } # ac_fn_c_try_run +- + # ac_fn_c_check_func LINENO FUNC VAR + # ---------------------------------- + # Tests whether FUNC exists, setting the cache variable VAR accordingly + ac_fn_c_check_func () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + /* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ + #define $2 innocuous_$2 + + /* System header to define __stub macros and hopefully few prototypes, +! which can conflict with char $2 (); below. +! Prefer to if __STDC__ is defined, since +! exists even on freestanding compilers. */ +! +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + + #undef $2 + + /* Override any GCC internal prototype to avoid an error. +--- 1926,1981 ---- + ac_fn_c_check_header_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! printf %s "checking for $2... " >&6; } +! if eval test \${$3+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + eval "$3=yes" +! else case e in #( +! e) eval "$3=no" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + eval ac_res=\$$3 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_header_compile + + # ac_fn_c_check_func LINENO FUNC VAR + # ---------------------------------- + # Tests whether FUNC exists, setting the cache variable VAR accordingly + ac_fn_c_check_func () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! printf %s "checking for $2... " >&6; } +! if eval test \${$3+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + /* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ + #define $2 innocuous_$2 + + /* System header to define __stub macros and hopefully few prototypes, +! which can conflict with char $2 (void); below. */ + ++ #include + #undef $2 + + /* Override any GCC internal prototype to avoid an error. +*************** +*** 1974,1980 **** + #ifdef __cplusplus + extern "C" + #endif +! char $2 (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +--- 1984,1990 ---- + #ifdef __cplusplus + extern "C" + #endif +! char $2 (void); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +*************** +*** 1983,2006 **** + #endif + + int +! main () + { + return $2 (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +! else +! eval "$3=no" + fi +! rm -f core conftest.err conftest.$ac_objext \ +! conftest$ac_exeext conftest.$ac_ext + fi + eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_func +--- 1993,2019 ---- + #endif + + int +! main (void) + { + return $2 (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + eval "$3=yes" +! else case e in #( +! e) eval "$3=no" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ +! conftest$ac_exeext conftest.$ac_ext ;; +! esac + fi + eval ac_res=\$$3 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_func +*************** +*** 2011,2024 **** + ac_fn_cxx_try_link () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 2024,2037 ---- + ac_fn_cxx_try_link () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 2026,2045 **** + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext +! }; then : + ac_retval=0 +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 + fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +--- 2039,2060 ---- + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext +! } +! then : + ac_retval=0 +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! ac_retval=1 ;; +! esac + fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +*************** +*** 2051,2166 **** + + } # ac_fn_cxx_try_link + +! # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +! # ------------------------------------------------------- +! # Tests whether HEADER exists, giving a warning if it cannot be compiled using +! # the include files in INCLUDES and setting the cache variable VAR +! # accordingly. +! ac_fn_c_check_header_mongrel () +! { +! as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! if eval \${$3+:} false; then : +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! fi +! eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } +! else +! # Is the header compilable? +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +! $as_echo_n "checking $2 usability... " >&6; } +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! $4 +! #include <$2> +! _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : +! ac_header_compiler=yes +! else +! ac_header_compiler=no +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +! $as_echo "$ac_header_compiler" >&6; } +! +! # Is the header present? +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +! $as_echo_n "checking $2 presence... " >&6; } +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include <$2> +! _ACEOF +! if ac_fn_c_try_cpp "$LINENO"; then : +! ac_header_preproc=yes +! else +! ac_header_preproc=no +! fi +! rm -f conftest.err conftest.i conftest.$ac_ext +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +! $as_echo "$ac_header_preproc" >&6; } +! +! # So? What about this header? +! case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( +! yes:no: ) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +! $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +! $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +! ;; +! no:yes:* ) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +! $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +! $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +! $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +! $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +! $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +! ( $as_echo "## -------------------------------------------------------------------------------------- ## +! ## Report this to gmp-bugs@gmplib.org (see https://gmplib.org/manual/Reporting-Bugs.html) ## +! ## -------------------------------------------------------------------------------------- ##" +! ) | sed "s/^/$as_me: WARNING: /" >&2 +! ;; +! esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! eval "$3=\$ac_header_compiler" +! fi +! eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } +! fi +! eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +! +! } # ac_fn_c_check_header_mongrel +! +! # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +! # --------------------------------------------- + # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +! # accordingly. +! ac_fn_c_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` +! as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +! $as_echo_n "checking whether $as_decl_name is declared... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + #ifndef $as_decl_name + #ifdef __cplusplus +--- 2066,2093 ---- + + } # ac_fn_cxx_try_link + +! # ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +! # ------------------------------------------------------------------ + # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +! # accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +! ac_fn_check_decl () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +! printf %s "checking whether $as_decl_name is declared... " >&6; } +! if eval test \${$3+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` +! eval ac_save_FLAGS=\$$6 +! as_fn_append $6 " $5" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + #ifndef $as_decl_name + #ifdef __cplusplus +*************** +*** 2174,2192 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +! else +! eval "$3=no" + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +! } # ac_fn_c_check_decl + + # ac_fn_c_check_type LINENO TYPE VAR INCLUDES + # ------------------------------------------- +--- 2101,2124 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + eval "$3=yes" +! else case e in #( +! e) eval "$3=no" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! eval $6=\$ac_save_FLAGS +! ;; +! esac + fi + eval ac_res=\$$3 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +! } # ac_fn_check_decl + + # ac_fn_c_check_type LINENO TYPE VAR INCLUDES + # ------------------------------------------- +*************** +*** 2195,2211 **** + ac_fn_c_check_type () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + if (sizeof ($2)) + return 0; +--- 2127,2144 ---- + ac_fn_c_check_type () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! printf %s "checking for $2... " >&6; } +! if eval test \${$3+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + if (sizeof ($2)) + return 0; +*************** +*** 2213,2224 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + if (sizeof (($2))) + return 0; +--- 2146,2158 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + if (sizeof (($2))) + return 0; +*************** +*** 2226,2247 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + +! else +! eval "$3=yes" + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_type + + # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES + # ---------------------------------------------------- + # Tries to find if the field MEMBER exists in type AGGR, after including +--- 2160,2228 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + +! else case e in #( +! e) eval "$3=yes" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + eval ac_res=\$$3 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_type + ++ # ac_fn_c_try_run LINENO ++ # ---------------------- ++ # Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that ++ # executables *can* be run. ++ ac_fn_c_try_run () ++ { ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++ case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++ printf "%s\n" "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++ esac ++ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++ printf "%s\n" "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } ++ then : ++ ac_retval=0 ++ else case e in #( ++ e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5 ++ printf "%s\n" "$as_me: failed program was:" >&5 ++ sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=$ac_status ;; ++ esac ++ fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++ } # ac_fn_c_try_run ++ + # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES + # ---------------------------------------------------- + # Tries to find if the field MEMBER exists in type AGGR, after including +*************** +*** 2249,2264 **** + ac_fn_c_check_member () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +! $as_echo_n "checking for $2.$3... " >&6; } +! if eval \${$4+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $5 + int +! main () + { + static $2 ac_aggr; + if (ac_aggr.$3) +--- 2230,2246 ---- + ac_fn_c_check_member () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +! printf %s "checking for $2.$3... " >&6; } +! if eval test \${$4+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $5 + int +! main (void) + { + static $2 ac_aggr; + if (ac_aggr.$3) +*************** +*** 2267,2280 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $5 + int +! main () + { + static $2 ac_aggr; + if (sizeof ac_aggr.$3) +--- 2249,2263 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + eval "$4=yes" +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $5 + int +! main (void) + { + static $2 ac_aggr; + if (sizeof ac_aggr.$3) +*************** +*** 2283,2394 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +! else +! eval "$4=no" + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + eval ac_res=\$$4 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_member + +! # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES + # --------------------------------------------------------- +! # Tests whether HEADER exists, giving a warning if it cannot be compiled using +! # the include files in INCLUDES and setting the cache variable VAR +! # accordingly. +! ac_fn_cxx_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! if eval \${$3+:} false; then : +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! fi +! eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } +! else +! # Is the header compilable? +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +! $as_echo_n "checking $2 usability... " >&6; } +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : +! ac_header_compiler=yes +! else +! ac_header_compiler=no +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +! $as_echo "$ac_header_compiler" >&6; } +! +! # Is the header present? +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +! $as_echo_n "checking $2 presence... " >&6; } +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include <$2> +! _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : +! ac_header_preproc=yes +! else +! ac_header_preproc=no + fi +! rm -f conftest.err conftest.i conftest.$ac_ext +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +! $as_echo "$ac_header_preproc" >&6; } +! +! # So? What about this header? +! case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( +! yes:no: ) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +! $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +! $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +! ;; +! no:yes:* ) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +! $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +! $as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +! $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +! $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +! $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +! ( $as_echo "## -------------------------------------------------------------------------------------- ## +! ## Report this to gmp-bugs@gmplib.org (see https://gmplib.org/manual/Reporting-Bugs.html) ## +! ## -------------------------------------------------------------------------------------- ##" +! ) | sed "s/^/$as_me: WARNING: /" >&2 +! ;; +! esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! eval "$3=\$ac_header_compiler" + fi + eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } +! fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +! } # ac_fn_cxx_check_header_mongrel + + # ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES + # --------------------------------------------- +--- 2266,2325 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + eval "$4=yes" +! else case e in #( +! e) eval "$4=no" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + eval ac_res=\$$4 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_c_check_member + +! # ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES + # --------------------------------------------------------- +! # Tests whether HEADER exists and can be compiled using the include files in +! # INCLUDES, setting the cache variable VAR accordingly. +! ac_fn_cxx_check_header_compile () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! printf %s "checking for $2... " >&6; } +! if eval test \${$3+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : +! eval "$3=yes" +! else case e in #( +! e) eval "$3=no" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + eval ac_res=\$$3 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +! } # ac_fn_cxx_check_header_compile + + # ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES + # --------------------------------------------- +*************** +*** 2397,2413 **** + ac_fn_cxx_check_type () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! $as_echo_n "checking for $2... " >&6; } +! if eval \${$3+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + if (sizeof ($2)) + return 0; +--- 2328,2345 ---- + ac_fn_cxx_check_type () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +! printf %s "checking for $2... " >&6; } +! if eval test \${$3+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + if (sizeof ($2)) + return 0; +*************** +*** 2415,2426 **** + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + if (sizeof (($2))) + return 0; +--- 2347,2359 ---- + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + if (sizeof (($2))) + return 0; +*************** +*** 2428,2445 **** + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : + +! else +! eval "$3=yes" + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + eval ac_res=\$$3 +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_cxx_check_type +--- 2361,2381 ---- + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : + +! else case e in #( +! e) eval "$3=yes" ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + eval ac_res=\$$3 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +! printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + + } # ac_fn_cxx_check_type +*************** +*** 2458,2464 **** + /* end confdefs.h. */ + $4 + int +! main () + { + static int test_array [1 - 2 * !(($2) >= 0)]; + test_array [0] = 0; +--- 2394,2400 ---- + /* end confdefs.h. */ + $4 + int +! main (void) + { + static int test_array [1 - 2 * !(($2) >= 0)]; + test_array [0] = 0; +*************** +*** 2468,2481 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; + test_array [0] = 0; +--- 2404,2418 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; + test_array [0] = 0; +*************** +*** 2485,2508 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +! else +! as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi +! as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + static int test_array [1 - 2 * !(($2) < 0)]; + test_array [0] = 0; +--- 2422,2447 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_hi=$ac_mid; break +! else case e in #( +! e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi +! as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + static int test_array [1 - 2 * !(($2) < 0)]; + test_array [0] = 0; +*************** +*** 2512,2525 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main () + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; + test_array [0] = 0; +--- 2451,2465 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +! main (void) + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; + test_array [0] = 0; +*************** +*** 2529,2552 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +! else +! as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi +! as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +! else +! ac_lo= ac_hi= + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # Binary search between lo and hi bounds. + while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val +--- 2469,2496 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_lo=$ac_mid; break +! else case e in #( +! e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi +! as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done +! else case e in #( +! e) ac_lo= ac_hi= ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + # Binary search between lo and hi bounds. + while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val +*************** +*** 2554,2560 **** + /* end confdefs.h. */ + $4 + int +! main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; + test_array [0] = 0; +--- 2498,2504 ---- + /* end confdefs.h. */ + $4 + int +! main (void) + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; + test_array [0] = 0; +*************** +*** 2564,2575 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +! else +! as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done + case $ac_lo in #(( + ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +--- 2508,2521 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_hi=$ac_mid +! else case e in #( +! e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + case $ac_lo in #(( + ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +*************** +*** 2579,2590 **** + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 +! static long int longval () { return $2; } +! static unsigned long int ulongval () { return $2; } + #include + #include + int +! main () + { + + FILE *f = fopen ("conftest.val", "w"); +--- 2525,2536 ---- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 +! static long int longval (void) { return $2; } +! static unsigned long int ulongval (void) { return $2; } + #include + #include + int +! main (void) + { + + FILE *f = fopen ("conftest.val", "w"); +*************** +*** 2612,2621 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 >conftest.val; read $3 config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by GNU MP $as_me 6.3.0, which was +! generated by GNU Autoconf 2.69. Invocation command line was + +! $ $0 $@ + + _ACEOF + exec 5>>config.log +--- 2574,2607 ---- + as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int ++ ac_configure_args_raw= ++ for ac_arg ++ do ++ case $ac_arg in ++ *\'*) ++ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append ac_configure_args_raw " '$ac_arg'" ++ done ++ ++ case $ac_configure_args_raw in ++ *$as_nl*) ++ ac_safe_unquote= ;; ++ *) ++ ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. ++ ac_unsafe_a="$ac_unsafe_z#~" ++ ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" ++ ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; ++ esac ++ + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by GNU MP $as_me 6.3.0, which was +! generated by GNU Autoconf 2.72. Invocation command line was + +! $ $0$ac_configure_args_raw + + _ACEOF + exec 5>>config.log +*************** +*** 2666,2673 **** + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! $as_echo "PATH: $as_dir" + done + IFS=$as_save_IFS + +--- 2634,2645 ---- + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! printf "%s\n" "PATH: $as_dir" + done + IFS=$as_save_IFS + +*************** +*** 2702,2708 **** + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +! ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; +--- 2674,2680 ---- + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +! ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; +*************** +*** 2737,2747 **** + # WARNING: Use '\'' to represent an apostrophe within the trap. + # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. + trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + +! $as_echo "## ---------------- ## + ## Cache variables. ## + ## ---------------- ##" + echo +--- 2709,2721 ---- + # WARNING: Use '\'' to represent an apostrophe within the trap. + # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. + trap 'exit_status=$? ++ # Sanitize IFS. ++ IFS=" "" $as_nl" + # Save into config.log some information that might help in debugging. + { + echo + +! printf "%s\n" "## ---------------- ## + ## Cache variables. ## + ## ---------------- ##" + echo +*************** +*** 2752,2759 **** + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +! *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +--- 2726,2733 ---- + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +! *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +! printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +*************** +*** 2777,2783 **** + ) + echo + +! $as_echo "## ----------------- ## + ## Output variables. ## + ## ----------------- ##" + echo +--- 2751,2757 ---- + ) + echo + +! printf "%s\n" "## ----------------- ## + ## Output variables. ## + ## ----------------- ##" + echo +*************** +*** 2785,2798 **** + do + eval ac_val=\$$ac_var + case $ac_val in +! *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +! $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then +! $as_echo "## ------------------- ## + ## File substitutions. ## + ## ------------------- ##" + echo +--- 2759,2772 ---- + do + eval ac_val=\$$ac_var + case $ac_val in +! *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +! printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then +! printf "%s\n" "## ------------------- ## + ## File substitutions. ## + ## ------------------- ##" + echo +*************** +*** 2800,2814 **** + do + eval ac_val=\$$ac_var + case $ac_val in +! *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +! $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then +! $as_echo "## ----------- ## + ## confdefs.h. ## + ## ----------- ##" + echo +--- 2774,2788 ---- + do + eval ac_val=\$$ac_var + case $ac_val in +! *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +! printf "%s\n" "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then +! printf "%s\n" "## ----------- ## + ## confdefs.h. ## + ## ----------- ##" + echo +*************** +*** 2816,2823 **** + echo + fi + test "$ac_signal" != 0 && +! $as_echo "$as_me: caught signal $ac_signal" +! $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +--- 2790,2797 ---- + echo + fi + test "$ac_signal" != 0 && +! printf "%s\n" "$as_me: caught signal $ac_signal" +! printf "%s\n" "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +*************** +*** 2831,2895 **** + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + +! $as_echo "/* confdefs.h */" > confdefs.h + + # Predefined preprocessor variables. + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE_NAME "$PACKAGE_NAME" +! _ACEOF + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE_TARNAME "$PACKAGE_TARNAME" +! _ACEOF + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE_VERSION "$PACKAGE_VERSION" +! _ACEOF + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE_STRING "$PACKAGE_STRING" +! _ACEOF + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +! _ACEOF + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE_URL "$PACKAGE_URL" +! _ACEOF + + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. +- ac_site_file1=NONE +- ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +! # We do not want a PATH search for config.site. +! case $CONFIG_SITE in #(( +! -*) ac_site_file1=./$CONFIG_SITE;; +! */*) ac_site_file1=$CONFIG_SITE;; +! *) ac_site_file1=./$CONFIG_SITE;; +! esac + elif test "x$prefix" != xNONE; then +! ac_site_file1=$prefix/share/config.site +! ac_site_file2=$prefix/etc/config.site + else +! ac_site_file1=$ac_default_prefix/share/config.site +! ac_site_file2=$ac_default_prefix/etc/config.site + fi +! for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do +! test "x$ac_site_file" = xNONE && continue +! if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +! $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ +! || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "failed to load site script $ac_site_file +! See \`config.log' for more details" "$LINENO" 5; } + fi + done + +--- 2805,2854 ---- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -f -r conftest* confdefs.h + +! printf "%s\n" "/* confdefs.h */" > confdefs.h + + # Predefined preprocessor variables. + +! printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h + +! printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h + +! printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h + +! printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h + +! printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h + +! printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h + + + # Let the site file select an alternate cache file if it wants to. + # Prefer an explicitly selected file to automatically selected ones. + if test -n "$CONFIG_SITE"; then +! ac_site_files="$CONFIG_SITE" + elif test "x$prefix" != xNONE; then +! ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + else +! ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +! +! for ac_site_file in $ac_site_files + do +! case $ac_site_file in #( +! */*) : +! ;; #( +! *) : +! ac_site_file=./$ac_site_file ;; +! esac +! if test -f "$ac_site_file" && test -r "$ac_site_file"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +! printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ +! || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "failed to load site script $ac_site_file +! See 'config.log' for more details" "$LINENO" 5; } + fi + done + +*************** +*** 2897,2915 **** + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +! $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +! $as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +--- 2856,3524 ---- + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +! printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +! printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + ++ # Test code for whether the C compiler supports C89 (global declarations) ++ ac_c_conftest_c89_globals=' ++ /* Does the compiler advertise C89 conformance? ++ Do not test the value of __STDC__, because some compilers set it to 0 ++ while being otherwise adequately conformant. */ ++ #if !defined __STDC__ ++ # error "Compiler does not advertise C89 conformance" ++ #endif ++ ++ #include ++ #include ++ struct stat; ++ /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ ++ struct buf { int x; }; ++ struct buf * (*rcsopen) (struct buf *, struct stat *, int); ++ static char *e (char **p, int i) ++ { ++ return p[i]; ++ } ++ static char *f (char * (*g) (char **, int), char **p, ...) ++ { ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++ } ++ ++ /* C89 style stringification. */ ++ #define noexpand_stringify(a) #a ++ const char *stringified = noexpand_stringify(arbitrary+token=sequence); ++ ++ /* C89 style token pasting. Exercises some of the corner cases that ++ e.g. old MSVC gets wrong, but not very hard. */ ++ #define noexpand_concat(a,b) a##b ++ #define expand_concat(a,b) noexpand_concat(a,b) ++ extern int vA; ++ extern int vbee; ++ #define aye A ++ #define bee B ++ int *pvA = &expand_concat(v,aye); ++ int *pvbee = &noexpand_concat(v,bee); ++ ++ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not \xHH hex character constants. ++ These do not provoke an error unfortunately, instead are silently treated ++ as an "x". The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously \x00 != x always comes out true, for an ++ array size at least. It is necessary to write \x00 == 0 to get something ++ that is true only with -std. */ ++ int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; ++ ++ /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++ #define FOO(x) '\''x'\'' ++ int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; ++ ++ int test (int i, double x); ++ struct s1 {int (*f) (int a);}; ++ struct s2 {int (*f) (double a);}; ++ int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), ++ int, int);' ++ ++ # Test code for whether the C compiler supports C89 (body of main). ++ ac_c_conftest_c89_main=' ++ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); ++ ' ++ ++ # Test code for whether the C compiler supports C99 (global declarations) ++ ac_c_conftest_c99_globals=' ++ /* Does the compiler advertise C99 conformance? */ ++ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L ++ # error "Compiler does not advertise C99 conformance" ++ #endif ++ ++ // See if C++-style comments work. ++ ++ #include ++ extern int puts (const char *); ++ extern int printf (const char *, ...); ++ extern int dprintf (int, const char *, ...); ++ extern void *malloc (size_t); ++ extern void free (void *); ++ ++ // Check varargs macros. These examples are taken from C99 6.10.3.5. ++ // dprintf is used instead of fprintf to avoid needing to declare ++ // FILE and stderr. ++ #define debug(...) dprintf (2, __VA_ARGS__) ++ #define showlist(...) puts (#__VA_ARGS__) ++ #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) ++ static void ++ test_varargs_macros (void) ++ { ++ int x = 1234; ++ int y = 5678; ++ debug ("Flag"); ++ debug ("X = %d\n", x); ++ showlist (The first, second, and third items.); ++ report (x>y, "x is %d but y is %d", x, y); ++ } ++ ++ // Check long long types. ++ #define BIG64 18446744073709551615ull ++ #define BIG32 4294967295ul ++ #define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) ++ #if !BIG_OK ++ #error "your preprocessor is broken" ++ #endif ++ #if BIG_OK ++ #else ++ #error "your preprocessor is broken" ++ #endif ++ static long long int bignum = -9223372036854775807LL; ++ static unsigned long long int ubignum = BIG64; ++ ++ struct incomplete_array ++ { ++ int datasize; ++ double data[]; ++ }; ++ ++ struct named_init { ++ int number; ++ const wchar_t *name; ++ double average; ++ }; ++ ++ typedef const char *ccp; ++ ++ static inline int ++ test_restrict (ccp restrict text) ++ { ++ // Iterate through items via the restricted pointer. ++ // Also check for declarations in for loops. ++ for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) ++ continue; ++ return 0; ++ } ++ ++ // Check varargs and va_copy. ++ static bool ++ test_varargs (const char *format, ...) ++ { ++ va_list args; ++ va_start (args, format); ++ va_list args_copy; ++ va_copy (args_copy, args); ++ ++ const char *str = ""; ++ int number = 0; ++ float fnumber = 0; ++ ++ while (*format) ++ { ++ switch (*format++) ++ { ++ case '\''s'\'': // string ++ str = va_arg (args_copy, const char *); ++ break; ++ case '\''d'\'': // int ++ number = va_arg (args_copy, int); ++ break; ++ case '\''f'\'': // float ++ fnumber = va_arg (args_copy, double); ++ break; ++ default: ++ break; ++ } ++ } ++ va_end (args_copy); ++ va_end (args); ++ ++ return *str && number && fnumber; ++ } ++ ' ++ ++ # Test code for whether the C compiler supports C99 (body of main). ++ ac_c_conftest_c99_main=' ++ // Check bool. ++ _Bool success = false; ++ success |= (argc != 0); ++ ++ // Check restrict. ++ if (test_restrict ("String literal") == 0) ++ success = true; ++ char *restrict newvar = "Another string"; ++ ++ // Check varargs. ++ success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); ++ test_varargs_macros (); ++ ++ // Check flexible array members. ++ struct incomplete_array *ia = ++ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); ++ ia->datasize = 10; ++ for (int i = 0; i < ia->datasize; ++i) ++ ia->data[i] = i * 1.234; ++ // Work around memory leak warnings. ++ free (ia); ++ ++ // Check named initializers. ++ struct named_init ni = { ++ .number = 34, ++ .name = L"Test wide string", ++ .average = 543.34343, ++ }; ++ ++ ni.number = 58; ++ ++ int dynamic_array[ni.number]; ++ dynamic_array[0] = argv[0][0]; ++ dynamic_array[ni.number - 1] = 543; ++ ++ // work around unused variable warnings ++ ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' ++ || dynamic_array[ni.number - 1] != 543); ++ ' ++ ++ # Test code for whether the C compiler supports C11 (global declarations) ++ ac_c_conftest_c11_globals=' ++ /* Does the compiler advertise C11 conformance? */ ++ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L ++ # error "Compiler does not advertise C11 conformance" ++ #endif ++ ++ // Check _Alignas. ++ char _Alignas (double) aligned_as_double; ++ char _Alignas (0) no_special_alignment; ++ extern char aligned_as_int; ++ char _Alignas (0) _Alignas (int) aligned_as_int; ++ ++ // Check _Alignof. ++ enum ++ { ++ int_alignment = _Alignof (int), ++ int_array_alignment = _Alignof (int[100]), ++ char_alignment = _Alignof (char) ++ }; ++ _Static_assert (0 < -_Alignof (int), "_Alignof is signed"); ++ ++ // Check _Noreturn. ++ int _Noreturn does_not_return (void) { for (;;) continue; } ++ ++ // Check _Static_assert. ++ struct test_static_assert ++ { ++ int x; ++ _Static_assert (sizeof (int) <= sizeof (long int), ++ "_Static_assert does not work in struct"); ++ long int y; ++ }; ++ ++ // Check UTF-8 literals. ++ #define u8 syntax error! ++ char const utf8_literal[] = u8"happens to be ASCII" "another string"; ++ ++ // Check duplicate typedefs. ++ typedef long *long_ptr; ++ typedef long int *long_ptr; ++ typedef long_ptr long_ptr; ++ ++ // Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. ++ struct anonymous ++ { ++ union { ++ struct { int i; int j; }; ++ struct { int k; long int l; } w; ++ }; ++ int m; ++ } v1; ++ ' ++ ++ # Test code for whether the C compiler supports C11 (body of main). ++ ac_c_conftest_c11_main=' ++ _Static_assert ((offsetof (struct anonymous, i) ++ == offsetof (struct anonymous, w.k)), ++ "Anonymous union alignment botch"); ++ v1.i = 2; ++ v1.w.k = 5; ++ ok |= v1.i != 5; ++ ' ++ ++ # Test code for whether the C compiler supports C11 (complete). ++ ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} ++ ${ac_c_conftest_c99_globals} ++ ${ac_c_conftest_c11_globals} ++ ++ int ++ main (int argc, char **argv) ++ { ++ int ok = 0; ++ ${ac_c_conftest_c89_main} ++ ${ac_c_conftest_c99_main} ++ ${ac_c_conftest_c11_main} ++ return ok; ++ } ++ " ++ ++ # Test code for whether the C compiler supports C99 (complete). ++ ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} ++ ${ac_c_conftest_c99_globals} ++ ++ int ++ main (int argc, char **argv) ++ { ++ int ok = 0; ++ ${ac_c_conftest_c89_main} ++ ${ac_c_conftest_c99_main} ++ return ok; ++ } ++ " ++ ++ # Test code for whether the C compiler supports C89 (complete). ++ ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} ++ ++ int ++ main (int argc, char **argv) ++ { ++ int ok = 0; ++ ${ac_c_conftest_c89_main} ++ return ok; ++ } ++ " ++ ++ # Test code for whether the C++ compiler supports C++98 (global declarations) ++ ac_cxx_conftest_cxx98_globals=' ++ // Does the compiler advertise C++98 conformance? ++ #if !defined __cplusplus || __cplusplus < 199711L ++ # error "Compiler does not advertise C++98 conformance" ++ #endif ++ ++ // These inclusions are to reject old compilers that ++ // lack the unsuffixed header files. ++ #include ++ #include ++ ++ // and are *not* freestanding headers in C++98. ++ extern void assert (int); ++ namespace std { ++ extern int strcmp (const char *, const char *); ++ } ++ ++ // Namespaces, exceptions, and templates were all added after "C++ 2.0". ++ using std::exception; ++ using std::strcmp; ++ ++ namespace { ++ ++ void test_exception_syntax() ++ { ++ try { ++ throw "test"; ++ } catch (const char *s) { ++ // Extra parentheses suppress a warning when building autoconf itself, ++ // due to lint rules shared with more typical C programs. ++ assert (!(strcmp) (s, "test")); ++ } ++ } ++ ++ template struct test_template ++ { ++ T const val; ++ explicit test_template(T t) : val(t) {} ++ template T add(U u) { return static_cast(u) + val; } ++ }; ++ ++ } // anonymous namespace ++ ' ++ ++ # Test code for whether the C++ compiler supports C++98 (body of main) ++ ac_cxx_conftest_cxx98_main=' ++ assert (argc); ++ assert (! argv[0]); ++ { ++ test_exception_syntax (); ++ test_template tt (2.0); ++ assert (tt.add (4) == 6.0); ++ assert (true && !false); ++ } ++ ' ++ ++ # Test code for whether the C++ compiler supports C++11 (global declarations) ++ ac_cxx_conftest_cxx11_globals=' ++ // Does the compiler advertise C++ 2011 conformance? ++ #if !defined __cplusplus || __cplusplus < 201103L ++ # error "Compiler does not advertise C++11 conformance" ++ #endif ++ ++ namespace cxx11test ++ { ++ constexpr int get_val() { return 20; } ++ ++ struct testinit ++ { ++ int i; ++ double d; ++ }; ++ ++ class delegate ++ { ++ public: ++ delegate(int n) : n(n) {} ++ delegate(): delegate(2354) {} ++ ++ virtual int getval() { return this->n; }; ++ protected: ++ int n; ++ }; ++ ++ class overridden : public delegate ++ { ++ public: ++ overridden(int n): delegate(n) {} ++ virtual int getval() override final { return this->n * 2; } ++ }; ++ ++ class nocopy ++ { ++ public: ++ nocopy(int i): i(i) {} ++ nocopy() = default; ++ nocopy(const nocopy&) = delete; ++ nocopy & operator=(const nocopy&) = delete; ++ private: ++ int i; ++ }; ++ ++ // for testing lambda expressions ++ template Ret eval(Fn f, Ret v) ++ { ++ return f(v); ++ } ++ ++ // for testing variadic templates and trailing return types ++ template auto sum(V first) -> V ++ { ++ return first; ++ } ++ template auto sum(V first, Args... rest) -> V ++ { ++ return first + sum(rest...); ++ } ++ } ++ ' ++ ++ # Test code for whether the C++ compiler supports C++11 (body of main) ++ ac_cxx_conftest_cxx11_main=' ++ { ++ // Test auto and decltype ++ auto a1 = 6538; ++ auto a2 = 48573953.4; ++ auto a3 = "String literal"; ++ ++ int total = 0; ++ for (auto i = a3; *i; ++i) { total += *i; } ++ ++ decltype(a2) a4 = 34895.034; ++ } ++ { ++ // Test constexpr ++ short sa[cxx11test::get_val()] = { 0 }; ++ } ++ { ++ // Test initializer lists ++ cxx11test::testinit il = { 4323, 435234.23544 }; ++ } ++ { ++ // Test range-based for ++ int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, ++ 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; ++ for (auto &x : array) { x += 23; } ++ } ++ { ++ // Test lambda expressions ++ using cxx11test::eval; ++ assert (eval ([](int x) { return x*2; }, 21) == 42); ++ double d = 2.0; ++ assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); ++ assert (d == 5.0); ++ assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); ++ assert (d == 5.0); ++ } ++ { ++ // Test use of variadic templates ++ using cxx11test::sum; ++ auto a = sum(1); ++ auto b = sum(1, 2); ++ auto c = sum(1.0, 2.0, 3.0); ++ } ++ { ++ // Test constructor delegation ++ cxx11test::delegate d1; ++ cxx11test::delegate d2(); ++ cxx11test::delegate d3(45); ++ } ++ { ++ // Test override and final ++ cxx11test::overridden o1(55464); ++ } ++ { ++ // Test nullptr ++ char *c = nullptr; ++ } ++ { ++ // Test template brackets ++ test_template<::test_template> v(test_template(12)); ++ } ++ { ++ // Unicode literals ++ char const *utf8 = u8"UTF-8 string \u2500"; ++ char16_t const *utf16 = u"UTF-8 string \u2500"; ++ char32_t const *utf32 = U"UTF-32 string \u2500"; ++ } ++ ' ++ ++ # Test code for whether the C compiler supports C++11 (complete). ++ ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} ++ ${ac_cxx_conftest_cxx11_globals} ++ ++ int ++ main (int argc, char **argv) ++ { ++ int ok = 0; ++ ${ac_cxx_conftest_cxx98_main} ++ ${ac_cxx_conftest_cxx11_main} ++ return ok; ++ } ++ " ++ ++ # Test code for whether the C compiler supports C++98 (complete). ++ ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} ++ int ++ main (int argc, char **argv) ++ { ++ int ok = 0; ++ ${ac_cxx_conftest_cxx98_main} ++ return ok; ++ } ++ " ++ ++ as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" ++ as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" ++ as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" ++ as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" ++ as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" ++ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" ++ as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" ++ as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" ++ as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" ++ as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" ++ ++ # Auxiliary files required by this configure script. ++ ac_aux_files="ltmain.sh compile missing install-sh config.guess config.sub" ++ ++ # Locations in which to look for auxiliary files. ++ ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." ++ ++ # Search for a directory containing all of the required auxiliary files, ++ # $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. ++ # If we don't find one directory that contains all the files we need, ++ # we report the set of missing files from the *first* directory in ++ # $ac_aux_dir_candidates and give up. ++ ac_missing_aux_files="" ++ ac_first_candidate=: ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_found=false ++ for as_dir in $ac_aux_dir_candidates ++ do ++ IFS=$as_save_IFS ++ case $as_dir in #((( ++ '') as_dir=./ ;; ++ */) ;; ++ *) as_dir=$as_dir/ ;; ++ esac ++ as_found=: ++ ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 ++ ac_aux_dir_found=yes ++ ac_install_sh= ++ for ac_aux in $ac_aux_files ++ do ++ # As a special case, if "install-sh" is required, that requirement ++ # can be satisfied by any of "install-sh", "install.sh", or "shtool", ++ # and $ac_install_sh is set appropriately for whichever one is found. ++ if test x"$ac_aux" = x"install-sh" ++ then ++ if test -f "${as_dir}install-sh"; then ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 ++ ac_install_sh="${as_dir}install-sh -c" ++ elif test -f "${as_dir}install.sh"; then ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 ++ ac_install_sh="${as_dir}install.sh -c" ++ elif test -f "${as_dir}shtool"; then ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 ++ ac_install_sh="${as_dir}shtool install -c" ++ else ++ ac_aux_dir_found=no ++ if $ac_first_candidate; then ++ ac_missing_aux_files="${ac_missing_aux_files} install-sh" ++ else ++ break ++ fi ++ fi ++ else ++ if test -f "${as_dir}${ac_aux}"; then ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 ++ else ++ ac_aux_dir_found=no ++ if $ac_first_candidate; then ++ ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" ++ else ++ break ++ fi ++ fi ++ fi ++ done ++ if test "$ac_aux_dir_found" = yes; then ++ ac_aux_dir="$as_dir" ++ break ++ fi ++ ac_first_candidate=false ++ ++ as_found=false ++ done ++ IFS=$as_save_IFS ++ if $as_found ++ then : ++ ++ else case e in #( ++ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; ++ esac ++ fi ++ ++ ++ # These three variables are undocumented and unsupported, ++ # and are intended to be withdrawn in a future Autoconf release. ++ # They can cause serious problems if a builder's source tree is in a directory ++ # whose full name contains unusual characters. ++ if test -f "${ac_aux_dir}config.guess"; then ++ ac_config_guess="$SHELL ${ac_aux_dir}config.guess" ++ fi ++ if test -f "${ac_aux_dir}config.sub"; then ++ ac_config_sub="$SHELL ${ac_aux_dir}config.sub" ++ fi ++ if test -f "$ac_aux_dir/configure"; then ++ ac_configure="$SHELL ${ac_aux_dir}configure" ++ fi ++ + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +*************** +*** 2920,2931 **** + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +! { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +! $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +! { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +! $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) +--- 3529,3540 ---- + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +! printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +! printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) +*************** +*** 2934,2957 **** + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +! $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +! $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +! $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +! $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +! *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +--- 3543,3566 ---- + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +! printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +! printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +! printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +! printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +! *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +*************** +*** 2961,2971 **** + fi + done + if $ac_cache_corrupted; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +! $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +! as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +--- 3570,3581 ---- + fi + done + if $ac_cache_corrupted; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +! printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} +! as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' +! and start over" "$LINENO" 5 + fi + ## -------------------- ## + ## Main body of script. ## +*************** +*** 3020,3074 **** + echo "include(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')" >>$gmp_tmpconfigm4i + + +- ac_aux_dir= +- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi +- done +- if test -z "$ac_aux_dir"; then +- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +- fi +- +- # These three variables are undocumented and unsupported, +- # and are intended to be withdrawn in a future Autoconf release. +- # They can cause serious problems if a builder's source tree is in a directory +- # whose full name contains unusual characters. +- ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +- ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +- ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +- # Make sure we can run config.sub. +- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +! $as_echo_n "checking build system type... " >&6; } +! if ${ac_cv_build+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_build_alias=$build_alias + test "x$ac_build_alias" = x && +! ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +! ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +! as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +! $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; + *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +--- 3630,3660 ---- + echo "include(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')" >>$gmp_tmpconfigm4i + + + + + +! # Make sure we can run config.sub. +! $SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || +! as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +! printf %s "checking build system type... " >&6; } +! if test ${ac_cv_build+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_build_alias=$build_alias + test "x$ac_build_alias" = x && +! ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` + test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +! ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || +! as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +! printf "%s\n" "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; + *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*************** +*** 3087,3107 **** + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +! $as_echo_n "checking host system type... " >&6; } +! if ${ac_cv_host+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else +! ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +! as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +! $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; + *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +--- 3673,3695 ---- + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +! printf %s "checking host system type... " >&6; } +! if test ${ac_cv_host+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else +! ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || +! as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +! printf "%s\n" "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; + *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*************** +*** 3121,3129 **** + + + +! am__api_version='1.15' + +! # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: + # SysV /etc/install, /usr/sbin/install +--- 3709,3718 ---- + + + +! am__api_version='1.18' + +! +! # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: + # SysV /etc/install, /usr/sbin/install +*************** +*** 3137,3156 **** + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +! $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +! if ${ac_cv_path_install+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! # Account for people who put trailing slashes in PATH elements. +! case $as_dir/ in #(( +! ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; +--- 3726,3750 ---- + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +! printf %s "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +! if test ${ac_cv_path_install+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! # Account for fact that we put trailing slashes in our PATH walk. +! case $as_dir in #(( +! ./ | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; +*************** +*** 3160,3172 **** + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && +! grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && +! grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else +--- 3754,3766 ---- + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && +! grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && +! grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else +*************** +*** 3174,3185 **** + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir +! if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then +! ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi +--- 3768,3779 ---- + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir +! if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then +! ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + break 3 + fi + fi +*************** +*** 3193,3201 **** + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +! + fi +! if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a +--- 3787,3796 ---- + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +! ;; +! esac + fi +! if test ${ac_cv_path_install+y}; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a +*************** +*** 3205,3212 **** + INSTALL=$ac_install_sh + fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +! $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +--- 3800,3807 ---- + INSTALL=$ac_install_sh + fi + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +! printf "%s\n" "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +*************** +*** 3216,3233 **** + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +! $as_echo_n "checking whether build environment is sane... " >&6; } + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; + esac + +--- 3811,3991 ---- + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5 +! printf %s "checking whether sleep supports fractional seconds... " >&6; } +! if test ${am_cv_sleep_fractional_seconds+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if sleep 0.001 2>/dev/null +! then : +! am_cv_sleep_fractional_seconds=yes +! else case e in #( +! e) am_cv_sleep_fractional_seconds=no ;; +! esac +! fi +! ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5 +! printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; } +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5 +! printf %s "checking filesystem timestamp resolution... " >&6; } +! if test ${am_cv_filesystem_timestamp_resolution+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # Default to the worst case. +! am_cv_filesystem_timestamp_resolution=2 +! +! # Only try to go finer than 1 sec if sleep can do it. +! # Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work, +! # - 1 sec is not much of a win compared to 2 sec, and +! # - it takes 2 seconds to perform the test whether 1 sec works. +! # +! # Instead, just use the default 2s on platforms that have 1s resolution, +! # accept the extra 1s delay when using $sleep in the Automake tests, in +! # exchange for not incurring the 2s delay for running the test for all +! # packages. +! # +! am_try_resolutions= +! if test "$am_cv_sleep_fractional_seconds" = yes; then +! # Even a millisecond often causes a bunch of false positives, +! # so just try a hundredth of a second. The time saved between .001 and +! # .01 is not terribly consequential. +! am_try_resolutions="0.01 0.1 $am_try_resolutions" +! fi +! +! # In order to catch current-generation FAT out, we must *modify* files +! # that already exist; the *creation* timestamp is finer. Use names +! # that make ls -t sort them differently when they have equal +! # timestamps than when they have distinct timestamps, keeping +! # in mind that ls -t prints the *newest* file first. +! rm -f conftest.ts? +! : > conftest.ts1 +! : > conftest.ts2 +! : > conftest.ts3 +! +! # Make sure ls -t actually works. Do 'set' in a subshell so we don't +! # clobber the current shell's arguments. (Outer-level square brackets +! # are removed by m4; they're present so that m4 does not expand +! # ; be careful, easy to get confused.) +! if ( +! set X `ls -t conftest.ts[12]` && +! { +! test "$*" != "X conftest.ts1 conftest.ts2" || +! test "$*" != "X conftest.ts2 conftest.ts1"; +! } +! ); then :; else +! # If neither matched, then we have a broken ls. This can happen +! # if, for instance, CONFIG_SHELL is bash and it inherits a +! # broken ls alias from the environment. This has actually +! # happened. Such a system could not be considered "sane". +! printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5 +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +! as_fn_error $? "ls -t produces unexpected output. +! Make sure there is not a broken ls alias in your environment. +! See 'config.log' for more details" "$LINENO" 5; } +! fi +! +! for am_try_res in $am_try_resolutions; do +! # Any one fine-grained sleep might happen to cross the boundary +! # between two values of a coarser actual resolution, but if we do +! # two fine-grained sleeps in a row, at least one of them will fall +! # entirely within a coarse interval. +! echo alpha > conftest.ts1 +! sleep $am_try_res +! echo beta > conftest.ts2 +! sleep $am_try_res +! echo gamma > conftest.ts3 +! +! # We assume that 'ls -t' will make use of high-resolution +! # timestamps if the operating system supports them at all. +! if (set X `ls -t conftest.ts?` && +! test "$2" = conftest.ts3 && +! test "$3" = conftest.ts2 && +! test "$4" = conftest.ts1); then +! # +! # Ok, ls -t worked. If we're at a resolution of 1 second, we're done, +! # because we don't need to test make. +! make_ok=true +! if test $am_try_res != 1; then +! # But if we've succeeded so far with a subsecond resolution, we +! # have one more thing to check: make. It can happen that +! # everything else supports the subsecond mtimes, but make doesn't; +! # notably on macOS, which ships make 3.81 from 2006 (the last one +! # released under GPLv2). https://bugs.gnu.org/68808 +! # +! # We test $MAKE if it is defined in the environment, else "make". +! # It might get overridden later, but our hope is that in practice +! # it does not matter: it is the system "make" which is (by far) +! # the most likely to be broken, whereas if the user overrides it, +! # probably they did so with a better, or at least not worse, make. +! # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html +! # +! # Create a Makefile (real tab character here): +! rm -f conftest.mk +! echo 'conftest.ts1: conftest.ts2' >conftest.mk +! echo ' touch conftest.ts2' >>conftest.mk +! # +! # Now, running +! # touch conftest.ts1; touch conftest.ts2; make +! # should touch ts1 because ts2 is newer. This could happen by luck, +! # but most often, it will fail if make's support is insufficient. So +! # test for several consecutive successes. +! # +! # (We reuse conftest.ts[12] because we still want to modify existing +! # files, not create new ones, per above.) +! n=0 +! make=${MAKE-make} +! until test $n -eq 3; do +! echo one > conftest.ts1 +! sleep $am_try_res +! echo two > conftest.ts2 # ts2 should now be newer than ts1 +! if $make -f conftest.mk | grep 'up to date' >/dev/null; then +! make_ok=false +! break # out of $n loop +! fi +! n=`expr $n + 1` +! done +! fi +! # +! if $make_ok; then +! # Everything we know to check worked out, so call this resolution good. +! am_cv_filesystem_timestamp_resolution=$am_try_res +! break # out of $am_try_res loop +! fi +! # Otherwise, we'll go on to check the next resolution. +! fi +! done +! rm -f conftest.ts? +! # (end _am_filesystem_timestamp_resolution) +! ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5 +! printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; } +! +! # This check should not be cached, as it may vary across builds of +! # different projects. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +! printf %s "checking whether build environment is sane... " >&6; } + # Reject unsafe characters in $srcdir or the absolute working directory + # name. Accept space and tab only in the latter. + am_lf=' + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ printf "%s\n" "no" >&6; } + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ printf "%s\n" "no" >&6; } + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; + esac + +*************** +*** 3236,3284 **** + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). +! if ( +! am_has_slept=no +! for am_try in 1 2; do +! echo "timestamp, slept: $am_has_slept" > conftest.file +! set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +! if test "$*" = "X"; then +! # -L didn't work. +! set X `ls -t "$srcdir/configure" conftest.file` +! fi +! if test "$*" != "X $srcdir/configure conftest.file" \ +! && test "$*" != "X conftest.file $srcdir/configure"; then + +! # If neither matched, then we have a broken ls. This can happen +! # if, for instance, CONFIG_SHELL is bash and it inherits a +! # broken ls alias from the environment. This has actually +! # happened. Such a system could not be considered "sane". +! as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +! alias in your environment" "$LINENO" 5 +! fi +! if test "$2" = conftest.file || test $am_try -eq 2; then +! break +! fi +! # Just in case. +! sleep 1 +! am_has_slept=yes +! done +! test "$2" = conftest.file +! ) +! then +! # Ok. +! : +! else +! as_fn_error $? "newly created file is older than distributed files! + Check your system clock" "$LINENO" 5 + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } + # If we didn't sleep, we still need to ensure time stamps of config.status and + # generated files are strictly newer. + am_sleep_pid= +! if grep 'slept: no' conftest.file >/dev/null 2>&1; then +! ( sleep 1 ) & + am_sleep_pid=$! + fi + + rm -f conftest.file +--- 3994,4038 ---- + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). +! am_build_env_is_sane=no +! am_has_slept=no +! rm -f conftest.file +! for am_try in 1 2; do +! echo "timestamp, slept: $am_has_slept" > conftest.file +! if ( +! set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +! if test "$*" = "X"; then +! # -L didn't work. +! set X `ls -t "$srcdir/configure" conftest.file` +! fi +! test "$2" = conftest.file +! ); then +! am_build_env_is_sane=yes +! break +! fi +! # Just in case. +! sleep "$am_cv_filesystem_timestamp_resolution" +! am_has_slept=yes +! done + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5 +! printf "%s\n" "$am_build_env_is_sane" >&6; } +! if test "$am_build_env_is_sane" = no; then +! as_fn_error $? "newly created file is older than distributed files! + Check your system clock" "$LINENO" 5 + fi +! + # If we didn't sleep, we still need to ensure time stamps of config.status and + # generated files are strictly newer. + am_sleep_pid= +! if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1 +! then : +! +! else case e in #( +! e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) & + am_sleep_pid=$! ++ ;; ++ esac + fi + + rm -f conftest.file +*************** +*** 3289,3316 **** + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" + # Double any \ or $. +! # By default was `s,x,x', remove it if useless. + ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +! program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + + # Expand $ac_aux_dir to an absolute path. + am_aux_dir=`cd "$ac_aux_dir" && pwd` + +! if test x"${MISSING+set}" != xset; then +! case $am_aux_dir in +! *\ * | *\ *) +! MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +! *) +! MISSING="\${SHELL} $am_aux_dir/missing" ;; +! esac + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " + else + am_missing_run= +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +! $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + fi + + if test x"${install_sh+set}" != xset; then +--- 4043,4067 ---- + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" + # Double any \ or $. +! # By default was 's,x,x', remove it if useless. + ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +! program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` +! + + # Expand $ac_aux_dir to an absolute path. + am_aux_dir=`cd "$ac_aux_dir" && pwd` + +! +! if test x"${MISSING+set}" != xset; then +! MISSING="\${SHELL} '$am_aux_dir/missing'" + fi + # Use eval to expand $SHELL + if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " + else + am_missing_run= +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +! printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + fi + + if test x"${install_sh+set}" != xset; then +*************** +*** 3330,3367 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_STRIP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +! $as_echo "$STRIP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 4081,4124 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_STRIP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +! printf "%s\n" "$STRIP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 3370,3407 **** + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +! $as_echo "$ac_ct_STRIP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +--- 4127,4170 ---- + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_STRIP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +! printf "%s\n" "$ac_ct_STRIP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +*************** +*** 3409,3416 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + STRIP=$ac_ct_STRIP +--- 4172,4179 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + STRIP=$ac_ct_STRIP +*************** +*** 3422,3519 **** + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +! $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +! if ${ac_cv_path_mkdir+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do +! as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue +! case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +! 'mkdir (GNU coreutils) '* | \ +! 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) +! ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done + IFS=$as_save_IFS +! + fi + + test -d ./--version && rmdir ./--version +! if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +! # As a last resort, use the slow shell script. Don't cache a +! # value for MKDIR_P within a source directory, because that will +! # break other packages using the cache if that directory is +! # removed, or if the value is a relative name. +! MKDIR_P="$ac_install_sh -d" + fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +! $as_echo "$MKDIR_P" >&6; } + + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_AWK+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +! $as_echo "$AWK" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + + test -n "$AWK" && break + done + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +! $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} +! ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +! if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.make <<\_ACEOF + SHELL = /bin/sh + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +--- 4185,4294 ---- + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +! printf %s "checking for a race-free mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +! if test ${ac_cv_path_mkdir+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do +! as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue +! case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( +! 'mkdir ('*'coreutils) '* | \ +! *'BusyBox '* | \ + 'mkdir (fileutils) '4.1*) +! ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done + IFS=$as_save_IFS +! ;; +! esac + fi + + test -d ./--version && rmdir ./--version +! if test ${ac_cv_path_mkdir+y}; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +! # As a last resort, use plain mkdir -p, +! # in the hope it doesn't have the bugs of ancient mkdir. +! MKDIR_P='mkdir -p' + fi + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +! printf "%s\n" "$MKDIR_P" >&6; } + + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_AWK+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +! printf "%s\n" "$AWK" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + + test -n "$AWK" && break + done + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +! printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} +! ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +! if eval test \${ac_cv_prog_make_${ac_make}_set+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.make <<\_ACEOF + SHELL = /bin/sh + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +*************** +*** 3525,3539 **** + *) + eval ac_cv_prog_make_${ac_make}_set=no;; + esac +! rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } + SET_MAKE= + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +--- 4300,4315 ---- + *) + eval ac_cv_prog_make_${ac_make}_set=no;; + esac +! rm -f conftest.make ;; +! esac + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } + SET_MAKE= + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +*************** +*** 3546,3568 **** + fi + rmdir .tst 2>/dev/null + + # Check whether --enable-silent-rules was given. +! if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; + fi + +- case $enable_silent_rules in # ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=1;; +- esac + am_make=${MAKE-make} +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +! $as_echo_n "checking whether $am_make supports nested variables... " >&6; } +! if ${am_cv_make_support_nested_variables+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if $as_echo 'TRUE=$(BAR$(V)) + BAR0=false + BAR1=true + V=1 +--- 4322,4342 ---- + fi + rmdir .tst 2>/dev/null + ++ AM_DEFAULT_VERBOSITY=1 + # Check whether --enable-silent-rules was given. +! if test ${enable_silent_rules+y} +! then : + enableval=$enable_silent_rules; + fi + + am_make=${MAKE-make} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +! printf %s "checking whether $am_make supports nested variables... " >&6; } +! if test ${am_cv_make_support_nested_variables+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if printf "%s\n" 'TRUE=$(BAR$(V)) + BAR0=false + BAR1=true + V=1 +*************** +*** 3572,3589 **** + am_cv_make_support_nested_variables=yes + else + am_cv_make_support_nested_variables=no + fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +! $as_echo "$am_cv_make_support_nested_variables" >&6; } +! if test $am_cv_make_support_nested_variables = yes; then +! AM_V='$(V)' +! AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +! else +! AM_V=$AM_DEFAULT_VERBOSITY +! AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY + fi +- AM_BACKSLASH='\' + + if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +--- 4346,4394 ---- + am_cv_make_support_nested_variables=yes + else + am_cv_make_support_nested_variables=no ++ fi ;; ++ esac + fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 ++ printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } ++ AM_BACKSLASH='\' ++ ++ am__rm_f_notfound= ++ if (rm -f && rm -fr && rm -rf) 2>/dev/null ++ then : ++ ++ else case e in #( ++ e) am__rm_f_notfound='""' ;; ++ esac + fi +! +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5 +! printf %s "checking xargs -n works... " >&6; } +! if test ${am_cv_xargs_n_works+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2 +! 3" +! then : +! am_cv_xargs_n_works=yes +! else case e in #( +! e) am_cv_xargs_n_works=no ;; +! esac +! fi ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5 +! printf "%s\n" "$am_cv_xargs_n_works" >&6; } +! if test "$am_cv_xargs_n_works" = yes +! then : +! am__xargs_n='xargs -n' +! else case e in #( +! e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }' +! ;; +! esac + fi + + if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +*************** +*** 3610,3623 **** + VERSION='6.3.0' + + +! cat >>confdefs.h <<_ACEOF +! #define PACKAGE "$PACKAGE" +! _ACEOF + + +! cat >>confdefs.h <<_ACEOF +! #define VERSION "$VERSION" +! _ACEOF + + # Some tools Automake needs. + +--- 4415,4424 ---- + VERSION='6.3.0' + + +! printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h + + +! printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h + + # Some tools Automake needs. + +*************** +*** 3637,3644 **** + + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +! # +! # + mkdir_p='$(MKDIR_P)' + + # We need awk for the "check" target (and possibly the TAP driver). The +--- 4438,4445 ---- + + # For better backward compatibility. To be removed once Automake 1.9.x + # dies out for good. For more background, see: +! # +! # + mkdir_p='$(MKDIR_P)' + + # We need awk for the "check" target (and possibly the TAP driver). The +*************** +*** 3649,3719 **** + + + # We'll loop over all known methods to create a tar archive until one works. +! _am_tools='gnutar pax cpio none' + +! am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +- # POSIX will say in a future version that running "rm -f" with no argument +- # is OK; and we want to be able to make that assumption in our Makefile +- # recipes. So use an aggressive probe to check that the usage we want is +- # actually supported "in the wild" to an acceptable degree. +- # See automake bug#10828. +- # To make any issue more visible, cause the running configure to be aborted +- # by default if the 'rm' program in use doesn't match our expectations; the +- # user can still override this though. +- if rm -f && rm -fr && rm -rf; then : OK; else +- cat >&2 <<'END' +- Oops! + +- Your 'rm' program seems unable to run without file operands specified +- on the command line, even when the '-f' option is present. This is contrary +- to the behaviour of most rm programs out there, and not conforming with +- the upcoming POSIX standard: + +! Please tell bug-automake@gnu.org about your system, including the value +! of your $PATH and any error possibly output before this message. This +! can help us improve future automake versions. + +- END +- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then +- echo 'Configuration will proceed anyway, since you have set the' >&2 +- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 +- echo >&2 +- else +- cat >&2 <<'END' +- Aborting the configuration process, to ensure you take notice of the issue. + +- You can download and install GNU coreutils to get an 'rm' implementation +- that behaves properly: . + +- If you want to complete the configuration process using your problematic +- 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +- to "yes", and re-run configure. + +- END +- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 +- fi +- fi + + ac_config_headers="$ac_config_headers config.h:config.in" + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +! $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +! if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +! else +! USE_MAINTAINER_MODE=no + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +! $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +--- 4450,4622 ---- + + + # We'll loop over all known methods to create a tar archive until one works. +! _am_tools='gnutar plaintar pax cpio none' + +! # The POSIX 1988 'ustar' format is defined with fixed-size fields. +! # There is notably a 21 bits limit for the UID and the GID. In fact, +! # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 +! # and bug#13588). +! am_max_uid=2097151 # 2^21 - 1 +! am_max_gid=$am_max_uid +! # The $UID and $GID variables are not portable, so we need to resort +! # to the POSIX-mandated id(1) utility. Errors in the 'id' calls +! # below are definitely unexpected, so allow the users to see them +! # (that is, avoid stderr redirection). +! am_uid=`id -u || echo unknown` +! am_gid=`id -g || echo unknown` +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +! printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; } +! if test x$am_uid = xunknown; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5 +! printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;} +! elif test $am_uid -le $am_max_uid; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } +! else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! _am_tools=none +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +! printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; } +! if test x$gm_gid = xunknown; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5 +! printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;} +! elif test $am_gid -le $am_max_gid; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } +! else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! _am_tools=none +! fi +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +! printf %s "checking how to create a ustar tar archive... " >&6; } +! +! # Go ahead even if we have the value already cached. We do so because we +! # need to set the values for the 'am__tar' and 'am__untar' variables. +! _am_tools=${am_cv_prog_tar_ustar-$_am_tools} +! +! for _am_tool in $_am_tools; do +! case $_am_tool in +! gnutar) +! for _am_tar in tar gnutar gtar; do +! { echo "$as_me:$LINENO: $_am_tar --version" >&5 +! ($_am_tar --version) >&5 2>&5 +! ac_status=$? +! echo "$as_me:$LINENO: \$? = $ac_status" >&5 +! (exit $ac_status); } && break +! done +! am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' +! am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' +! am__untar="$_am_tar -xf -" +! ;; +! plaintar) +! # Must skip GNU tar: if it does not support --format= it doesn't create +! # ustar tarball either. +! (tar --version) >/dev/null 2>&1 && continue +! am__tar='tar chf - "$$tardir"' +! am__tar_='tar chf - "$tardir"' +! am__untar='tar xf -' +! ;; +! pax) +! am__tar='pax -L -x ustar -w "$$tardir"' +! am__tar_='pax -L -x ustar -w "$tardir"' +! am__untar='pax -r' +! ;; +! cpio) +! am__tar='find "$$tardir" -print | cpio -o -H ustar -L' +! am__tar_='find "$tardir" -print | cpio -o -H ustar -L' +! am__untar='cpio -i -H ustar -d' +! ;; +! none) +! am__tar=false +! am__tar_=false +! am__untar=false +! ;; +! esac + ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_ustar}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works. ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 ++ (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ { echo "$as_me:$LINENO: $am__untar &5 ++ ($am__untar &5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 ++ (cat conftest.dir/file) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ++ fi ++ done ++ rm -rf conftest.dir + ++ if test ${am_cv_prog_tar_ustar+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) am_cv_prog_tar_ustar=$_am_tool ;; ++ esac ++ fi + ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 ++ printf "%s\n" "$am_cv_prog_tar_ustar" >&6; } + + + + + +! # Variables for tags utilities; see am/tags.am +! if test -z "$CTAGS"; then +! CTAGS=ctags +! fi +! +! if test -z "$ETAGS"; then +! ETAGS=etags +! fi +! +! if test -z "$CSCOPE"; then +! CSCOPE=cscope +! fi +! +! + + + + + + ac_config_headers="$ac_config_headers config.h:config.in" + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +! printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +! if test ${enable_maintainer_mode+y} +! then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +! else case e in #( +! e) USE_MAINTAINER_MODE=no ;; +! esac + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +! printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +*************** +*** 3728,3746 **** + + + # Check whether --enable-assert was given. +! if test "${enable_assert+set}" = set; then : + enableval=$enable_assert; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-assert, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_assert=no + fi + + + if test "$enable_assert" = "yes"; then + +! $as_echo "#define WANT_ASSERT 1" >>confdefs.h + + want_assert_01=1 + else +--- 4631,4651 ---- + + + # Check whether --enable-assert was given. +! if test ${enable_assert+y} +! then : + enableval=$enable_assert; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-assert, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_assert=no ;; +! esac + fi + + + if test "$enable_assert" = "yes"; then + +! printf "%s\n" "#define WANT_ASSERT 1" >>confdefs.h + + want_assert_01=1 + else +*************** +*** 3752,3758 **** + + + # Check whether --enable-alloca was given. +! if test "${enable_alloca+set}" = set; then : + enableval=$enable_alloca; case $enableval in + alloca|malloc-reentrant|malloc-notreentrant) ;; + yes|no|reentrant|notreentrant) ;; +--- 4657,4664 ---- + + + # Check whether --enable-alloca was given. +! if test ${enable_alloca+y} +! then : + enableval=$enable_alloca; case $enableval in + alloca|malloc-reentrant|malloc-notreentrant) ;; + yes|no|reentrant|notreentrant) ;; +*************** +*** 3761,3768 **** + as_fn_error $? "bad value $enableval for --enable-alloca, need one of: + yes no reentrant notreentrant alloca malloc-reentrant malloc-notreentrant debug" "$LINENO" 5 ;; + esac +! else +! enable_alloca=reentrant + fi + + +--- 4667,4675 ---- + as_fn_error $? "bad value $enableval for --enable-alloca, need one of: + yes no reentrant notreentrant alloca malloc-reentrant malloc-notreentrant debug" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_alloca=reentrant ;; +! esac + fi + + +*************** +*** 3780,3846 **** + # wanted. + # + # Check whether --enable-cxx was given. +! if test "${enable_cxx+set}" = set; then : + enableval=$enable_cxx; case $enableval in + yes|no|detect) ;; + *) as_fn_error $? "bad value $enableval for --enable-cxx, need yes/no/detect" "$LINENO" 5 ;; + esac +! else +! enable_cxx=no + fi + + + + # Check whether --enable-assembly was given. +! if test "${enable_assembly+set}" = set; then : + enableval=$enable_assembly; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-assembly, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_assembly=yes + fi + + + + # Check whether --enable-fft was given. +! if test "${enable_fft+set}" = set; then : + enableval=$enable_fft; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-fft, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_fft=yes + fi + + + if test "$enable_fft" = "yes"; then + +! $as_echo "#define WANT_FFT 1" >>confdefs.h + + fi + + + # Check whether --enable-old-fft-full was given. +! if test "${enable_old_fft_full+set}" = set; then : + enableval=$enable_old_fft_full; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-old-fft-full, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_old_fft_full=no + fi + + + if test "$enable_old_fft_full" = "yes"; then + +! $as_echo "#define WANT_OLD_FFT_FULL 1" >>confdefs.h + + fi + + + # Check whether --enable-nails was given. +! if test "${enable_nails+set}" = set; then : + enableval=$enable_nails; case $enableval in + yes|no|[02468]|[0-9][02468]) ;; + *[13579]) +--- 4687,4762 ---- + # wanted. + # + # Check whether --enable-cxx was given. +! if test ${enable_cxx+y} +! then : + enableval=$enable_cxx; case $enableval in + yes|no|detect) ;; + *) as_fn_error $? "bad value $enableval for --enable-cxx, need yes/no/detect" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_cxx=no ;; +! esac + fi + + + + # Check whether --enable-assembly was given. +! if test ${enable_assembly+y} +! then : + enableval=$enable_assembly; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-assembly, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_assembly=yes ;; +! esac + fi + + + + # Check whether --enable-fft was given. +! if test ${enable_fft+y} +! then : + enableval=$enable_fft; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-fft, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_fft=yes ;; +! esac + fi + + + if test "$enable_fft" = "yes"; then + +! printf "%s\n" "#define WANT_FFT 1" >>confdefs.h + + fi + + + # Check whether --enable-old-fft-full was given. +! if test ${enable_old_fft_full+y} +! then : + enableval=$enable_old_fft_full; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-old-fft-full, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_old_fft_full=no ;; +! esac + fi + + + if test "$enable_old_fft_full" = "yes"; then + +! printf "%s\n" "#define WANT_OLD_FFT_FULL 1" >>confdefs.h + + fi + + + # Check whether --enable-nails was given. +! if test ${enable_nails+y} +! then : + enableval=$enable_nails; case $enableval in + yes|no|[02468]|[0-9][02468]) ;; + *[13579]) +*************** +*** 3848,3855 **** + *) + as_fn_error $? "bad value $enableval for --enable-nails, need yes/no/number" "$LINENO" 5 ;; + esac +! else +! enable_nails=no + fi + + +--- 4764,4772 ---- + *) + as_fn_error $? "bad value $enableval for --enable-nails, need yes/no/number" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_nails=no ;; +! esac + fi + + +*************** +*** 3862,3891 **** + + + # Check whether --enable-profiling was given. +! if test "${enable_profiling+set}" = set; then : + enableval=$enable_profiling; case $enableval in + no|prof|gprof|instrument) ;; + *) as_fn_error $? "bad value $enableval for --enable-profiling, need no/prof/gprof/instrument" "$LINENO" 5 ;; + esac +! else +! enable_profiling=no + fi + + + case $enable_profiling in + prof) + +! $as_echo "#define WANT_PROFILING_PROF 1" >>confdefs.h + + ;; + gprof) + +! $as_echo "#define WANT_PROFILING_GPROF 1" >>confdefs.h + + ;; + instrument) + +! $as_echo "#define WANT_PROFILING_INSTRUMENT 1" >>confdefs.h + + ;; + esac +--- 4779,4810 ---- + + + # Check whether --enable-profiling was given. +! if test ${enable_profiling+y} +! then : + enableval=$enable_profiling; case $enableval in + no|prof|gprof|instrument) ;; + *) as_fn_error $? "bad value $enableval for --enable-profiling, need no/prof/gprof/instrument" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_profiling=no ;; +! esac + fi + + + case $enable_profiling in + prof) + +! printf "%s\n" "#define WANT_PROFILING_PROF 1" >>confdefs.h + + ;; + gprof) + +! printf "%s\n" "#define WANT_PROFILING_GPROF 1" >>confdefs.h + + ;; + instrument) + +! printf "%s\n" "#define WANT_PROFILING_INSTRUMENT 1" >>confdefs.h + + ;; + esac +*************** +*** 3904,3958 **** + + + # Check whether --with-readline was given. +! if test "${with_readline+set}" = set; then : + withval=$with_readline; case $withval in + yes|no|detect) ;; + *) as_fn_error $? "bad value $withval for --with-readline, need yes/no/detect" "$LINENO" 5 ;; + esac +! else +! with_readline=detect + fi + + + + # Check whether --enable-fat was given. +! if test "${enable_fat+set}" = set; then : + enableval=$enable_fat; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-fat, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_fat=no + fi + + + + # Check whether --enable-minithres was given. +! if test "${enable_minithres+set}" = set; then : + enableval=$enable_minithres; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-minithres, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_minithres=no + fi + + + + # Check whether --enable-fake-cpuid was given. +! if test "${enable_fake_cpuid+set}" = set; then : + enableval=$enable_fake_cpuid; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-fake-cpuid, need yes or no" "$LINENO" 5 ;; + esac +! else +! enable_fake_cpuid=no + fi + + + if test "$enable_fake_cpuid" = "yes"; then + +! $as_echo "#define WANT_FAKE_CPUID 1" >>confdefs.h + + fi + +--- 4823,4885 ---- + + + # Check whether --with-readline was given. +! if test ${with_readline+y} +! then : + withval=$with_readline; case $withval in + yes|no|detect) ;; + *) as_fn_error $? "bad value $withval for --with-readline, need yes/no/detect" "$LINENO" 5 ;; + esac +! else case e in #( +! e) with_readline=detect ;; +! esac + fi + + + + # Check whether --enable-fat was given. +! if test ${enable_fat+y} +! then : + enableval=$enable_fat; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-fat, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_fat=no ;; +! esac + fi + + + + # Check whether --enable-minithres was given. +! if test ${enable_minithres+y} +! then : + enableval=$enable_minithres; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-minithres, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_minithres=no ;; +! esac + fi + + + + # Check whether --enable-fake-cpuid was given. +! if test ${enable_fake_cpuid+y} +! then : + enableval=$enable_fake_cpuid; case $enableval in + yes|no) ;; + *) as_fn_error $? "bad value $enableval for --enable-fake-cpuid, need yes or no" "$LINENO" 5 ;; + esac +! else case e in #( +! e) enable_fake_cpuid=no ;; +! esac + fi + + + if test "$enable_fake_cpuid" = "yes"; then + +! printf "%s\n" "#define WANT_FAKE_CPUID 1" >>confdefs.h + + fi + +*************** +*** 3967,3975 **** + + + tmp_host=`echo $host_cpu | sed 's/\./_/'` +! cat >>confdefs.h <<_ACEOF +! #define HAVE_HOST_CPU_$tmp_host 1 +! _ACEOF + + + echo "define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')" >> $gmp_tmpconfigm4p +--- 4894,4900 ---- + + + tmp_host=`echo $host_cpu | sed 's/\./_/'` +! printf "%s\n" "#define HAVE_HOST_CPU_$tmp_host 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')" >> $gmp_tmpconfigm4p +*************** +*** 4104,4110 **** + case $host in + + alpha*-*-*) +! $as_echo "#define HAVE_HOST_CPU_FAMILY_alpha 1" >>confdefs.h + + case $host_cpu in + alphaev5* | alphapca5*) +--- 5029,5035 ---- + case $host in + + alpha*-*-*) +! printf "%s\n" "#define HAVE_HOST_CPU_FAMILY_alpha 1" >>confdefs.h + + case $host_cpu in + alphaev5* | alphapca5*) +*************** +*** 4615,4621 **** + # Motorola 68k + # + m68k-*-* | m68[0-9][0-9][0-9]-*-*) +! $as_echo "#define HAVE_HOST_CPU_FAMILY_m68k 1" >>confdefs.h + + + echo "include_mpn(\`m68k/m68k-defs.m4')" >> $gmp_tmpconfigm4i +--- 5540,5546 ---- + # Motorola 68k + # + m68k-*-* | m68[0-9][0-9][0-9]-*-*) +! printf "%s\n" "#define HAVE_HOST_CPU_FAMILY_m68k 1" >>confdefs.h + + + echo "include_mpn(\`m68k/m68k-defs.m4')" >> $gmp_tmpconfigm4i +*************** +*** 4744,4750 **** + # "-arch ppc" or some such, but that's already the default.) + # + powerpc*-*-* | power[3-9]-*-* | power1[0-9]-*-*) +! $as_echo "#define HAVE_HOST_CPU_FAMILY_powerpc 1" >>confdefs.h + + HAVE_HOST_CPU_FAMILY_powerpc=1 + abilist="32" +--- 5669,5675 ---- + # "-arch ppc" or some such, but that's already the default.) + # + powerpc*-*-* | power[3-9]-*-* | power1[0-9]-*-*) +! printf "%s\n" "#define HAVE_HOST_CPU_FAMILY_powerpc 1" >>confdefs.h + + HAVE_HOST_CPU_FAMILY_powerpc=1 + abilist="32" +*************** +*** 4976,4982 **** + + # POWER 32-bit + power-*-* | power[12]-*-* | power2sc-*-*) +! $as_echo "#define HAVE_HOST_CPU_FAMILY_power 1" >>confdefs.h + + HAVE_HOST_CPU_FAMILY_power=1 + cclist="gcc" +--- 5901,5907 ---- + + # POWER 32-bit + power-*-* | power[12]-*-* | power2sc-*-*) +! printf "%s\n" "#define HAVE_HOST_CPU_FAMILY_power 1" >>confdefs.h + + HAVE_HOST_CPU_FAMILY_power=1 + cclist="gcc" +*************** +*** 5081,5091 **** + esac + + if test x"$cpu" != x ; then +! cat >>confdefs.h <<_ACEOF +! #define HAVE_HOST_CPU_s390_$cpu 1 +! _ACEOF + +! $as_echo "#define HAVE_HOST_CPU_s390_zarch 1" >>confdefs.h + + path="s390_32/esame s390_32" + fi +--- 6006,6014 ---- + esac + + if test x"$cpu" != x ; then +! printf "%s\n" "#define HAVE_HOST_CPU_s390_$cpu 1" >>confdefs.h + +! printf "%s\n" "#define HAVE_HOST_CPU_s390_zarch 1" >>confdefs.h + + path="s390_32/esame s390_32" + fi +*************** +*** 5732,5738 **** + limb_64=longlong + CALLING_CONVENTIONS_OBJS_64="" + +! $as_echo "#define HOST_DOS64 1" >>confdefs.h + + GMP_NONSTD_ABI_64=DOS64 + ;; +--- 6655,6661 ---- + limb_64=longlong + CALLING_CONVENTIONS_OBJS_64="" + +! printf "%s\n" "#define HOST_DOS64 1" >>confdefs.h + + GMP_NONSTD_ABI_64=DOS64 + ;; +*************** +*** 5745,5752 **** + # Special CPU "none" used to select generic C, now this is obsolete. + none-*-*) + enable_assembly=no +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the \"none\" host is obsolete, use --disable-assembly" >&5 +! $as_echo "$as_me: WARNING: the \"none\" host is obsolete, use --disable-assembly" >&2;} + ;; + + esac +--- 6668,6675 ---- + # Special CPU "none" used to select generic C, now this is obsolete. + none-*-*) + enable_assembly=no +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: the \"none\" host is obsolete, use --disable-assembly" >&5 +! printf "%s\n" "$as_me: WARNING: the \"none\" host is obsolete, use --disable-assembly" >&2;} + ;; + + esac +*************** +*** 5889,5901 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + rm -f conftest* +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $cc is gcc" >&5 +! $as_echo_n "checking whether $cc is gcc... " >&6; } +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } + ccbase=gcc + else + rm -f conftest* +--- 6812,6824 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + rm -f conftest* +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $cc is gcc" >&5 +! printf %s "checking whether $cc is gcc... " >&6; } +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } + ccbase=gcc + else + rm -f conftest* +*************** +*** 5911,5922 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_command\""; } >&5 + (eval $gmp_command) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $cc is xlc" >&5 +! $as_echo_n "checking whether $cc is xlc... " >&6; } +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } + ccbase=xlc + else + : +--- 6834,6845 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_command\""; } >&5 + (eval $gmp_command) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $cc is xlc" >&5 +! printf %s "checking whether $cc is xlc... " >&6; } +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } + ccbase=xlc + else + : +*************** +*** 5965,5972 **** + instrument) cflags="$cflags -finstrument-functions" ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags $cppflags" >&5 +! $as_echo_n "checking compiler $cc $cflags $cppflags... " >&6; } + gmp_prog_cc_works=yes + + # first see a simple "main()" works, then go on to other checks +--- 6888,6895 ---- + instrument) cflags="$cflags -finstrument-functions" ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags $cppflags" >&5 +! printf %s "checking compiler $cc $cflags $cppflags... " >&6; } + gmp_prog_cc_works=yes + + # first see a simple "main()" works, then go on to other checks +*************** +*** 5982,5988 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 6905,6911 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 5990,5996 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 6913,6919 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6036,6042 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 6959,6965 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6044,6050 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 6967,6973 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6092,6098 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7015,7021 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6100,6106 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7023,7029 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6149,6155 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7072,7078 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6157,6163 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7080,7086 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6204,6210 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7127,7133 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6212,6218 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7135,7141 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6260,6266 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7183,7189 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6268,6274 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7191,7197 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6345,6351 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7268,7274 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6353,6359 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7276,7282 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6396,6402 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7319,7325 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6404,6410 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7327,7333 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6442,6448 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7365,7371 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6450,6456 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7373,7379 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6520,6526 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7443,7449 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6528,6534 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7451,7457 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6585,6591 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7508,7514 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6593,6599 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7516,7522 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6646,6652 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7569,7575 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6654,6660 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7577,7583 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6707,6713 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7630,7636 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6715,6721 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7638,7644 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6806,6812 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7729,7735 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6814,6820 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7737,7743 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6915,6921 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 7838,7844 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 6923,6929 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 7846,7852 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 6974,6980 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "addl.*_GLOBAL_OFFSET_TABLE_.*eax" conftest.s >/dev/null; then + tmp_got_emitted=yes +--- 7897,7903 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "addl.*_GLOBAL_OFFSET_TABLE_.*eax" conftest.s >/dev/null; then + tmp_got_emitted=yes +*************** +*** 7048,7054 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + tmp_got_good=`od -b conftest.o | $AWK -f conftest.awk` + fi +--- 7971,7977 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + tmp_got_good=`od -b conftest.o | $AWK -f conftest.awk` + fi +*************** +*** 7069,7076 **** + esac + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cc_works" >&5 +! $as_echo "$gmp_prog_cc_works" >&6; } + case $gmp_prog_cc_works in + yes) + +--- 7992,7999 ---- + esac + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cc_works" >&5 +! printf "%s\n" "$gmp_prog_cc_works" >&6; } + case $gmp_prog_cc_works in + yes) + +*************** +*** 7086,7093 **** + eval limb_chosen=\"\$limb$abi1\" + test -n "$limb_chosen" || eval limb_chosen=\"\$limb$abi2\" + if test "$limb_chosen" = longlong; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags $cppflags has long long" >&5 +! $as_echo_n "checking compiler $cc $cflags $cppflags has long long... " >&6; } + cat >conftest.c <&5 +! printf %s "checking compiler $cc $cflags $cppflags has long long... " >&6; } + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_prog_cc_works=yes + else +--- 8021,8027 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_prog_cc_works=yes + else +*************** +*** 7106,7113 **** + cat conftest.c >&5 + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cc_works" >&5 +! $as_echo "$gmp_prog_cc_works" >&6; } + if test $gmp_prog_cc_works = yes; then + : + else +--- 8029,8036 ---- + cat conftest.c >&5 + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cc_works" >&5 +! printf "%s\n" "$gmp_prog_cc_works" >&6; } + if test $gmp_prog_cc_works = yes; then + : + else +*************** +*** 7125,7132 **** + testlist_pass=yes + for tst in $testlist; do + case $tst in +! hpc-hppa-2-0) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HP compiler $cc is good for 64-bits" >&5 +! $as_echo_n "checking whether HP compiler $cc is good for 64-bits... " >&6; } + # Bad compiler output: + # ccom: HP92453-01 G.10.32.05 HP C Compiler + # Good compiler output: +--- 8048,8055 ---- + testlist_pass=yes + for tst in $testlist; do + case $tst in +! hpc-hppa-2-0) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether HP compiler $cc is good for 64-bits" >&5 +! printf %s "checking whether HP compiler $cc is good for 64-bits... " >&6; } + # Bad compiler output: + # ccom: HP92453-01 G.10.32.05 HP C Compiler + # Good compiler output: +*************** +*** 7169,7184 **** + + gmp_hpc_64bit=$gmp_compare_ge + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_hpc_64bit" >&5 +! $as_echo "$gmp_hpc_64bit" >&6; } + if test $gmp_hpc_64bit = yes; then + : + else + testlist_pass=no + fi + ;; +! gcc-arm-umodsi) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ARM gcc unsigned division works" >&5 +! $as_echo_n "checking whether ARM gcc unsigned division works... " >&6; } + tmp_version=`$cc --version` + echo "$tmp_version" >&5 + case $tmp_version in +--- 8092,8107 ---- + + gmp_hpc_64bit=$gmp_compare_ge + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_hpc_64bit" >&5 +! printf "%s\n" "$gmp_hpc_64bit" >&6; } + if test $gmp_hpc_64bit = yes; then + : + else + testlist_pass=no + fi + ;; +! gcc-arm-umodsi) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ARM gcc unsigned division works" >&5 +! printf %s "checking whether ARM gcc unsigned division works... " >&6; } + tmp_version=`$cc --version` + echo "$tmp_version" >&5 + case $tmp_version in +*************** +*** 7189,7199 **** + : + gmp_gcc_arm_umodsi_result=yes ;; + esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_gcc_arm_umodsi_result" >&5 +! $as_echo "$gmp_gcc_arm_umodsi_result" >&6; } + ;; +! gcc-mips-o32) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports o32" >&5 +! $as_echo_n "checking whether gcc supports o32... " >&6; } + echo 'int x;' >conftest.c + echo "$cc -mabi=32 -c conftest.c" >&5 + if $cc -mabi=32 -c conftest.c >conftest.out 2>&1; then +--- 8112,8122 ---- + : + gmp_gcc_arm_umodsi_result=yes ;; + esac +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_gcc_arm_umodsi_result" >&5 +! printf "%s\n" "$gmp_gcc_arm_umodsi_result" >&6; } + ;; +! gcc-mips-o32) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc supports o32" >&5 +! printf %s "checking whether gcc supports o32... " >&6; } + echo 'int x;' >conftest.c + echo "$cc -mabi=32 -c conftest.c" >&5 + if $cc -mabi=32 -c conftest.c >conftest.out 2>&1; then +*************** +*** 7207,7222 **** + fi + fi + rm -f conftest.* +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! $as_echo "$result" >&6; } + if test $result = yes; then + : + else + testlist_pass=no + fi + ;; +! hppa-level-2.0) { $as_echo "$as_me:${as_lineno-$LINENO}: checking $cc $cflags assembler knows hppa 2.0" >&5 +! $as_echo_n "checking $cc $cflags assembler knows hppa 2.0... " >&6; } + result=no + cat >conftest.s <&5 +! printf "%s\n" "$result" >&6; } + if test $result = yes; then + : + else + testlist_pass=no + fi + ;; +! hppa-level-2.0) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $cc $cflags assembler knows hppa 2.0" >&5 +! printf %s "checking $cc $cflags assembler knows hppa 2.0... " >&6; } + result=no + cat >conftest.s <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + result=yes + else +--- 8148,8154 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + result=yes + else +*************** +*** 7233,7240 **** + cat conftest.s >&5 + fi + rm -f conftest* +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! $as_echo "$result" >&6; } + if test "$result" = yes; then + : + else +--- 8156,8163 ---- + cat conftest.s >&5 + fi + rm -f conftest* +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! printf "%s\n" "$result" >&6; } + if test "$result" = yes; then + : + else +*************** +*** 7244,7251 **** + sizeof*) echo "configure: testlist $tst" >&5 + gmp_sizeof_type=`echo "$tst" | sed 's/sizeof-\([a-z\*]*\).*/\1/'` + gmp_sizeof_want=`echo "$tst" | sed 's/sizeof-[a-z\*]*-\([0-9]*\).*/\1/'` +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags has sizeof($gmp_sizeof_type)==$gmp_sizeof_want" >&5 +! $as_echo_n "checking compiler $cc $cflags has sizeof($gmp_sizeof_type)==$gmp_sizeof_want... " >&6; } + cat >conftest.c <&5 + gmp_sizeof_type=`echo "$tst" | sed 's/sizeof-\([a-z\*]*\).*/\1/'` + gmp_sizeof_want=`echo "$tst" | sed 's/sizeof-[a-z\*]*-\([0-9]*\).*/\1/'` +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags has sizeof($gmp_sizeof_type)==$gmp_sizeof_want" >&5 +! printf %s "checking compiler $cc $cflags has sizeof($gmp_sizeof_type)==$gmp_sizeof_want... " >&6; } + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_c_testlist_sizeof=yes + fi + rm -f conftest* +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_c_testlist_sizeof" >&5 +! $as_echo "$gmp_c_testlist_sizeof" >&6; } + if test $gmp_c_testlist_sizeof = yes; then + : + else +--- 8183,8195 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_c_testlist_sizeof=yes + fi + rm -f conftest* +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_c_testlist_sizeof" >&5 +! printf "%s\n" "$gmp_c_testlist_sizeof" >&6; } + if test $gmp_c_testlist_sizeof = yes; then + : + else +*************** +*** 7392,7417 **** + # pentium4 case. + # + if test "$abi" = 32; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc is good for sse2" >&5 +! $as_echo_n "checking whether gcc is good for sse2... " >&6; } + case `$cc $cflags $cppflags -dumpversion` in + 3.[012] | 3.[012].*) result=no ;; + *) result=yes ;; + esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! $as_echo "$result" >&6; } + if test "$result" = yes; then + : + else + continue + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the operating system supports XMM registers" >&5 +! $as_echo_n "checking whether the operating system supports XMM registers... " >&6; } +! if ${gmp_cv_os_x86_xmm+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test "$build" = "$host"; then + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.s <&5 +! printf %s "checking whether gcc is good for sse2... " >&6; } + case `$cc $cflags $cppflags -dumpversion` in + 3.[012] | 3.[012].*) result=no ;; + *) result=yes ;; + esac +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! printf "%s\n" "$result" >&6; } + if test "$result" = yes; then + : + else + continue + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the operating system supports XMM registers" >&5 +! printf %s "checking whether the operating system supports XMM registers... " >&6; } +! if test ${gmp_cv_os_x86_xmm+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test "$build" = "$host"; then + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.s <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + gmp_cv_os_x86_xmm=yes + else + gmp_cv_os_x86_xmm=no + fi + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Oops, cannot compile test program" >&5 +! $as_echo "$as_me: WARNING: Oops, cannot compile test program" >&2;} + fi + rm -f conftest* + fi +--- 8352,8372 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + gmp_cv_os_x86_xmm=yes + else + gmp_cv_os_x86_xmm=no + fi + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Oops, cannot compile test program" >&5 +! printf "%s\n" "$as_me: WARNING: Oops, cannot compile test program" >&2;} + fi + rm -f conftest* + fi +*************** +*** 7457,7472 **** + gmp_cv_os_x86_xmm=probably ;; + esac + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_os_x86_xmm" >&5 +! $as_echo "$gmp_cv_os_x86_xmm" >&6; } + + if test "$gmp_cv_os_x86_xmm" = probably; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not certain of OS support for xmm when cross compiling." >&5 +! $as_echo "$as_me: WARNING: Not certain of OS support for xmm when cross compiling." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will assume it's ok, expect a SIGILL if this is wrong." >&5 +! $as_echo "$as_me: WARNING: Will assume it's ok, expect a SIGILL if this is wrong." >&2;} + fi + + case $gmp_cv_os_x86_xmm in +--- 8381,8397 ---- + gmp_cv_os_x86_xmm=probably ;; + esac + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_os_x86_xmm" >&5 +! printf "%s\n" "$gmp_cv_os_x86_xmm" >&6; } + + if test "$gmp_cv_os_x86_xmm" = probably; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Not certain of OS support for xmm when cross compiling." >&5 +! printf "%s\n" "$as_me: WARNING: Not certain of OS support for xmm when cross compiling." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Will assume it's ok, expect a SIGILL if this is wrong." >&5 +! printf "%s\n" "$as_me: WARNING: Will assume it's ok, expect a SIGILL if this is wrong." >&2;} + fi + + case $gmp_cv_os_x86_xmm in +*************** +*** 7483,7490 **** + -no-cpp-precomp) + # special check, avoiding a warning + if test "$ccbase" = gcc; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags -no-cpp-precomp" >&5 +! $as_echo_n "checking compiler $cc $cflags -no-cpp-precomp... " >&6; } + result=no + cat >conftest.c <&5 +! printf %s "checking compiler $cc $cflags -no-cpp-precomp... " >&6; } + result=no + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "unrecognized option.*-no-cpp-precomp" conftest.out >/dev/null; then : ; + else +--- 8418,8424 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "unrecognized option.*-no-cpp-precomp" conftest.out >/dev/null; then : ; + else +*************** +*** 7502,7509 **** + fi + cat conftest.out >&5 + rm -f conftest* a.out b.out a.exe a_out.exe +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! $as_echo "$result" >&6; } + if test "$result" = yes; then + cflags="$cflags $flag" + break +--- 8427,8434 ---- + fi + cat conftest.out >&5 + rm -f conftest* a.out b.out a.exe a_out.exe +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! printf "%s\n" "$result" >&6; } + if test "$result" = yes; then + cflags="$cflags $flag" + break +*************** +*** 7516,7523 **** + -Wa,-m*) + case $host in + alpha*-*-*) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler $cc $cflags $flag" >&5 +! $as_echo_n "checking assembler $cc $cflags $flag... " >&6; } + result=no + cat >conftest.c <&5 +! printf %s "checking assembler $cc $cflags $flag... " >&6; } + result=no + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "Unknown CPU identifier" conftest.out >/dev/null; then : ; + else +--- 8451,8457 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "Unknown CPU identifier" conftest.out >/dev/null; then : ; + else +*************** +*** 7535,7542 **** + fi + cat conftest.out >&5 + rm -f conftest* +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! $as_echo "$result" >&6; } + if test "$result" = yes; then + : + else +--- 8460,8467 ---- + fi + cat conftest.out >&5 + rm -f conftest* +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! printf "%s\n" "$result" >&6; } + if test "$result" = yes; then + : + else +*************** +*** 7547,7554 **** + esac + ;; + -Wa,-oldas) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cc $cflags $cppflags -Wa,-oldas" >&5 +! $as_echo_n "checking for $cc $cflags $cppflags -Wa,-oldas... " >&6; } + result=no + cat >conftest.c <&5 +! printf %s "checking for $cc $cflags $cppflags -Wa,-oldas... " >&6; } + result=no + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : ; + else + # empty fails +--- 8482,8488 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : ; + else + # empty fails +*************** +*** 7565,7579 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # but with -Wa,-oldas it works + result=yes + fi + fi + rm -f conftest* +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! $as_echo "$result" >&6; } + if test "$result" = yes; then + cflags="$cflags $flag" + break +--- 8490,8504 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # but with -Wa,-oldas it works + result=yes + fi + fi + rm -f conftest* +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +! printf "%s\n" "$result" >&6; } + if test "$result" = yes; then + cflags="$cflags $flag" + break +*************** +*** 7584,7591 **** + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags $cppflags $flag" >&5 +! $as_echo_n "checking compiler $cc $cflags $cppflags $flag... " >&6; } + gmp_prog_cc_works=yes + + # first see a simple "main()" works, then go on to other checks +--- 8509,8516 ---- + ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler $cc $cflags $cppflags $flag" >&5 +! printf %s "checking compiler $cc $cflags $cppflags $flag... " >&6; } + gmp_prog_cc_works=yes + + # first see a simple "main()" works, then go on to other checks +*************** +*** 7601,7607 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8526,8532 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7609,7615 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8534,8540 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 7655,7661 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8580,8586 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7663,7669 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8588,8594 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 7711,7717 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8636,8642 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7719,7725 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8644,8650 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 7768,7774 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8693,8699 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7776,7782 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8701,8707 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 7823,7829 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8748,8754 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7831,7837 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8756,8762 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 7879,7885 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8804,8810 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7887,7893 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8812,8818 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 7964,7970 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8889,8895 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 7972,7978 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8897,8903 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8015,8021 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8940,8946 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8023,8029 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8948,8954 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8061,8067 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 8986,8992 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8069,8075 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 8994,9000 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8139,8145 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 9064,9070 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8147,8153 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 9072,9078 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8204,8210 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 9129,9135 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8212,8218 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 9137,9143 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8265,8271 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 9190,9196 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8273,8279 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 9198,9204 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8326,8332 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 9251,9257 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8334,8340 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 9259,9265 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8425,8431 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 9350,9356 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8433,8439 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 9358,9364 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8534,8540 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +--- 9459,9465 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cc_works_part=yes + if test "$cross_compiling" = no; then +*************** +*** 8542,8548 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +--- 9467,9473 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + cc_works_part=norun +*************** +*** 8593,8599 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "addl.*_GLOBAL_OFFSET_TABLE_.*eax" conftest.s >/dev/null; then + tmp_got_emitted=yes +--- 9518,9524 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "addl.*_GLOBAL_OFFSET_TABLE_.*eax" conftest.s >/dev/null; then + tmp_got_emitted=yes +*************** +*** 8667,8673 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + tmp_got_good=`od -b conftest.o | $AWK -f conftest.awk` + fi +--- 9592,9598 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + tmp_got_good=`od -b conftest.o | $AWK -f conftest.awk` + fi +*************** +*** 8688,8695 **** + esac + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cc_works" >&5 +! $as_echo "$gmp_prog_cc_works" >&6; } + case $gmp_prog_cc_works in + yes) + cflags="$cflags $flag" +--- 9613,9620 ---- + esac + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cc_works" >&5 +! printf "%s\n" "$gmp_prog_cc_works" >&6; } + case $gmp_prog_cc_works in + yes) + cflags="$cflags $flag" +*************** +*** 8744,8752 **** + + if test -n "$SPEED_CYCLECOUNTER_OBJ"; then + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_SPEED_CYCLECOUNTER $cyclecounter_size +! _ACEOF + + fi + +--- 9669,9675 ---- + + if test -n "$SPEED_CYCLECOUNTER_OBJ"; then + +! printf "%s\n" "#define HAVE_SPEED_CYCLECOUNTER $cyclecounter_size" >>confdefs.h + + fi + +*************** +*** 8764,8770 **** + + if test -n "$CALLING_CONVENTIONS_OBJS"; then + +! $as_echo "#define HAVE_CALLING_CONVENTIONS 1" >>confdefs.h + + fi + +--- 9687,9693 ---- + + if test -n "$CALLING_CONVENTIONS_OBJS"; then + +! printf "%s\n" "#define HAVE_CALLING_CONVENTIONS 1" >>confdefs.h + + fi + +*************** +*** 8801,8838 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_CC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! $as_echo "$CC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 9733,9776 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! printf "%s\n" "$CC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 8841,8878 **** + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_CC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +! $as_echo "$ac_ct_CC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +--- 9779,9822 ---- + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +! printf "%s\n" "$ac_ct_CC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +*************** +*** 8880,8887 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +--- 9824,9831 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +*************** +*** 8894,8931 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_CC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! $as_echo "$CC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 9838,9881 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! printf "%s\n" "$CC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 8934,8945 **** + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_CC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + ac_prog_rejected=no +--- 9884,9896 ---- + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + ac_prog_rejected=no +*************** +*** 8947,8961 **** + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +! if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +--- 9898,9916 ---- + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +! if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +*************** +*** 8971,8988 **** + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift +! ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi + fi +! fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! $as_echo "$CC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 9926,9944 ---- + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift +! ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi + fi +! fi ;; +! esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! printf "%s\n" "$CC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 8993,9030 **** + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_CC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! $as_echo "$CC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 9949,9992 ---- + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! printf "%s\n" "$CC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 9037,9074 **** + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_CC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +! $as_echo "$ac_ct_CC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 9999,10042 ---- + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +! printf "%s\n" "$ac_ct_CC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 9080,9113 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC + fi + fi + + fi + + +! test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "no acceptable C compiler found in \$PATH +! See \`config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. +! $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +! for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 10048,10187 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +! ac_tool_warned=yes ;; +! esac +! CC=$ac_ct_CC +! fi +! fi +! +! fi +! if test -z "$CC"; then +! if test -n "$ac_tool_prefix"; then +! # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +! set dummy ${ac_tool_prefix}clang; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$CC"; then +! ac_cv_prog_CC="$CC" # Let the user override the test. +! else +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in $PATH +! do +! IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +! ac_cv_prog_CC="${ac_tool_prefix}clang" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 +! break 2 +! fi +! done +! done +! IFS=$as_save_IFS +! +! fi ;; +! esac +! fi +! CC=$ac_cv_prog_CC +! if test -n "$CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +! printf "%s\n" "$CC" >&6; } +! else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! fi +! +! +! fi +! if test -z "$ac_cv_prog_CC"; then +! ac_ct_CC=$CC +! # Extract the first word of "clang", so it can be a program name with args. +! set dummy clang; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_CC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_CC"; then +! ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +! else +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in $PATH +! do +! IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then +! ac_cv_prog_ac_ct_CC="clang" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 +! break 2 +! fi +! done +! done +! IFS=$as_save_IFS +! +! fi ;; +! esac +! fi +! ac_ct_CC=$ac_cv_prog_ac_ct_CC +! if test -n "$ac_ct_CC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +! printf "%s\n" "$ac_ct_CC" >&6; } +! else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! fi +! +! if test "x$ac_ct_CC" = x; then +! CC="" +! else +! case $cross_compiling:$ac_tool_warned in +! yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC + fi ++ else ++ CC="$ac_cv_prog_CC" + fi + + fi + + +! test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "no acceptable C compiler found in \$PATH +! See 'config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +! for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 9117,9123 **** + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + +--- 10191,10197 ---- + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + +*************** +*** 9125,9131 **** + /* end confdefs.h. */ + + int +! main () + { + + ; +--- 10199,10205 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; +*************** +*** 9137,9145 **** + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +! $as_echo_n "checking whether the C compiler works... " >&6; } +! ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: + ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +--- 10211,10219 ---- + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +! printf %s "checking whether the C compiler works... " >&6; } +! ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: + ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +*************** +*** 9160,9172 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; }; then : +! # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +! # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +--- 10234,10247 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; } +! then : +! # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +! # So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, + # so that the user can short-circuit this test for compilers unknown to + # Autoconf. +*************** +*** 9181,9192 **** + # certainly right. + break;; + *.* ) +! if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not +! # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. +--- 10256,10267 ---- + # certainly right. + break;; + *.* ) +! if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not +! # safe: cross compilers may not add the suffix if given an '-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. +*************** +*** 9197,9244 **** + done + test "$ac_cv_exeext" = no && ac_cv_exeext= + +! else +! ac_file='' + fi +! if test -z "$ac_file"; then : +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "C compiler cannot create executables +! See \`config.log' for more details" "$LINENO" 5; } +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +! $as_echo_n "checking for C compiler default output file name... " >&6; } +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +! $as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +! $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; }; then : +! # If both `conftest.exe' and `conftest' are `present' (well, observable) +! # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +! # work properly (i.e., refer to `conftest.exe'), while it won't with +! # `rm'. + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +--- 10272,10323 ---- + done + test "$ac_cv_exeext" = no && ac_cv_exeext= + +! else case e in #( +! e) ac_file='' ;; +! esac + fi +! if test -z "$ac_file" +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error 77 "C compiler cannot create executables +! See 'config.log' for more details" "$LINENO" 5; } +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +! printf %s "checking for C compiler default output file name... " >&6; } +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +! printf "%s\n" "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +! printf %s "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; } +! then : +! # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +! # catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +! # work properly (i.e., refer to 'conftest.exe'), while it won't with +! # 'rm'. + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +*************** +*** 9248,9262 **** + * ) break;; + esac + done +! else +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "cannot compute suffix of executables: cannot compile and link +! See \`config.log' for more details" "$LINENO" 5; } + fi + rm -f conftest conftest$ac_cv_exeext +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +! $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext +--- 10327,10342 ---- + * ) break;; + esac + done +! else case e in #( +! e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "cannot compute suffix of executables: cannot compile and link +! See 'config.log' for more details" "$LINENO" 5; } ;; +! esac + fi + rm -f conftest conftest$ac_cv_exeext +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +! printf "%s\n" "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext +*************** +*** 9265,9273 **** + /* end confdefs.h. */ + #include + int +! main () + { + FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; +--- 10345,10355 ---- + /* end confdefs.h. */ + #include + int +! main (void) + { + FILE *f = fopen ("conftest.out", "w"); ++ if (!f) ++ return 1; + return ferror (f) || fclose (f) != 0; + + ; +*************** +*** 9277,9284 **** + ac_clean_files="$ac_clean_files conftest.out" + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +! $as_echo_n "checking whether we are cross compiling... " >&6; } + if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" + case "(($ac_try" in +--- 10359,10366 ---- + ac_clean_files="$ac_clean_files conftest.out" + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +! printf %s "checking whether we are cross compiling... " >&6; } + if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" + case "(($ac_try" in +*************** +*** 9286,9295 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in +--- 10368,10377 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in +*************** +*** 9297,9335 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +! as_fn_error $? "cannot run C compiled programs. +! If you meant to cross compile, use \`--host'. +! See \`config.log' for more details" "$LINENO" 5; } + fi + fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +! $as_echo "$cross_compiling" >&6; } + +! rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out + ac_clean_files=$ac_clean_files_save +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +! $as_echo_n "checking for suffix of object files... " >&6; } +! if ${ac_cv_objext+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; +--- 10379,10419 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +! as_fn_error 77 "cannot run C compiled programs. +! If you meant to cross compile, use '--host'. +! See 'config.log' for more details" "$LINENO" 5; } + fi + fi + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +! printf "%s\n" "$cross_compiling" >&6; } + +! rm -f conftest.$ac_ext conftest$ac_cv_exeext \ +! conftest.o conftest.obj conftest.out + ac_clean_files=$ac_clean_files_save +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +! printf %s "checking for suffix of object files... " >&6; } +! if test ${ac_cv_objext+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; +*************** +*** 9343,9353 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +--- 10427,10438 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; } +! then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +*************** +*** 9356,9386 **** + break;; + esac + done +! else +! $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "cannot compute suffix of object files: cannot compile +! See \`config.log' for more details" "$LINENO" 5; } + fi +! rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +! $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +! $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +! if ${ac_cv_c_compiler_gnu+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + #ifndef __GNUC__ + choke me +--- 10441,10474 ---- + break;; + esac + done +! else case e in #( +! e) printf "%s\n" "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "cannot compute suffix of object files: cannot compile +! See 'config.log' for more details" "$LINENO" 5; } ;; +! esac + fi +! rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +! printf "%s\n" "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +! printf %s "checking whether the compiler supports GNU C... " >&6; } +! if test ${ac_cv_c_compiler_gnu+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + #ifndef __GNUC__ + choke me +*************** +*** 9390,9419 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +! else +! ac_compiler_gnu=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +! $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes + else + GCC= + fi +! ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +! $as_echo_n "checking whether $CC accepts -g... " >&6; } +! if ${ac_cv_prog_cc_g+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +--- 10478,10513 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_compiler_gnu=yes +! else case e in #( +! e) ac_compiler_gnu=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +! printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +! ac_compiler_gnu=$ac_cv_c_compiler_gnu +! + if test $ac_compiler_gnu = yes; then + GCC=yes + else + GCC= + fi +! ac_test_CFLAGS=${CFLAGS+y} + ac_save_CFLAGS=$CFLAGS +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +! printf %s "checking whether $CC accepts -g... " >&6; } +! if test ${ac_cv_prog_cc_g+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +*************** +*** 9421,9477 **** + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +! else +! CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + +! else +! ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! ac_c_werror_flag=$ac_save_c_werror_flag + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +! $as_echo "$ac_cv_prog_cc_g" >&6; } +! if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +--- 10515,10577 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_prog_cc_g=yes +! else case e in #( +! e) CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + +! else case e in #( +! e) ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_prog_cc_g=yes + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ac_c_werror_flag=$ac_save_c_werror_flag ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +! printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +! if test $ac_test_CFLAGS; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +*************** +*** 9486,9579 **** + CFLAGS= + fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +! $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +! if ${ac_cv_prog_cc_c89+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_cv_prog_cc_c89=no + ac_save_CC=$CC + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include +! #include +! struct stat; +! /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +! struct buf { int x; }; +! FILE * (*rcsopen) (struct buf *, struct stat *, int); +! static char *e (p, i) +! char **p; +! int i; +! { +! return p[i]; +! } +! static char *f (char * (*g) (char **, int), char **p, ...) +! { +! char *s; +! va_list v; +! va_start (v,p); +! s = g (p, va_arg (v,int)); +! va_end (v); +! return s; +! } +! +! /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +! function prototypes and stuff, but not '\xHH' hex character constants. +! These don't provoke an error unfortunately, instead are silently treated +! as 'x'. The following induces an error, until -std is added to get +! proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +! array size at least. It's necessary to write '\x00'==0 to get something +! that's true only with -std. */ +! int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +! /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters +! inside strings and character constants. */ +! #define FOO(x) 'x' +! int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +! int test (int i, double x); +! struct s1 {int (*f) (int a);}; +! struct s2 {int (*f) (double a);}; +! int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +! int argc; +! char **argv; +! int +! main () +! { +! return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +! ; +! return 0; +! } + _ACEOF +! for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ +! -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg + fi +! rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done + rm -f conftest.$ac_ext +! CC=$ac_save_CC + + fi +! # AC_CACHE_VAL +! case "x$ac_cv_prog_cc_c89" in +! x) +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +! $as_echo "none needed" >&6; } ;; +! xno) +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +! $as_echo "unsupported" >&6; } ;; +! *) +! CC="$CC $ac_cv_prog_cc_c89" +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +! $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac +! if test "x$ac_cv_prog_cc_c89" != xno; then : +! + fi + + ac_ext=c +--- 10586,10738 ---- + CFLAGS= + fi + fi +! ac_prog_cc_stdc=no +! if test x$ac_prog_cc_stdc = xno +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +! printf %s "checking for $CC option to enable C11 features... " >&6; } +! if test ${ac_cv_prog_cc_c11+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_cv_prog_cc_c11=no + ac_save_CC=$CC + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! $ac_c_conftest_c11_program +! _ACEOF +! for ac_arg in '' -std=gnu11 +! do +! CC="$ac_save_CC $ac_arg" +! if ac_fn_c_try_compile "$LINENO" +! then : +! ac_cv_prog_cc_c11=$ac_arg +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam +! test "x$ac_cv_prog_cc_c11" != "xno" && break +! done +! rm -f conftest.$ac_ext +! CC=$ac_save_CC ;; +! esac +! fi + +! if test "x$ac_cv_prog_cc_c11" = xno +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +! printf "%s\n" "unsupported" >&6; } +! else case e in #( +! e) if test "x$ac_cv_prog_cc_c11" = x +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +! printf "%s\n" "none needed" >&6; } +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +! printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } +! CC="$CC $ac_cv_prog_cc_c11" ;; +! esac +! fi +! ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 +! ac_prog_cc_stdc=c11 ;; +! esac +! fi +! fi +! if test x$ac_prog_cc_stdc = xno +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +! printf %s "checking for $CC option to enable C99 features... " >&6; } +! if test ${ac_cv_prog_cc_c99+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_cv_prog_cc_c99=no +! ac_save_CC=$CC +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! $ac_c_conftest_c99_program +! _ACEOF +! for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +! do +! CC="$ac_save_CC $ac_arg" +! if ac_fn_c_try_compile "$LINENO" +! then : +! ac_cv_prog_cc_c99=$ac_arg +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam +! test "x$ac_cv_prog_cc_c99" != "xno" && break +! done +! rm -f conftest.$ac_ext +! CC=$ac_save_CC ;; +! esac +! fi + +! if test "x$ac_cv_prog_cc_c99" = xno +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +! printf "%s\n" "unsupported" >&6; } +! else case e in #( +! e) if test "x$ac_cv_prog_cc_c99" = x +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +! printf "%s\n" "none needed" >&6; } +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +! printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } +! CC="$CC $ac_cv_prog_cc_c99" ;; +! esac +! fi +! ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +! ac_prog_cc_stdc=c99 ;; +! esac +! fi +! fi +! if test x$ac_prog_cc_stdc = xno +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +! printf %s "checking for $CC option to enable C89 features... " >&6; } +! if test ${ac_cv_prog_cc_c89+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_cv_prog_cc_c89=no +! ac_save_CC=$CC +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! $ac_c_conftest_c89_program + _ACEOF +! for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_prog_cc_c89=$ac_arg + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break + done + rm -f conftest.$ac_ext +! CC=$ac_save_CC ;; +! esac +! fi + ++ if test "x$ac_cv_prog_cc_c89" = xno ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++ printf "%s\n" "unsupported" >&6; } ++ else case e in #( ++ e) if test "x$ac_cv_prog_cc_c89" = x ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++ printf "%s\n" "none needed" >&6; } ++ else case e in #( ++ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++ printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } ++ CC="$CC $ac_cv_prog_cc_c89" ;; ++ esac + fi +! ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 +! ac_prog_cc_stdc=c89 ;; + esac +! fi + fi + + ac_ext=c +*************** +*** 9582,9602 **** + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +! ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +! $as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +! if ${am_cv_prog_cc_c_o+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; +--- 10741,10763 ---- + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +! +! ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +! printf %s "checking whether $CC understands -c and -o together... " >&6; } +! if test ${am_cv_prog_cc_c_o+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; +*************** +*** 9621,9631 **** + break + fi + done +! rm -f core conftest* +! unset am_i + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +! $as_echo "$am_cv_prog_cc_c_o" >&6; } + if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. +--- 10782,10796 ---- + break + fi + done +! # aligned with autoconf, so not including core; see bug#72225. +! rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \ +! conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \ +! conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM +! unset am_i ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +! printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } + if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. +*************** +*** 9641,9864 **** + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +- $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +- if ${ac_cv_prog_cc_c99+:} false; then : +- $as_echo_n "(cached) " >&6 +- else +- ac_cv_prog_cc_c99=no +- ac_save_CC=$CC +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +- /* end confdefs.h. */ +- #include +- #include +- #include +- #include +- #include +- +- // Check varargs macros. These examples are taken from C99 6.10.3.5. +- #define debug(...) fprintf (stderr, __VA_ARGS__) +- #define showlist(...) puts (#__VA_ARGS__) +- #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +- static void +- test_varargs_macros (void) +- { +- int x = 1234; +- int y = 5678; +- debug ("Flag"); +- debug ("X = %d\n", x); +- showlist (The first, second, and third items.); +- report (x>y, "x is %d but y is %d", x, y); +- } +- +- // Check long long types. +- #define BIG64 18446744073709551615ull +- #define BIG32 4294967295ul +- #define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +- #if !BIG_OK +- your preprocessor is broken; +- #endif +- #if BIG_OK +- #else +- your preprocessor is broken; +- #endif +- static long long int bignum = -9223372036854775807LL; +- static unsigned long long int ubignum = BIG64; +- +- struct incomplete_array +- { +- int datasize; +- double data[]; +- }; +- +- struct named_init { +- int number; +- const wchar_t *name; +- double average; +- }; +- +- typedef const char *ccp; +- +- static inline int +- test_restrict (ccp restrict text) +- { +- // See if C++-style comments work. +- // Iterate through items via the restricted pointer. +- // Also check for declarations in for loops. +- for (unsigned int i = 0; *(text+i) != '\0'; ++i) +- continue; +- return 0; +- } +- +- // Check varargs and va_copy. +- static void +- test_varargs (const char *format, ...) +- { +- va_list args; +- va_start (args, format); +- va_list args_copy; +- va_copy (args_copy, args); +- +- const char *str; +- int number; +- float fnumber; +- +- while (*format) +- { +- switch (*format++) +- { +- case 's': // string +- str = va_arg (args_copy, const char *); +- break; +- case 'd': // int +- number = va_arg (args_copy, int); +- break; +- case 'f': // float +- fnumber = va_arg (args_copy, double); +- break; +- default: +- break; +- } +- } +- va_end (args_copy); +- va_end (args); +- } +- +- int +- main () +- { +- +- // Check bool. +- _Bool success = false; +- +- // Check restrict. +- if (test_restrict ("String literal") == 0) +- success = true; +- char *restrict newvar = "Another string"; +- +- // Check varargs. +- test_varargs ("s, d' f .", "string", 65, 34.234); +- test_varargs_macros (); +- +- // Check flexible array members. +- struct incomplete_array *ia = +- malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); +- ia->datasize = 10; +- for (int i = 0; i < ia->datasize; ++i) +- ia->data[i] = i * 1.234; +- +- // Check named initializers. +- struct named_init ni = { +- .number = 34, +- .name = L"Test wide string", +- .average = 543.34343, +- }; +- +- ni.number = 58; +- +- int dynamic_array[ni.number]; +- dynamic_array[ni.number - 1] = 543; +- +- // work around unused variable warnings +- return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' +- || dynamic_array[ni.number - 1] != 543); +- +- ; +- return 0; +- } +- _ACEOF +- for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +- do +- CC="$ac_save_CC $ac_arg" +- if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_c99=$ac_arg +- fi +- rm -f core conftest.err conftest.$ac_objext +- test "x$ac_cv_prog_cc_c99" != "xno" && break +- done +- rm -f conftest.$ac_ext +- CC=$ac_save_CC +- +- fi +- # AC_CACHE_VAL +- case "x$ac_cv_prog_cc_c99" in +- x) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +- $as_echo "none needed" >&6; } ;; +- xno) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +- $as_echo "unsupported" >&6; } ;; +- *) +- CC="$CC $ac_cv_prog_cc_c99" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +- $as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +- esac +- if test "x$ac_cv_prog_cc_c99" != xno; then : +- +- fi +- + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +! $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +! if ${ac_cv_prog_CPP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # Double quotes because CPP needs to be expanded +! for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + Syntax error + _ACEOF +! if ac_fn_c_try_cpp "$LINENO"; then : + +! else +! # Broken: fails on valid input. +! continue + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +--- 10806,10850 ---- + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +! printf %s "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +! if test ${ac_cv_prog_CPP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # Double quotes because $CC needs to be expanded +! for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include + Syntax error + _ACEOF +! if ac_fn_c_try_cpp "$LINENO" +! then : + +! else case e in #( +! e) # Broken: fails on valid input. +! continue ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +*************** +*** 9868,9923 **** + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +! else +! # Passes both tests. + ac_preproc_ok=: +! break + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok; then : + break + fi + + done + ac_cv_prog_CPP=$CPP +! + fi + CPP=$ac_cv_prog_CPP + else + ac_cv_prog_CPP=$CPP + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +! $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + Syntax error + _ACEOF +! if ac_fn_c_try_cpp "$LINENO"; then : + +! else +! # Broken: fails on valid input. +! continue + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +--- 10854,10909 ---- + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_c_try_cpp "$LINENO" +! then : + # Broken: success on invalid input. + continue +! else case e in #( +! e) # Passes both tests. + ac_preproc_ok=: +! break ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok +! then : + break + fi + + done + ac_cv_prog_CPP=$CPP +! ;; +! esac + fi + CPP=$ac_cv_prog_CPP + else + ac_cv_prog_CPP=$CPP + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +! printf "%s\n" "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include + Syntax error + _ACEOF +! if ac_fn_c_try_cpp "$LINENO" +! then : + +! else case e in #( +! e) # Broken: fails on valid input. +! continue ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +*************** +*** 9927,9952 **** + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +! else +! # Passes both tests. + ac_preproc_ok=: +! break + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok; then : + +! else +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +! See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +--- 10913,10942 ---- + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_c_try_cpp "$LINENO" +! then : + # Broken: success on invalid input. + continue +! else case e in #( +! e) # Passes both tests. + ac_preproc_ok=: +! break ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok +! then : + +! else case e in #( +! e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +! See 'config.log' for more details" "$LINENO" 5; } ;; +! esac + fi + + ac_ext=c +*************** +*** 9963,9970 **** + # The C compiler on the build system, and associated tests. + + if test -n "$CC_FOR_BUILD"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system compiler $CC_FOR_BUILD" >&5 +! $as_echo_n "checking build system compiler $CC_FOR_BUILD... " >&6; } + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c <&5 +! printf %s "checking build system compiler $CC_FOR_BUILD... " >&6; } + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&5 2>&1; then + cc_for_build_works=yes + fi + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_for_build_works" >&5 +! $as_echo "$cc_for_build_works" >&6; } + if test "$cc_for_build_works" = yes; then + : + else +--- 10969,10983 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&5 2>&1; then + cc_for_build_works=yes + fi + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_for_build_works" >&5 +! printf "%s\n" "$cc_for_build_works" >&6; } + if test "$cc_for_build_works" = yes; then + : + else +*************** +*** 9995,10002 **** + fi + + elif test -n "$HOST_CC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system compiler $HOST_CC" >&5 +! $as_echo_n "checking build system compiler $HOST_CC... " >&6; } + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c <&5 +! printf %s "checking build system compiler $HOST_CC... " >&6; } + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&5 2>&1; then + cc_for_build_works=yes + fi + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_for_build_works" >&5 +! $as_echo "$cc_for_build_works" >&6; } + if test "$cc_for_build_works" = yes; then + CC_FOR_BUILD=$HOST_CC + else +--- 11001,11015 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&5 2>&1; then + cc_for_build_works=yes + fi + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_for_build_works" >&5 +! printf "%s\n" "$cc_for_build_works" >&6; } + if test "$cc_for_build_works" = yes; then + CC_FOR_BUILD=$HOST_CC + else +*************** +*** 10028,10035 **** + + else + for i in "$CC" "$CC $CFLAGS $CPPFLAGS" cc gcc c89 c99; do +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system compiler $i" >&5 +! $as_echo_n "checking build system compiler $i... " >&6; } + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c <&5 +! printf %s "checking build system compiler $i... " >&6; } + # remove anything that might look like compiler output to our "||" expression + rm -f conftest* a.out b.out a.exe a_out.exe + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&5 2>&1; then + cc_for_build_works=yes + fi + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_for_build_works" >&5 +! $as_echo "$cc_for_build_works" >&6; } + if test "$cc_for_build_works" = yes; then + CC_FOR_BUILD=$i + break +--- 11034,11048 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest) >&5 2>&1; then + cc_for_build_works=yes + fi + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_for_build_works" >&5 +! printf "%s\n" "$cc_for_build_works" >&6; } + if test "$cc_for_build_works" = yes; then + CC_FOR_BUILD=$i + break +*************** +*** 10070,10082 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system preprocessor" >&5 +! $as_echo_n "checking for build system preprocessor... " >&6; } + if test -z "$CPP_FOR_BUILD"; then +! if ${gmp_cv_prog_cpp_for_build+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.c <&5 +! printf %s "checking for build system preprocessor... " >&6; } + if test -z "$CPP_FOR_BUILD"; then +! if test ${gmp_cv_prog_cpp_for_build+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >&5 2>&1; then + gmp_cv_prog_cpp_for_build=$i + break +--- 11075,11081 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >&5 2>&1; then + gmp_cv_prog_cpp_for_build=$i + break +*************** +*** 10094,10117 **** + if test -z "$gmp_cv_prog_cpp_for_build"; then + as_fn_error $? "Cannot find build system C preprocessor." "$LINENO" 5 + fi +! + fi + + CPP_FOR_BUILD=$gmp_cv_prog_cpp_for_build + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP_FOR_BUILD" >&5 +! $as_echo "$CPP_FOR_BUILD" >&6; } + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5 +! $as_echo_n "checking for build system executable suffix... " >&6; } +! if ${gmp_cv_prog_exeext_for_build+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.c <&5 +! printf "%s\n" "$CPP_FOR_BUILD" >&6; } + + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for build system executable suffix" >&5 +! printf %s "checking for build system executable suffix... " >&6; } +! if test ${gmp_cv_prog_exeext_for_build+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./conftest) 2>&5; then + gmp_cv_prog_exeext_for_build=$i +--- 11116,11122 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if (./conftest) 2>&5; then + gmp_cv_prog_exeext_for_build=$i +*************** +*** 10135,10154 **** + if test "${gmp_cv_prog_exeext_for_build+set}" != set; then + as_fn_error $? "Cannot determine executable suffix" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_prog_exeext_for_build" >&5 +! $as_echo "$gmp_cv_prog_exeext_for_build" >&6; } + EXEEXT_FOR_BUILD=$gmp_cv_prog_exeext_for_build + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build system compiler is ANSI" >&5 +! $as_echo_n "checking whether build system compiler is ANSI... " >&6; } +! if ${gmp_cv_c_for_build_ansi+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.c <&5 +! printf "%s\n" "$gmp_cv_prog_exeext_for_build" >&6; } + EXEEXT_FOR_BUILD=$gmp_cv_prog_exeext_for_build + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build system compiler is ANSI" >&5 +! printf %s "checking whether build system compiler is ANSI... " >&6; } +! if test ${gmp_cv_c_for_build_ansi+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_cv_c_for_build_ansi=yes + else + gmp_cv_c_for_build_ansi=no + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_for_build_ansi" >&5 +! $as_echo "$gmp_cv_c_for_build_ansi" >&6; } + if test "$gmp_cv_c_for_build_ansi" = yes; then + U_FOR_BUILD= + else +--- 11154,11171 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_cv_c_for_build_ansi=yes + else + gmp_cv_c_for_build_ansi=no + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_for_build_ansi" >&5 +! printf "%s\n" "$gmp_cv_c_for_build_ansi" >&6; } + if test "$gmp_cv_c_for_build_ansi" = yes; then + U_FOR_BUILD= + else +*************** +*** 10178,10189 **** + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build system compiler math library" >&5 +! $as_echo_n "checking for build system compiler math library... " >&6; } +! if ${gmp_cv_check_libm_for_build+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.c < + int + main () +--- 11174,11186 ---- + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for build system compiler math library" >&5 +! printf %s "checking for build system compiler math library... " >&6; } +! if test ${gmp_cv_check_libm_for_build+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.c < + int + main () +*************** +*** 10201,10217 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_cv_check_libm_for_build=-lm + else + gmp_cv_check_libm_for_build=no + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_check_libm_for_build" >&5 +! $as_echo "$gmp_cv_check_libm_for_build" >&6; } + case $gmp_cv_check_libm_for_build in + yes) LIBM_FOR_BUILD=-lm + ;; +--- 11198,11215 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + gmp_cv_check_libm_for_build=-lm + else + gmp_cv_check_libm_for_build=no + fi + rm -f conftest* a.out b.out a.exe a_out.exe +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_check_libm_for_build" >&5 +! printf "%s\n" "$gmp_cv_check_libm_for_build" >&6; } + case $gmp_cv_check_libm_for_build in + yes) LIBM_FOR_BUILD=-lm + ;; +*************** +*** 10233,10239 **** + want_cxx=no + if test $enable_cxx != no; then + test_CXXFLAGS=${CXXFLAGS+set} +! ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +--- 11231,11243 ---- + want_cxx=no + if test $enable_cxx != no; then + test_CXXFLAGS=${CXXFLAGS+set} +! +! +! +! +! +! +! ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +*************** +*** 10243,10284 **** + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then +! for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +! $as_echo "$CXX" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 11247,11294 ---- + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then +! for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +! printf "%s\n" "$CXX" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 10287,10328 **** + fi + if test -z "$CXX"; then + ac_ct_CXX=$CXX +! for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +! $as_echo "$ac_ct_CXX" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 11297,11344 ---- + fi + if test -z "$CXX"; then + ac_ct_CXX=$CXX +! for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CXX="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +! printf "%s\n" "$ac_ct_CXX" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 10334,10341 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +--- 11350,11357 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +*************** +*** 10345,10351 **** + fi + fi + # Provide some information about the compiler. +! $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 + set X $ac_compile + ac_compiler=$2 + for ac_option in --version -v -V -qversion; do +--- 11361,11367 ---- + fi + fi + # Provide some information about the compiler. +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 + set X $ac_compile + ac_compiler=$2 + for ac_option in --version -v -V -qversion; do +*************** +*** 10355,10361 **** + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +--- 11371,11377 ---- + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +*************** +*** 10365,10384 **** + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +! $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +! if ${ac_cv_cxx_compiler_gnu+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + #ifndef __GNUC__ + choke me +--- 11381,11401 ---- + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +! printf %s "checking whether the compiler supports GNU C++... " >&6; } +! if test ${ac_cv_cxx_compiler_gnu+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + #ifndef __GNUC__ + choke me +*************** +*** 10388,10417 **** + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +! else +! ac_compiler_gnu=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +! $as_echo "$ac_cv_cxx_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GXX=yes + else + GXX= + fi +! ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +! $as_echo_n "checking whether $CXX accepts -g... " >&6; } +! if ${ac_cv_prog_cxx_g+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" +--- 11405,11440 ---- + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : + ac_compiler_gnu=yes +! else case e in #( +! e) ac_compiler_gnu=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +! printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +! ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +! + if test $ac_compiler_gnu = yes; then + GXX=yes + else + GXX= + fi +! ac_test_CXXFLAGS=${CXXFLAGS+y} + ac_save_CXXFLAGS=$CXXFLAGS +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +! printf %s "checking whether $CXX accepts -g... " >&6; } +! if test ${ac_cv_prog_cxx_g+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" +*************** +*** 10419,10475 **** + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +! else +! CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : + +! else +! ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +! $as_echo "$ac_cv_prog_cxx_g" >&6; } +! if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then +--- 11442,11504 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : + ac_cv_prog_cxx_g=yes +! else case e in #( +! e) CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : + +! else case e in #( +! e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_compile "$LINENO" +! then : + ac_cv_prog_cxx_g=yes + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +! printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +! if test $ac_test_CXXFLAGS; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then +*************** +*** 10484,10489 **** +--- 11513,11618 ---- + CXXFLAGS= + fi + fi ++ ac_prog_cxx_stdcxx=no ++ if test x$ac_prog_cxx_stdcxx = xno ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 ++ printf %s "checking for $CXX option to enable C++11 features... " >&6; } ++ if test ${ac_cv_prog_cxx_cxx11+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) ac_cv_prog_cxx_cxx11=no ++ ac_save_CXX=$CXX ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ /* end confdefs.h. */ ++ $ac_cxx_conftest_cxx11_program ++ _ACEOF ++ for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA ++ do ++ CXX="$ac_save_CXX $ac_arg" ++ if ac_fn_cxx_try_compile "$LINENO" ++ then : ++ ac_cv_prog_cxx_cxx11=$ac_arg ++ fi ++ rm -f core conftest.err conftest.$ac_objext conftest.beam ++ test "x$ac_cv_prog_cxx_cxx11" != "xno" && break ++ done ++ rm -f conftest.$ac_ext ++ CXX=$ac_save_CXX ;; ++ esac ++ fi ++ ++ if test "x$ac_cv_prog_cxx_cxx11" = xno ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++ printf "%s\n" "unsupported" >&6; } ++ else case e in #( ++ e) if test "x$ac_cv_prog_cxx_cxx11" = x ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++ printf "%s\n" "none needed" >&6; } ++ else case e in #( ++ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 ++ printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } ++ CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; ++ esac ++ fi ++ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 ++ ac_prog_cxx_stdcxx=cxx11 ;; ++ esac ++ fi ++ fi ++ if test x$ac_prog_cxx_stdcxx = xno ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 ++ printf %s "checking for $CXX option to enable C++98 features... " >&6; } ++ if test ${ac_cv_prog_cxx_cxx98+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) ac_cv_prog_cxx_cxx98=no ++ ac_save_CXX=$CXX ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ /* end confdefs.h. */ ++ $ac_cxx_conftest_cxx98_program ++ _ACEOF ++ for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA ++ do ++ CXX="$ac_save_CXX $ac_arg" ++ if ac_fn_cxx_try_compile "$LINENO" ++ then : ++ ac_cv_prog_cxx_cxx98=$ac_arg ++ fi ++ rm -f core conftest.err conftest.$ac_objext conftest.beam ++ test "x$ac_cv_prog_cxx_cxx98" != "xno" && break ++ done ++ rm -f conftest.$ac_ext ++ CXX=$ac_save_CXX ;; ++ esac ++ fi ++ ++ if test "x$ac_cv_prog_cxx_cxx98" = xno ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++ printf "%s\n" "unsupported" >&6; } ++ else case e in #( ++ e) if test "x$ac_cv_prog_cxx_cxx98" = x ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++ printf "%s\n" "none needed" >&6; } ++ else case e in #( ++ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 ++ printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } ++ CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; ++ esac ++ fi ++ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 ++ ac_prog_cxx_stdcxx=cxx98 ;; ++ esac ++ fi ++ fi ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +*************** +*** 10517,10524 **** + # + for cxxflags_choice in $cxxflags_list; do + eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice\" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ compiler $CXX $CPPFLAGS $CXXFLAGS" >&5 +! $as_echo_n "checking C++ compiler $CXX $CPPFLAGS $CXXFLAGS... " >&6; } + gmp_prog_cxx_works=yes + + # start with a plain "main()", then go on to further checks +--- 11646,11653 ---- + # + for cxxflags_choice in $cxxflags_list; do + eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice\" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking C++ compiler $CXX $CPPFLAGS $CXXFLAGS" >&5 +! printf %s "checking C++ compiler $CXX $CPPFLAGS $CXXFLAGS... " >&6; } + gmp_prog_cxx_works=yes + + # start with a plain "main()", then go on to further checks +*************** +*** 10534,10547 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5 + (eval $gmp_cxxcompile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$cross_compiling" = no; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + gmp_prog_cxx_works="no, program does not run" +--- 11663,11676 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5 + (eval $gmp_cxxcompile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$cross_compiling" = no; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + gmp_prog_cxx_works="no, program does not run" +*************** +*** 10574,10587 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5 + (eval $gmp_cxxcompile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$cross_compiling" = no; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + gmp_prog_cxx_works="no, namespace, program does not run" +--- 11703,11716 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5 + (eval $gmp_cxxcompile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$cross_compiling" = no; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + gmp_prog_cxx_works="no, namespace, program does not run" +*************** +*** 10620,10633 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5 + (eval $gmp_cxxcompile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$cross_compiling" = no; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + gmp_prog_cxx_works="no, std iostream, program does not run" +--- 11749,11762 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_cxxcompile\""; } >&5 + (eval $gmp_cxxcompile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$cross_compiling" = no; then + if { ac_try='./a.out || ./b.out || ./a.exe || ./a_out.exe || ./conftest' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then :; + else + gmp_prog_cxx_works="no, std iostream, program does not run" +*************** +*** 10646,10653 **** + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cxx_works" >&5 +! $as_echo "$gmp_prog_cxx_works" >&6; } + case $gmp_prog_cxx_works in + yes) + want_cxx=yes +--- 11775,11782 ---- + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_prog_cxx_works" >&5 +! printf "%s\n" "$gmp_prog_cxx_works" >&6; } + case $gmp_prog_cxx_works in + yes) + want_cxx=yes +*************** +*** 10686,10723 **** + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +! $as_echo_n "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then +! if ${ac_cv_prog_CXXCPP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # Double quotes because CXXCPP needs to be expanded +! for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + +! else +! # Broken: fails on valid input. +! continue + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +--- 11815,11849 ---- + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +! printf %s "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then +! if test ${ac_cv_prog_CXXCPP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # Double quotes because $CXX needs to be expanded +! for CXXCPP in "$CXX -E" cpp /lib/cpp + do + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + +! else case e in #( +! e) # Broken: fails on valid input. +! continue ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +*************** +*** 10727,10782 **** + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +! else +! # Passes both tests. + ac_preproc_ok=: +! break + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok; then : + break + fi + + done + ac_cv_prog_CXXCPP=$CXXCPP +! + fi + CXXCPP=$ac_cv_prog_CXXCPP + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +! $as_echo "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + +! else +! # Broken: fails on valid input. +! continue + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +--- 11853,11908 ---- + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + # Broken: success on invalid input. + continue +! else case e in #( +! e) # Passes both tests. + ac_preproc_ok=: +! break ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok +! then : + break + fi + + done + ac_cv_prog_CXXCPP=$CXXCPP +! ;; +! esac + fi + CXXCPP=$ac_cv_prog_CXXCPP + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +! printf "%s\n" "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + +! else case e in #( +! e) # Broken: fails on valid input. +! continue ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +*************** +*** 10786,10811 **** + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +! else +! # Passes both tests. + ac_preproc_ok=: +! break + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok; then : + +! else +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +! See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +--- 11912,11941 ---- + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + # Broken: success on invalid input. + continue +! else case e in #( +! e) # Passes both tests. + ac_preproc_ok=: +! break ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok +! then : + +! else case e in #( +! e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +! See 'config.log' for more details" "$LINENO" 5; } ;; +! esac + fi + + ac_ext=c +*************** +*** 10822,10865 **** + # + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +! $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +! if ${ac_cv_path_GREP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -z "$GREP"; then +! ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_GREP" || continue +! # Check for GNU ac_path_GREP and select it if it is found. +! # Check for GNU $ac_path_GREP +! case `"$ac_path_GREP" --version 2>&1` in + *GNU*) +! ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + *) + ac_count=0 +! $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! $as_echo 'GREP' >> "conftest.nl" +! "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one +! ac_cv_path_GREP="$ac_path_GREP" +! ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break +--- 11952,12002 ---- + # + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5 +! printf %s "checking for egrep -e... " >&6; } +! if test ${ac_cv_path_EGREP_TRADITIONAL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -z "$EGREP_TRADITIONAL"; then +! ac_path_EGREP_TRADITIONAL_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in grep ggrep +! do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +! # Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. +! # Check for GNU $ac_path_EGREP_TRADITIONAL +! case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( + *GNU*) +! ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +! #( + *) + ac_count=0 +! printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" +! "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + # Best one so far, save it but keep looking for a better one +! ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" +! ac_path_EGREP_TRADITIONAL_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break +*************** +*** 10867,10931 **** + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +! $ac_path_GREP_found && break 3 + done + done + done + IFS=$as_save_IFS +! if test -z "$ac_cv_path_GREP"; then +! as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else +! ac_cv_path_GREP=$GREP +! fi +! + fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +- $as_echo "$ac_cv_path_GREP" >&6; } +- GREP="$ac_cv_path_GREP" + +! +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +! $as_echo_n "checking for egrep... " >&6; } +! if ${ac_cv_path_EGREP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +! then ac_cv_path_EGREP="$GREP -E" +! else +! if test -z "$EGREP"; then +! ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_EGREP" || continue +! # Check for GNU ac_path_EGREP and select it if it is found. +! # Check for GNU $ac_path_EGREP +! case `"$ac_path_EGREP" --version 2>&1` in + *GNU*) +! ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; + *) + ac_count=0 +! $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! $as_echo 'EGREP' >> "conftest.nl" +! "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one +! ac_cv_path_EGREP="$ac_path_EGREP" +! ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break +--- 12004,12064 ---- + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +! $ac_path_EGREP_TRADITIONAL_found && break 3 + done + done + done + IFS=$as_save_IFS +! if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then +! : + fi + else +! ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL + fi + +! if test "$ac_cv_path_EGREP_TRADITIONAL" +! then : +! ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E" +! else case e in #( +! e) if test -z "$EGREP_TRADITIONAL"; then +! ac_path_EGREP_TRADITIONAL_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in egrep +! do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue +! # Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found. +! # Check for GNU $ac_path_EGREP_TRADITIONAL +! case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #( + *GNU*) +! ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;; +! #( + *) + ac_count=0 +! printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl" +! "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then + # Best one so far, save it but keep looking for a better one +! ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" +! ac_path_EGREP_TRADITIONAL_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break +*************** +*** 10933,10956 **** + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +! $ac_path_EGREP_found && break 3 + done + done + done + IFS=$as_save_IFS +! if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else +! ac_cv_path_EGREP=$EGREP + fi +! +! fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +! $as_echo "$ac_cv_path_EGREP" >&6; } +! EGREP="$ac_cv_path_EGREP" +! + + case $host_cpu in + c90 | t90) +--- 12066,12090 ---- + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +! $ac_path_EGREP_TRADITIONAL_found && break 3 + done + done + done + IFS=$as_save_IFS +! if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else +! ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL + fi +! ;; +! esac +! fi ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5 +! printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; } +! EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL + + case $host_cpu in + c90 | t90) +*************** +*** 10961,10972 **** + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "yes" >/dev/null 2>&1; then : + add_path="cray/ieee" +! else +! add_path="cray/cfp"; extra_functions="mulwwc90" + fi +! rm -f conftest* + + ;; + j90 | sv1) +--- 12095,12108 ---- + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 +! then : + add_path="cray/ieee" +! else case e in #( +! e) add_path="cray/cfp"; extra_functions="mulwwc90" ;; +! esac + fi +! rm -rf conftest* + + ;; + j90 | sv1) +*************** +*** 11014,11025 **** + i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-* | athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | jaguar*-*-* | bulldozer*-*-* | piledriver*-*-* | steamroller*-*-* | excavator*-*-* | zen*-*-* | pentium4-*-* | atom-*-* | silvermont-*-* | goldmont-*-* | tremont-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-* | nehalem*-*-* | westmere*-*-* | sandybridge*-*-* | ivybridge*-*-* | haswell*-*-* | broadwell*-*-* | skylake*-*-* | kabylake*-*-* | icelake*-*-* | tigerlake*-*-* | rocketlake*-*-* | alderlake*-*-* | raptorlake*-*-*) + if test "$ABI" = 32; then + case "$path $fat_path" in +! *mmx*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler knows about MMX instructions" >&5 +! $as_echo_n "checking if the assembler knows about MMX instructions... " >&6; } +! if ${gmp_cv_asm_x86_mmx+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if the assembler knows about MMX instructions... " >&6; } +! if test ${gmp_cv_asm_x86_mmx+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_mmx=yes +--- 12164,12170 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_mmx=yes +*************** +*** 11038,11045 **** + gmp_cv_asm_x86_mmx=movq-bug + fi + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"dis\" not available to check for \"as\" movq bug" >&5 +! $as_echo "$as_me: WARNING: \"dis\" not available to check for \"as\" movq bug" >&2;} + fi + esac + else +--- 12175,12182 ---- + gmp_cv_asm_x86_mmx=movq-bug + fi + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"dis\" not available to check for \"as\" movq bug" >&5 +! printf "%s\n" "$as_me: WARNING: \"dis\" not available to check for \"as\" movq bug" >&2;} + fi + esac + else +*************** +*** 11049,11095 **** + gmp_cv_asm_x86_mmx=no + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_mmx" >&5 +! $as_echo "$gmp_cv_asm_x86_mmx" >&6; } + + case $gmp_cv_asm_x86_mmx in + movq-bug) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! $as_echo "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has MMX code, but the assembler" >&5 +! $as_echo "$as_me: WARNING: | Host CPU has MMX code, but the assembler" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! $as_echo "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | has the Solaris 2.6 and 2.7 bug where register to register" >&5 +! $as_echo "$as_me: WARNING: | has the Solaris 2.6 and 2.7 bug where register to register" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | movq operands are reversed." >&5 +! $as_echo "$as_me: WARNING: | movq operands are reversed." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Non-MMX replacements will be used." >&5 +! $as_echo "$as_me: WARNING: | Non-MMX replacements will be used." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! $as_echo "$as_me: WARNING: | This will be an inferior build." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} + ;; + no) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! $as_echo "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has MMX code, but it can't be assembled by" >&5 +! $as_echo "$as_me: WARNING: | Host CPU has MMX code, but it can't be assembled by" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! $as_echo "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Non-MMX replacements will be used." >&5 +! $as_echo "$as_me: WARNING: | Non-MMX replacements will be used." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! $as_echo "$as_me: WARNING: | This will be an inferior build." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} + ;; + esac + if test "$gmp_cv_asm_x86_mmx" = yes; then +--- 12186,12233 ---- + gmp_cv_asm_x86_mmx=no + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_mmx" >&5 +! printf "%s\n" "$gmp_cv_asm_x86_mmx" >&6; } + + case $gmp_cv_asm_x86_mmx in + movq-bug) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! printf "%s\n" "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has MMX code, but the assembler" >&5 +! printf "%s\n" "$as_me: WARNING: | Host CPU has MMX code, but the assembler" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! printf "%s\n" "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | has the Solaris 2.6 and 2.7 bug where register to register" >&5 +! printf "%s\n" "$as_me: WARNING: | has the Solaris 2.6 and 2.7 bug where register to register" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | movq operands are reversed." >&5 +! printf "%s\n" "$as_me: WARNING: | movq operands are reversed." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Non-MMX replacements will be used." >&5 +! printf "%s\n" "$as_me: WARNING: | Non-MMX replacements will be used." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! printf "%s\n" "$as_me: WARNING: | This will be an inferior build." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} + ;; + no) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! printf "%s\n" "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has MMX code, but it can't be assembled by" >&5 +! printf "%s\n" "$as_me: WARNING: | Host CPU has MMX code, but it can't be assembled by" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! printf "%s\n" "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Non-MMX replacements will be used." >&5 +! printf "%s\n" "$as_me: WARNING: | Non-MMX replacements will be used." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! printf "%s\n" "$as_me: WARNING: | This will be an inferior build." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} + ;; + esac + if test "$gmp_cv_asm_x86_mmx" = yes; then +*************** +*** 11118,11129 **** + ;; + esac + case "$path $fat_path" in +! *sse2*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler knows about SSE2 instructions" >&5 +! $as_echo_n "checking if the assembler knows about SSE2 instructions... " >&6; } +! if ${gmp_cv_asm_x86_sse2+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if the assembler knows about SSE2 instructions... " >&6; } +! if test ${gmp_cv_asm_x86_sse2+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_sse2=yes +--- 12270,12276 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_sse2=yes +*************** +*** 11143,11171 **** + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_sse2" >&5 +! $as_echo "$gmp_cv_asm_x86_sse2" >&6; } + case $gmp_cv_asm_x86_sse2 in + yes) + : + ;; + *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! $as_echo "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has SSE2 code, but it can't be assembled by" >&5 +! $as_echo "$as_me: WARNING: | Host CPU has SSE2 code, but it can't be assembled by" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! $as_echo "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Non-SSE2 replacements will be used." >&5 +! $as_echo "$as_me: WARNING: | Non-SSE2 replacements will be used." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! $as_echo "$as_me: WARNING: | This will be an inferior build." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} + tmp_path= + for i in $path; do + case $i in +--- 12282,12311 ---- + fi + rm -f conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_sse2" >&5 +! printf "%s\n" "$gmp_cv_asm_x86_sse2" >&6; } + case $gmp_cv_asm_x86_sse2 in + yes) + : + ;; + *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! printf "%s\n" "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has SSE2 code, but it can't be assembled by" >&5 +! printf "%s\n" "$as_me: WARNING: | Host CPU has SSE2 code, but it can't be assembled by" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! printf "%s\n" "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Non-SSE2 replacements will be used." >&5 +! printf "%s\n" "$as_me: WARNING: | Non-SSE2 replacements will be used." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! printf "%s\n" "$as_me: WARNING: | This will be an inferior build." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} + tmp_path= + for i in $path; do + case $i in +*************** +*** 11197,11203 **** + if test "$enable_assembly" = "no"; then + path="generic" + +! $as_echo "#define NO_ASM 1" >>confdefs.h + + # for abi in $abilist; do + # eval unset "path_\$abi" +--- 12337,12343 ---- + if test "$enable_assembly" = "no"; then + path="generic" + +! printf "%s\n" "#define NO_ASM 1" >>confdefs.h + + # for abi in $abilist; do + # eval unset "path_\$abi" +*************** +*** 11229,11240 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether assembler supports --noexecstack option" >&5 +! $as_echo_n "checking whether assembler supports --noexecstack option... " >&6; } +! if ${cl_cv_as_noexecstack+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat > conftest.c <&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ + && grep .note.GNU-stack conftest.s >/dev/null \ + && { ac_try='${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack +--- 12383,12389 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } \ + && grep .note.GNU-stack conftest.s >/dev/null \ + && { ac_try='${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack +*************** +*** 11250,11266 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then + cl_cv_as_noexecstack=yes + else + cl_cv_as_noexecstack=no + fi +! rm -f conftest* + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cl_cv_as_noexecstack" >&5 +! $as_echo "$cl_cv_as_noexecstack" >&6; } + if test "$cl_cv_as_noexecstack" = yes; then + ASMFLAGS="$ASMFLAGS -Wa,--noexecstack" + fi +--- 12391,12408 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then + cl_cv_as_noexecstack=yes + else + cl_cv_as_noexecstack=no + fi +! rm -f conftest* ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cl_cv_as_noexecstack" >&5 +! printf "%s\n" "$cl_cv_as_noexecstack" >&6; } + if test "$cl_cv_as_noexecstack" = yes; then + ASMFLAGS="$ASMFLAGS -Wa,--noexecstack" + fi +*************** +*** 11272,11309 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_AR+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +! $as_echo "$AR" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 12414,12457 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_AR+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +! printf "%s\n" "$AR" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11312,11349 **** + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_AR+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +! $as_echo "$ac_ct_AR" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_AR" = x; then +--- 12460,12503 ---- + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_AR+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +! printf "%s\n" "$ac_ct_AR" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_AR" = x; then +*************** +*** 11351,11358 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + AR=$ac_ct_AR +--- 12505,12512 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + AR=$ac_ct_AR +*************** +*** 11365,11377 **** + eval arflags=\"\$ar${abi1}_flags\" + test -n "$arflags" || eval arflags=\"\$ar${abi2}_flags\" + if test -n "$arflags"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra ar flags" >&5 +! $as_echo_n "checking for extra ar flags... " >&6; } + AR="$AR $arflags" + ac_cv_prog_AR="$AR $arflags" + ac_cv_prog_ac_ct_AR="$AR $arflags" +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $arflags" >&5 +! $as_echo "$arflags" >&6; } + fi + fi + if test -z "$AR_FLAGS"; then +--- 12519,12531 ---- + eval arflags=\"\$ar${abi1}_flags\" + test -n "$arflags" || eval arflags=\"\$ar${abi2}_flags\" + if test -n "$arflags"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extra ar flags" >&5 +! printf %s "checking for extra ar flags... " >&6; } + AR="$AR $arflags" + ac_cv_prog_AR="$AR $arflags" + ac_cv_prog_ac_ct_AR="$AR $arflags" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $arflags" >&5 +! printf "%s\n" "$arflags" >&6; } + fi + fi + if test -z "$AR_FLAGS"; then +*************** +*** 11380,11391 **** + + + gmp_user_NM=$NM +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +! $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +! if ${lt_cv_path_NM+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM + else +--- 12534,12546 ---- + + + gmp_user_NM=$NM +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +! printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +! if test ${lt_cv_path_NM+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM + else +*************** +*** 11406,11421 **** + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in +! mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac +! case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) +! case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 +--- 12561,12576 ---- + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in +! mingw* | windows*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac +! case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) +! case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 +*************** +*** 11432,11441 **** + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} + fi +! fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +! $as_echo "$lt_cv_path_NM" >&6; } + if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM + else +--- 12587,12597 ---- + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} ++ fi ;; ++ esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +! printf "%s\n" "$lt_cv_path_NM" >&6; } + if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM + else +*************** +*** 11448,11485 **** + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_DUMPBIN+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +! $as_echo "$DUMPBIN" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 12604,12647 ---- + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_DUMPBIN+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +! printf "%s\n" "$DUMPBIN" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11492,11529 **** + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +! $as_echo "$ac_ct_DUMPBIN" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 12654,12697 ---- + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +! printf "%s\n" "$ac_ct_DUMPBIN" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11535,11549 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DUMPBIN=$ac_ct_DUMPBIN + fi + fi + +! case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; +--- 12703,12717 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DUMPBIN=$ac_ct_DUMPBIN + fi + fi + +! case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; +*************** +*** 11564,11575 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +! $as_echo_n "checking the name lister ($NM) interface... " >&6; } +! if ${lt_cv_nm_interface+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) +--- 12732,12744 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +! printf %s "checking the name lister ($NM) interface... " >&6; } +! if test ${lt_cv_nm_interface+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) +*************** +*** 11582,11591 **** + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi +! rm -f conftest* + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +! $as_echo "$lt_cv_nm_interface" >&6; } + + + # FIXME: When cross compiling (ie. $ac_tool_prefix not empty), libtool +--- 12751,12761 ---- + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi +! rm -f conftest* ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +! printf "%s\n" "$lt_cv_nm_interface" >&6; } + + + # FIXME: When cross compiling (ie. $ac_tool_prefix not empty), libtool +*************** +*** 11600,11611 **** + gmp_save_ac_tool_prefix=$ac_tool_prefix + ac_tool_prefix= + NM= +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +! $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +! if ${lt_cv_path_NM+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM + else +--- 12770,12782 ---- + gmp_save_ac_tool_prefix=$ac_tool_prefix + ac_tool_prefix= + NM= +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +! printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +! if test ${lt_cv_path_NM+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM + else +*************** +*** 11626,11641 **** + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in +! mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac +! case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) +! case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 +--- 12797,12812 ---- + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in +! mingw* | windows*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac +! case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) +! case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 +*************** +*** 11652,11661 **** + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} + fi +! fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +! $as_echo "$lt_cv_path_NM" >&6; } + if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM + else +--- 12823,12833 ---- + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} ++ fi ;; ++ esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +! printf "%s\n" "$lt_cv_path_NM" >&6; } + if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM + else +*************** +*** 11668,11705 **** + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_DUMPBIN+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +! $as_echo "$DUMPBIN" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 12840,12883 ---- + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_DUMPBIN+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +! printf "%s\n" "$DUMPBIN" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11712,11749 **** + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +! $as_echo "$ac_ct_DUMPBIN" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 12890,12933 ---- + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +! printf "%s\n" "$ac_ct_DUMPBIN" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11755,11769 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DUMPBIN=$ac_ct_DUMPBIN + fi + fi + +! case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; +--- 12939,12953 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DUMPBIN=$ac_ct_DUMPBIN + fi + fi + +! case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; +*************** +*** 11781,11792 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +! $as_echo_n "checking the name lister ($NM) interface... " >&6; } +! if ${lt_cv_nm_interface+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) +--- 12965,12977 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +! printf %s "checking the name lister ($NM) interface... " >&6; } +! if test ${lt_cv_nm_interface+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) +*************** +*** 11799,11808 **** + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi +! rm -f conftest* + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +! $as_echo "$lt_cv_nm_interface" >&6; } + + ac_tool_prefix=$gmp_save_ac_tool_prefix + fi +--- 12984,12994 ---- + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi +! rm -f conftest* ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +! printf "%s\n" "$lt_cv_nm_interface" >&6; } + + ac_tool_prefix=$gmp_save_ac_tool_prefix + fi +*************** +*** 11811,11821 **** + eval nmflags=\"\$nm${abi1}_flags\" + test -n "$nmflags" || eval nmflags=\"\$nm${abi2}_flags\" + if test -n "$nmflags"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra nm flags" >&5 +! $as_echo_n "checking for extra nm flags... " >&6; } + NM="$NM $nmflags" +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nmflags" >&5 +! $as_echo "$nmflags" >&6; } + fi + fi + +--- 12997,13007 ---- + eval nmflags=\"\$nm${abi1}_flags\" + test -n "$nmflags" || eval nmflags=\"\$nm${abi2}_flags\" + if test -n "$nmflags"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extra nm flags" >&5 +! printf %s "checking for extra nm flags... " >&6; } + NM="$NM $nmflags" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $nmflags" >&5 +! printf "%s\n" "$nmflags" >&6; } + fi + fi + +*************** +*** 11842,11883 **** + enable_win32_dll=yes + + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_AS+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AS="${ac_tool_prefix}as" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +! $as_echo "$AS" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 13028,13075 ---- + enable_win32_dll=yes + + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_AS+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AS="${ac_tool_prefix}as" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +! printf "%s\n" "$AS" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11886,11923 **** + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_AS+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AS="as" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +! $as_echo "$ac_ct_AS" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_AS" = x; then +--- 13078,13121 ---- + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_AS+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AS="as" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +! printf "%s\n" "$ac_ct_AS" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_AS" = x; then +*************** +*** 11925,11932 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + AS=$ac_ct_AS +--- 13123,13130 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + AS=$ac_ct_AS +*************** +*** 11938,11975 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_DLLTOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +! $as_echo "$DLLTOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 13136,13179 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_DLLTOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +! printf "%s\n" "$DLLTOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 11978,12015 **** + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +! $as_echo "$ac_ct_DLLTOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_DLLTOOL" = x; then +--- 13182,13225 ---- + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +! printf "%s\n" "$ac_ct_DLLTOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_DLLTOOL" = x; then +*************** +*** 12017,12024 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DLLTOOL=$ac_ct_DLLTOOL +--- 13227,13234 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DLLTOOL=$ac_ct_DLLTOOL +*************** +*** 12030,12067 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_OBJDUMP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +! $as_echo "$OBJDUMP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 13240,13283 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_OBJDUMP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +! printf "%s\n" "$OBJDUMP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 12070,12107 **** + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +! $as_echo "$ac_ct_OBJDUMP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_OBJDUMP" = x; then +--- 13286,13329 ---- + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +! printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_OBJDUMP" = x; then +*************** +*** 12109,12116 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OBJDUMP=$ac_ct_OBJDUMP +--- 13331,13338 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OBJDUMP=$ac_ct_OBJDUMP +*************** +*** 12234,12247 **** + + case `pwd` in + *\ * | *\ *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +! $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + + + +! macro_version='2.4.6' +! macro_revision='2.4.6' + + + +--- 13456,13470 ---- + + case `pwd` in + *\ * | *\ *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +! printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + + + +! macro_version='2.5.4.23-5b58' +! macro_revision='2.5.4.23' +! + + + +*************** +*** 12278,12285 **** + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +! $as_echo_n "checking how to print strings... " >&6; } + # Test print first, because it will be a builtin if present. + if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then +--- 13501,13508 ---- + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +! printf %s "checking how to print strings... " >&6; } + # Test print first, because it will be a builtin if present. + if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then +*************** +*** 12305,12316 **** + } + + case $ECHO in +! printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +! $as_echo "printf" >&6; } ;; +! print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +! $as_echo "print -r" >&6; } ;; +! *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +! $as_echo "cat" >&6; } ;; + esac + + +--- 13528,13539 ---- + } + + case $ECHO in +! printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +! printf "%s\n" "printf" >&6; } ;; +! print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +! printf "%s\n" "print -r" >&6; } ;; +! *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +! printf "%s\n" "cat" >&6; } ;; + esac + + +*************** +*** 12326,12337 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +! $as_echo_n "checking for a sed that does not truncate output... " >&6; } +! if ${ac_cv_path_SED+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done +--- 13549,13561 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +! printf %s "checking for a sed that does not truncate output... " >&6; } +! if test ${ac_cv_path_SED+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done +*************** +*** 12344,12368 **** + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue + # Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +! case `"$ac_path_SED" --version 2>&1` in + *GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; + *) + ac_count=0 +! $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +--- 13568,13598 ---- + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in sed gsed +! do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue + # Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +! case `"$ac_path_SED" --version 2>&1` in #( + *GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; ++ #( + *) + ac_count=0 +! printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! printf "%s\n" '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +*************** +*** 12388,12397 **** + else + ac_cv_path_SED=$SED + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +! $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +--- 13618,13628 ---- + else + ac_cv_path_SED=$SED + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +! printf "%s\n" "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +*************** +*** 12408,12419 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +! $as_echo_n "checking for fgrep... " >&6; } +! if ${ac_cv_path_FGREP+:} false; then : +! $as_echo_n "(cached) " >&6 + else +! if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then +--- 13639,13799 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +! printf %s "checking for grep that handles long lines and -e... " >&6; } +! if test ${ac_cv_path_GREP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -z "$GREP"; then +! ac_path_GREP_found=false +! # Loop through the user's path and test for each of PROGNAME-LIST +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +! do +! IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in grep ggrep +! do +! for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_GREP" || continue +! # Check for GNU ac_path_GREP and select it if it is found. +! # Check for GNU $ac_path_GREP +! case `"$ac_path_GREP" --version 2>&1` in #( +! *GNU*) +! ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +! #( +! *) +! ac_count=0 +! printf %s 0123456789 >"conftest.in" +! while : +! do +! cat "conftest.in" "conftest.in" >"conftest.tmp" +! mv "conftest.tmp" "conftest.in" +! cp "conftest.in" "conftest.nl" +! printf "%s\n" 'GREP' >> "conftest.nl" +! "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break +! diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +! as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_GREP_max-0}; then +! # Best one so far, save it but keep looking for a better one +! ac_cv_path_GREP="$ac_path_GREP" +! ac_path_GREP_max=$ac_count +! fi +! # 10*(2^10) chars as input seems more than enough +! test $ac_count -gt 10 && break +! done +! rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +! esac +! +! $ac_path_GREP_found && break 3 +! done +! done +! done +! IFS=$as_save_IFS +! if test -z "$ac_cv_path_GREP"; then +! as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +! fi + else +! ac_cv_path_GREP=$GREP +! fi +! ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +! printf "%s\n" "$ac_cv_path_GREP" >&6; } +! GREP="$ac_cv_path_GREP" +! +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +! printf %s "checking for egrep... " >&6; } +! if test ${ac_cv_path_EGREP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +! then ac_cv_path_EGREP="$GREP -E" +! else +! if test -z "$EGREP"; then +! ac_path_EGREP_found=false +! # Loop through the user's path and test for each of PROGNAME-LIST +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +! do +! IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in egrep +! do +! for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_EGREP" || continue +! # Check for GNU ac_path_EGREP and select it if it is found. +! # Check for GNU $ac_path_EGREP +! case `"$ac_path_EGREP" --version 2>&1` in #( +! *GNU*) +! ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +! #( +! *) +! ac_count=0 +! printf %s 0123456789 >"conftest.in" +! while : +! do +! cat "conftest.in" "conftest.in" >"conftest.tmp" +! mv "conftest.tmp" "conftest.in" +! cp "conftest.in" "conftest.nl" +! printf "%s\n" 'EGREP' >> "conftest.nl" +! "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +! diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +! as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_EGREP_max-0}; then +! # Best one so far, save it but keep looking for a better one +! ac_cv_path_EGREP="$ac_path_EGREP" +! ac_path_EGREP_max=$ac_count +! fi +! # 10*(2^10) chars as input seems more than enough +! test $ac_count -gt 10 && break +! done +! rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +! esac +! +! $ac_path_EGREP_found && break 3 +! done +! done +! done +! IFS=$as_save_IFS +! if test -z "$ac_cv_path_EGREP"; then +! as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +! fi +! else +! ac_cv_path_EGREP=$EGREP +! fi +! +! fi ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +! printf "%s\n" "$ac_cv_path_EGREP" >&6; } +! EGREP="$ac_cv_path_EGREP" +! +! EGREP_TRADITIONAL=$EGREP +! ac_cv_path_EGREP_TRADITIONAL=$EGREP +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +! printf %s "checking for fgrep... " >&6; } +! if test ${ac_cv_path_FGREP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then +*************** +*** 12423,12447 **** + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue + # Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +! case `"$ac_path_FGREP" --version 2>&1` in + *GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; + *) + ac_count=0 +! $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +--- 13803,13833 ---- + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in fgrep +! do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue + # Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +! case `"$ac_path_FGREP" --version 2>&1` in #( + *GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; ++ #( + *) + ac_count=0 +! printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +! printf "%s\n" 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val +*************** +*** 12468,12477 **** + ac_cv_path_FGREP=$FGREP + fi + +! fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +! $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +--- 13854,13864 ---- + ac_cv_path_FGREP=$FGREP + fi + +! fi ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +! printf "%s\n" "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +*************** +*** 12496,12514 **** + + + # Check whether --with-gnu-ld was given. +! if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes +! else +! with_gnu_ld=no + fi + + ac_prog=ld + if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +! $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in +! *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) +--- 13883,13903 ---- + + + # Check whether --with-gnu-ld was given. +! if test ${with_gnu_ld+y} +! then : + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes +! else case e in #( +! e) with_gnu_ld=no ;; +! esac + fi + + ac_prog=ld + if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +! printf %s "checking for ld used by $CC... " >&6; } + case $host in +! *-*-mingw* | *-*-windows*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) +*************** +*** 12535,12550 **** + ;; + esac + elif test yes = "$with_gnu_ld"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +! $as_echo_n "checking for GNU ld... " >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +! $as_echo_n "checking for non-GNU ld... " >&6; } + fi +! if ${lt_cv_path_LD+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs +--- 13924,13940 ---- + ;; + esac + elif test yes = "$with_gnu_ld"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +! printf %s "checking for GNU ld... " >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +! printf %s "checking for non-GNU ld... " >&6; } + fi +! if test ${lt_cv_path_LD+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs +*************** +*** 12567,12590 **** + IFS=$lt_save_ifs + else + lt_cv_path_LD=$LD # Let the user override the test with a path. +! fi + fi + + LD=$lt_cv_path_LD + if test -n "$LD"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +! $as_echo "$LD" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +! $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +! if ${lt_cv_prog_gnu_ld+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +! printf "%s\n" "$LD" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +! printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +! if test ${lt_cv_prog_gnu_ld+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +! $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +--- 13984,13994 ---- + *) + lt_cv_prog_gnu_ld=no + ;; ++ esac ;; + esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +! printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +*************** +*** 12606,12629 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +! $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +! $as_echo "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +! $as_echo_n "checking the maximum length of command line arguments... " >&6; } +! if ${lt_cv_sys_max_cmd_len+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! i=0 + teststring=ABCD + + case $build_os in +--- 13999,14023 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +! printf %s "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +! printf "%s\n" "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +! printf %s "checking the maximum length of command line arguments... " >&6; } +! if test ${lt_cv_sys_max_cmd_len+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) i=0 + teststring=ABCD + + case $build_os in +*************** +*** 12635,12648 **** + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + +! gnu*) +! # Under GNU Hurd, this test is not required because there is +! # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + +! cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +--- 14029,14042 ---- + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + +! gnu* | ironclad*) +! # Under GNU Hurd and Ironclad, this test is not required because there +! # is no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + +! cygwin* | mingw* | windows* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +*************** +*** 12664,12670 **** + lt_cv_sys_max_cmd_len=8192; + ;; + +! bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +--- 14058,14064 ---- + lt_cv_sys_max_cmd_len=8192; + ;; + +! darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +*************** +*** 12707,12713 **** + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then +! lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi +--- 14101,14107 ---- + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then +! lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi +*************** +*** 12745,12759 **** + fi + ;; + esac +! + fi + + if test -n "$lt_cv_sys_max_cmd_len"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +! $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +! $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len + +--- 14139,14154 ---- + fi + ;; + esac +! ;; +! esac + fi + + if test -n "$lt_cv_sys_max_cmd_len"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +! printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +! printf "%s\n" "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len + +*************** +*** 12797,12811 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +! $as_echo_n "checking how to convert $build file names to $host format... " >&6; } +! if ${lt_cv_to_host_file_cmd+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $host in + *-*-mingw* ) + case $build in +! *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) +--- 14192,14207 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +! printf %s "checking how to convert $build file names to $host format... " >&6; } +! if test ${lt_cv_to_host_file_cmd+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $host in + *-*-mingw* ) + case $build in +! *-*-mingw* | *-*-windows* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) +*************** +*** 12818,12824 **** + ;; + *-*-cygwin* ) + case $build in +! *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) +--- 14214,14220 ---- + ;; + *-*-cygwin* ) + case $build in +! *-*-mingw* | *-*-windows* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) +*************** +*** 12833,12885 **** + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + esac +! + fi + + to_host_file_cmd=$lt_cv_to_host_file_cmd +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +! $as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +! $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +! if ${lt_cv_to_tool_file_cmd+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! #assume ordinary cross tools, or native build. + lt_cv_to_tool_file_cmd=func_convert_file_noop + case $host in +! *-*-mingw* ) + case $build in +! *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; + esac +! + fi + + to_tool_file_cmd=$lt_cv_to_tool_file_cmd +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +! $as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +! $as_echo_n "checking for $LD option to reload object files... " >&6; } +! if ${lt_cv_ld_reload_flag+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_ld_reload_flag='-r' + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +! $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; +--- 14229,14286 ---- + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + esac +! ;; +! esac + fi + + to_host_file_cmd=$lt_cv_to_host_file_cmd +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +! printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } + + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +! printf %s "checking how to convert $build file names to toolchain format... " >&6; } +! if test ${lt_cv_to_tool_file_cmd+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) #assume ordinary cross tools, or native build. + lt_cv_to_tool_file_cmd=func_convert_file_noop + case $host in +! *-*-mingw* | *-*-windows* ) + case $build in +! *-*-mingw* | *-*-windows* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; + esac +! ;; +! esac + fi + + to_tool_file_cmd=$lt_cv_to_tool_file_cmd +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +! printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +! printf %s "checking for $LD option to reload object files... " >&6; } +! if test ${lt_cv_ld_reload_flag+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_ld_reload_flag='-r' ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +! printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; +*************** +*** 12887,12900 **** + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) + if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) + if test yes = "$GCC"; then +! reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +--- 14288,14301 ---- + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) + if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) + if test yes = "$GCC"; then +! reload_cmds='$LTCC $LTCFLAGS $stdlibflag $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +*************** +*** 12909,12949 **** + + + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_OBJDUMP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +! $as_echo "$OBJDUMP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 14310,14406 ---- + + + ++ # Extract the first word of "file", so it can be a program name with args. ++ set dummy file; ac_word=$2 ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++ printf %s "checking for $ac_word... " >&6; } ++ if test ${ac_cv_prog_FILECMD+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) if test -n "$FILECMD"; then ++ ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. ++ else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ for as_dir in $PATH ++ do ++ IFS=$as_save_IFS ++ case $as_dir in #((( ++ '') as_dir=./ ;; ++ */) ;; ++ *) as_dir=$as_dir/ ;; ++ esac ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ++ ac_cv_prog_FILECMD="file" ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++ done ++ done ++ IFS=$as_save_IFS ++ ++ test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":" ++ fi ;; ++ esac ++ fi ++ FILECMD=$ac_cv_prog_FILECMD ++ if test -n "$FILECMD"; then ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 ++ printf "%s\n" "$FILECMD" >&6; } ++ else ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ printf "%s\n" "no" >&6; } ++ fi ++ ++ ++ ++ ++ ++ ++ ++ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_OBJDUMP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +! printf "%s\n" "$OBJDUMP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 12952,12989 **** + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +! $as_echo "$ac_ct_OBJDUMP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_OBJDUMP" = x; then +--- 14409,14452 ---- + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +! printf "%s\n" "$ac_ct_OBJDUMP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_OBJDUMP" = x; then +*************** +*** 12991,12998 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OBJDUMP=$ac_ct_OBJDUMP +--- 14454,14461 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OBJDUMP=$ac_ct_OBJDUMP +*************** +*** 13008,13019 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +! $as_echo_n "checking how to recognize dependent libraries... " >&6; } +! if ${lt_cv_deplibs_check_method+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= + lt_cv_deplibs_check_method='unknown' + # Need to set the preceding variable on all platforms that support +--- 14471,14483 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +! printf %s "checking how to recognize dependent libraries... " >&6; } +! if test ${lt_cv_deplibs_check_method+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= + lt_cv_deplibs_check_method='unknown' + # Need to set the preceding variable on all platforms that support +*************** +*** 13021,13027 **** + # 'none' -- dependencies not supported. + # 'unknown' -- same as none, but documents that we really don't know. + # 'pass_all' -- all dependencies passed with no checks. +- # 'test_compile' -- check by making test program. + # 'file_magic [[regex]]' -- check by looking for files in library path + # that responds to the $file_magic_cmd with a given extended regex. + # If you have 'file' or equivalent on your system and you're not sure +--- 14485,14490 ---- +*************** +*** 13038,13044 **** + + bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' +! lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +--- 14501,14507 ---- + + bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' +! lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +*************** +*** 13048,13054 **** + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +! mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. +--- 14511,14517 ---- + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +! mingw* | windows* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. +*************** +*** 13057,13063 **** + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. +! lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +--- 14520,14526 ---- + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. +! lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +*************** +*** 13072,13085 **** + lt_cv_deplibs_check_method=pass_all + ;; + +! freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' +! lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac +--- 14535,14548 ---- + lt_cv_deplibs_check_method=pass_all + ;; + +! freebsd* | dragonfly* | midnightbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' +! lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac +*************** +*** 13093,13099 **** + ;; + + hpux10.20* | hpux11*) +! lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' +--- 14556,14562 ---- + ;; + + hpux10.20* | hpux11*) +! lt_cv_file_magic_cmd=$FILECMD + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' +*************** +*** 13130,13136 **** + lt_cv_deplibs_check_method=pass_all + ;; + +! netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +--- 14593,14603 ---- + lt_cv_deplibs_check_method=pass_all + ;; + +! *-mlibc) +! lt_cv_deplibs_check_method=pass_all +! ;; +! +! netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +*************** +*** 13140,13146 **** + + newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' +! lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +--- 14607,14613 ---- + + newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' +! lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*************** +*** 13148,13154 **** + lt_cv_deplibs_check_method=pass_all + ;; + +! openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else +--- 14615,14621 ---- + lt_cv_deplibs_check_method=pass_all + ;; + +! openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else +*************** +*** 13164,13169 **** +--- 14631,14640 ---- + lt_cv_deplibs_check_method=pass_all + ;; + ++ serenity*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +*************** +*** 13206,13221 **** + lt_cv_deplibs_check_method=pass_all + ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +! $as_echo "$lt_cv_deplibs_check_method" >&6; } + + file_magic_glob= + want_nocaseglob=no + if test "$build" = "$host"; then + case $host_os in +! mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else +--- 14677,14693 ---- + lt_cv_deplibs_check_method=pass_all + ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +! printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } + + file_magic_glob= + want_nocaseglob=no + if test "$build" = "$host"; then + case $host_os in +! mingw* | windows* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else +*************** +*** 13253,13290 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_DLLTOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +! $as_echo "$DLLTOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 14725,14768 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_DLLTOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +! printf "%s\n" "$DLLTOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 13293,13330 **** + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +! $as_echo "$ac_ct_DLLTOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_DLLTOOL" = x; then +--- 14771,14814 ---- + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +! printf "%s\n" "$ac_ct_DLLTOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_DLLTOOL" = x; then +*************** +*** 13332,13339 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DLLTOOL=$ac_ct_DLLTOOL +--- 14816,14823 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DLLTOOL=$ac_ct_DLLTOOL +*************** +*** 13350,13364 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +! $as_echo_n "checking how to associate runtime and link libraries... " >&6; } +! if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_sharedlib_from_linklib_cmd='unknown' + + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in +--- 14834,14849 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +! printf %s "checking how to associate runtime and link libraries... " >&6; } +! if test ${lt_cv_sharedlib_from_linklib_cmd+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_sharedlib_from_linklib_cmd='unknown' + + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in +*************** +*** 13375,13384 **** + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +! $as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } + sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd + test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +--- 14860,14870 ---- + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +! printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } + sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd + test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +*************** +*** 13389,13430 **** + + + if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_AR+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +! $as_echo "$AR" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 14875,15026 ---- + + + if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ++ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++ printf %s "checking for $ac_word... " >&6; } ++ if test ${ac_cv_prog_RANLIB+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ++ else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ for as_dir in $PATH ++ do ++ IFS=$as_save_IFS ++ case $as_dir in #((( ++ '') as_dir=./ ;; ++ */) ;; ++ *) as_dir=$as_dir/ ;; ++ esac ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++ done ++ done ++ IFS=$as_save_IFS ++ ++ fi ;; ++ esac ++ fi ++ RANLIB=$ac_cv_prog_RANLIB ++ if test -n "$RANLIB"; then ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 ++ printf "%s\n" "$RANLIB" >&6; } ++ else ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ printf "%s\n" "no" >&6; } ++ fi ++ ++ ++ fi ++ if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++ set dummy ranlib; ac_word=$2 ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++ printf %s "checking for $ac_word... " >&6; } ++ if test ${ac_cv_prog_ac_ct_RANLIB+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. ++ else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ for as_dir in $PATH ++ do ++ IFS=$as_save_IFS ++ case $as_dir in #((( ++ '') as_dir=./ ;; ++ */) ;; ++ *) as_dir=$as_dir/ ;; ++ esac ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_RANLIB="ranlib" ++ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++ done ++ done ++ IFS=$as_save_IFS ++ ++ fi ;; ++ esac ++ fi ++ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++ if test -n "$ac_ct_RANLIB"; then ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 ++ printf "%s\n" "$ac_ct_RANLIB" >&6; } ++ else ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ printf "%s\n" "no" >&6; } ++ fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++ yes:) ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++ printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ ac_tool_warned=yes ;; ++ esac ++ RANLIB=$ac_ct_RANLIB ++ fi ++ else ++ RANLIB="$ac_cv_prog_RANLIB" ++ fi ++ ++ if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_AR+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +! printf "%s\n" "$AR" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 13437,13474 **** + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_AR+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +! $as_echo "$ac_ct_AR" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 15033,15076 ---- + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_AR+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +! printf "%s\n" "$ac_ct_AR" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 13480,13487 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + AR=$ac_ct_AR +--- 15082,15089 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + AR=$ac_ct_AR +*************** +*** 13489,13530 **** + fi + + : ${AR=ar} +- : ${AR_FLAGS=cru} + + + + + + + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +! $as_echo_n "checking for archiver @FILE support... " >&6; } +! if ${lt_cv_ar_at_file+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. +--- 15091,15150 ---- + fi + + : ${AR=ar} + + + + + + ++ # Use ARFLAGS variable as AR's operation code to sync the variable naming with ++ # Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have ++ # higher priority because that's what people were doing historically (setting ++ # ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS ++ # variable obsoleted/removed. + ++ test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} ++ lt_ar_flags=$AR_FLAGS + + + + +! +! +! # Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +! # by AR_FLAGS because that was never working and AR_FLAGS is about to die. +! +! +! +! +! +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +! printf %s "checking for archiver @FILE support... " >&6; } +! if test ${lt_cv_ar_at_file+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. +*************** +*** 13532,13538 **** + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ +--- 15152,15158 ---- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ +*************** +*** 13541,13551 **** + rm -f conftest.* libconftest.a + + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +! $as_echo "$lt_cv_ar_at_file" >&6; } + + if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +--- 15161,15172 ---- + rm -f conftest.* libconftest.a + + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +! printf "%s\n" "$lt_cv_ar_at_file" >&6; } + + if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +*************** +*** 13562,13599 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_STRIP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +! $as_echo "$STRIP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 15183,15226 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_STRIP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +! printf "%s\n" "$STRIP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 13602,13639 **** + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +! $as_echo "$ac_ct_STRIP" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +--- 15229,15272 ---- + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_STRIP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +! printf "%s\n" "$ac_ct_STRIP" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +*************** +*** 13641,13648 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + STRIP=$ac_ct_STRIP +--- 15274,15281 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + STRIP=$ac_ct_STRIP +*************** +*** 13658,13754 **** + + + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +- set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +- $as_echo_n "checking for $ac_word... " >&6; } +- if ${ac_cv_prog_RANLIB+:} false; then : +- $as_echo_n "(cached) " >&6 +- else +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +- else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +- for as_dir in $PATH +- do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +- done +- done +- IFS=$as_save_IFS +- +- fi +- fi +- RANLIB=$ac_cv_prog_RANLIB +- if test -n "$RANLIB"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +- $as_echo "$RANLIB" >&6; } +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +- $as_echo "no" >&6; } +- fi +- +- +- fi +- if test -z "$ac_cv_prog_RANLIB"; then +- ac_ct_RANLIB=$RANLIB +- # Extract the first word of "ranlib", so it can be a program name with args. +- set dummy ranlib; ac_word=$2 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +- $as_echo_n "checking for $ac_word... " >&6; } +- if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +- $as_echo_n "(cached) " >&6 +- else +- if test -n "$ac_ct_RANLIB"; then +- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +- else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +- for as_dir in $PATH +- do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +- done +- done +- IFS=$as_save_IFS +- +- fi +- fi +- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +- if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +- $as_echo "$ac_ct_RANLIB" >&6; } +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +- $as_echo "no" >&6; } +- fi +- +- if test "x$ac_ct_RANLIB" = x; then +- RANLIB=":" +- else +- case $cross_compiling:$ac_tool_warned in +- yes:) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +- ac_tool_warned=yes ;; +- esac +- RANLIB=$ac_ct_RANLIB +- fi +- else +- RANLIB="$ac_cv_prog_RANLIB" +- fi + + test -z "$RANLIB" && RANLIB=: + +--- 15291,15296 ---- +*************** +*** 13763,13777 **** + old_postuninstall_cmds= + + if test -n "$RANLIB"; then +- case $host_os in +- bitrig* | openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" +- ;; +- esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + fi + + case $host_os in +--- 15305,15312 ---- + old_postuninstall_cmds= + + if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + fi + + case $host_os in +*************** +*** 13830,13841 **** + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +! $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +! if ${lt_cv_sys_global_symbol_pipe+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! + # These are sane defaults that work on at least a few old systems. + # [They come from Ultrix. What could be older than Ultrix?!! ;)] + +--- 15365,15377 ---- + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +! printf %s "checking command to parse $NM output from $compiler object... " >&6; } +! if test ${lt_cv_sys_global_symbol_pipe+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) + # These are sane defaults that work on at least a few old systems. + # [They come from Ultrix. What could be older than Ultrix?!! ;)] + +*************** +*** 13850,13856 **** + aix*) + symcode='[BCDT]' + ;; +! cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; + hpux*) +--- 15386,15392 ---- + aix*) + symcode='[BCDT]' + ;; +! cygwin* | mingw* | windows* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; + hpux*) +*************** +*** 13865,13871 **** + symcode='[BCDEGQRST]' + ;; + solaris*) +! symcode='[BDRT]' + ;; + sco3.2v5*) + symcode='[DT]' +--- 15401,15407 ---- + symcode='[BCDEGQRST]' + ;; + solaris*) +! symcode='[BCDRT]' + ;; + sco3.2v5*) + symcode='[DT]' +*************** +*** 13889,13895 **** + + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. +! lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" +--- 15425,15431 ---- + + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. +! lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" +*************** +*** 13907,13926 **** + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. +! lt_cv_sys_global_symbol_to_cdecl="sed -n"\ + $lt_cdecl_hook\ + " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +! lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ + $lt_c_name_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + + # Transform an extracted symbol line into symbol name with lib prefix and + # symbol address. +! lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ + $lt_c_name_lib_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +--- 15443,15462 ---- + # Transform an extracted symbol line into a proper C declaration. + # Some systems (esp. on ia64) link data and code symbols differently, + # so use this general approach. +! lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ + $lt_cdecl_hook\ + " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + + # Transform an extracted symbol line into symbol name and symbol address +! lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ + $lt_c_name_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + + # Transform an extracted symbol line into symbol name with lib prefix and + # symbol address. +! lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ + $lt_c_name_lib_hook\ + " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ + " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +*************** +*** 13929,13935 **** + # Handle CRLF in mingw tool chain + opt_cr= + case $build_os in +! mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; + esac +--- 15465,15471 ---- + # Handle CRLF in mingw tool chain + opt_cr= + case $build_os in +! mingw* | windows*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; + esac +*************** +*** 13944,13950 **** + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. +! # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ + " {last_section=section; section=\$ 3};"\ +--- 15480,15486 ---- + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. +! # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ + " {last_section=section; section=\$ 3};"\ +*************** +*** 13962,13970 **** + " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx" + else +! lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +! lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +--- 15498,15506 ---- + " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ + " ' prfx=^$ac_symprfx" + else +! lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi +! lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no +*************** +*** 13980,14000 **** + #ifdef __cplusplus + } + #endif +! int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +! if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 +! (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 +! ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +--- 15516,15533 ---- + #ifdef __cplusplus + } + #endif +! int main(void){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +! $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 +! if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +*************** +*** 14062,14068 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + pipe_works=yes + fi +--- 15595,15601 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + pipe_works=yes + fi +*************** +*** 14090,14107 **** + lt_cv_sys_global_symbol_pipe= + fi + done +! + fi + + if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +! $as_echo "failed" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +! $as_echo "ok" >&6; } + fi + + # Response file support. +--- 15623,15641 ---- + lt_cv_sys_global_symbol_pipe= + fi + done +! ;; +! esac + fi + + if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +! printf "%s\n" "failed" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +! printf "%s\n" "ok" >&6; } + fi + + # Response file support. +*************** +*** 14147,14160 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +! $as_echo_n "checking for sysroot... " >&6; } + + # Check whether --with-sysroot was given. +! if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +! else +! with_sysroot=no + fi + + +--- 15681,15696 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +! printf %s "checking for sysroot... " >&6; } + + # Check whether --with-sysroot was given. +! if test ${with_sysroot+y} +! then : + withval=$with_sysroot; +! else case e in #( +! e) with_sysroot=no ;; +! esac + fi + + +*************** +*** 14162,14195 **** + case $with_sysroot in #( + yes) + if test yes = "$GCC"; then +! lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +! lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +! $as_echo "$with_sysroot" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +! $as_echo "${lt_sysroot:-no}" >&6; } + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +! $as_echo_n "checking for a working dd... " >&6; } +! if ${ac_cv_path_lt_DD+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! printf 0123456789abcdef0123456789abcdef >conftest.i + cat conftest.i conftest.i >conftest2.i + : ${lt_DD:=$DD} + if test -z "$lt_DD"; then +--- 15698,15734 ---- + case $with_sysroot in #( + yes) + if test yes = "$GCC"; then +! # Trim trailing / since we'll always append absolute paths and we want +! # to avoid //, if only for less confusing output for the user. +! lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'` + fi + ;; #( + /*) +! lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +! printf "%s\n" "$with_sysroot" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +! printf "%s\n" "${lt_sysroot:-no}" >&6; } + + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +! printf %s "checking for a working dd... " >&6; } +! if test ${ac_cv_path_lt_DD+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) printf 0123456789abcdef0123456789abcdef >conftest.i + cat conftest.i conftest.i >conftest2.i + : ${lt_DD:=$DD} + if test -z "$lt_DD"; then +*************** +*** 14199,14208 **** + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue + if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ +--- 15738,15752 ---- + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in dd +! do + for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue + if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ +*************** +*** 14220,14237 **** + ac_cv_path_lt_DD=$lt_DD + fi + +! rm -f conftest.i conftest2.i conftest.out + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +! $as_echo "$ac_cv_path_lt_DD" >&6; } + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +! $as_echo_n "checking how to truncate binary pipes... " >&6; } +! if ${lt_cv_truncate_bin+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! printf 0123456789abcdef0123456789abcdef >conftest.i + cat conftest.i conftest.i >conftest2.i + lt_cv_truncate_bin= + if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then +--- 15764,15783 ---- + ac_cv_path_lt_DD=$lt_DD + fi + +! rm -f conftest.i conftest2.i conftest.out ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +! printf "%s\n" "$ac_cv_path_lt_DD" >&6; } + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +! printf %s "checking how to truncate binary pipes... " >&6; } +! if test ${lt_cv_truncate_bin+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) printf 0123456789abcdef0123456789abcdef >conftest.i + cat conftest.i conftest.i >conftest2.i + lt_cv_truncate_bin= + if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then +*************** +*** 14239,14248 **** + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" + fi + rm -f conftest.i conftest2.i conftest.out +! test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +! $as_echo "$lt_cv_truncate_bin" >&6; } + + + +--- 15785,15795 ---- + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" + fi + rm -f conftest.i conftest2.i conftest.out +! test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +! printf "%s\n" "$lt_cv_truncate_bin" >&6; } + + + +*************** +*** 14265,14271 **** + } + + # Check whether --enable-libtool-lock was given. +! if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +--- 15812,15819 ---- + } + + # Check whether --enable-libtool-lock was given. +! if test ${enable_libtool_lock+y} +! then : + enableval=$enable_libtool_lock; + fi + +*************** +*** 14281,14289 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; +--- 15829,15837 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! case `$FILECMD conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; +*************** +*** 14301,14310 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test yes = "$lt_cv_prog_gnu_ld"; then +! case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; +--- 15849,15858 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test yes = "$lt_cv_prog_gnu_ld"; then +! case `$FILECMD conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; +*************** +*** 14316,14322 **** + ;; + esac + else +! case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; +--- 15864,15870 ---- + ;; + esac + else +! case `$FILECMD conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; +*************** +*** 14339,14348 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf +! case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; +--- 15887,15896 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf +! case `$FILECMD conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; +*************** +*** 14350,14356 **** + emul="${emul}64" + ;; + esac +! case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; +--- 15898,15904 ---- + emul="${emul}64" + ;; + esac +! case `$FILECMD conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; +*************** +*** 14358,14364 **** + emul="${emul}ltsmip" + ;; + esac +! case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; +--- 15906,15912 ---- + emul="${emul}ltsmip" + ;; + esac +! case `$FILECMD conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; +*************** +*** 14369,14375 **** + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +! s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when +--- 15917,15923 ---- + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +! s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when +*************** +*** 14380,14395 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; +! x86_64-*linux*) +! case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; +--- 15928,15943 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! case `$FILECMD conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; +! x86_64-*linux*|x86_64-gnu*) +! case `$FILECMD conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; +*************** +*** 14417,14423 **** + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; +! x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) +--- 15965,15971 ---- + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; +! x86_64-*linux*|x86_64-gnu*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) +*************** +*** 14443,14454 **** + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +! $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +! if ${lt_cv_cc_needs_belf+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +--- 15991,16003 ---- + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +! printf %s "checking whether the C compiler needs -belf... " >&6; } +! if test ${lt_cv_cc_needs_belf+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +*************** +*** 14458,14486 **** + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +! else +! lt_cv_cc_needs_belf=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +! $as_echo "$lt_cv_cc_needs_belf" >&6; } + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS +--- 16007,16038 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + lt_cv_cc_needs_belf=yes +! else case e in #( +! e) lt_cv_cc_needs_belf=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +! printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS +*************** +*** 14493,14501 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) +--- 16045,16053 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +! case `$FILECMD conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) +*************** +*** 14530,14567 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. + set dummy ${ac_tool_prefix}mt; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL + if test -n "$MANIFEST_TOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +! $as_echo "$MANIFEST_TOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 16082,16125 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. + set dummy ${ac_tool_prefix}mt; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_MANIFEST_TOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL + if test -n "$MANIFEST_TOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +! printf "%s\n" "$MANIFEST_TOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 14570,14607 **** + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. + set dummy mt; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL + if test -n "$ac_ct_MANIFEST_TOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +! $as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then +--- 16128,16171 ---- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. + set dummy mt; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL + if test -n "$ac_ct_MANIFEST_TOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +! printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then +*************** +*** 14609,14616 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL +--- 16173,16180 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL +*************** +*** 14620,14642 **** + fi + + test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +! $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +! if ${lt_cv_path_mainfest_tool+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then +! lt_cv_path_mainfest_tool=yes + fi +! rm -f conftest* + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +! $as_echo "$lt_cv_path_mainfest_tool" >&6; } +! if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: + fi + +--- 16184,16208 ---- + fi + + test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +! printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +! if test ${lt_cv_path_manifest_tool+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_path_manifest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then +! lt_cv_path_manifest_tool=yes + fi +! rm -f conftest* ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5 +! printf "%s\n" "$lt_cv_path_manifest_tool" >&6; } +! if test yes != "$lt_cv_path_manifest_tool"; then + MANIFEST_TOOL=: + fi + +*************** +*** 14650,14687 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_DSYMUTIL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +! $as_echo "$DSYMUTIL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 16216,16259 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_DSYMUTIL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +! printf "%s\n" "$DSYMUTIL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 14690,14727 **** + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +! $as_echo "$ac_ct_DSYMUTIL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_DSYMUTIL" = x; then +--- 16262,16305 ---- + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +! printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_DSYMUTIL" = x; then +*************** +*** 14729,14736 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DSYMUTIL=$ac_ct_DSYMUTIL +--- 16307,16314 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + DSYMUTIL=$ac_ct_DSYMUTIL +*************** +*** 14742,14779 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_NMEDIT+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +! $as_echo "$NMEDIT" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 16320,16363 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_NMEDIT+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +! printf "%s\n" "$NMEDIT" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 14782,14819 **** + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +! $as_echo "$ac_ct_NMEDIT" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_NMEDIT" = x; then +--- 16366,16409 ---- + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_NMEDIT+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +! printf "%s\n" "$ac_ct_NMEDIT" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_NMEDIT" = x; then +*************** +*** 14821,14828 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + NMEDIT=$ac_ct_NMEDIT +--- 16411,16418 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + NMEDIT=$ac_ct_NMEDIT +*************** +*** 14834,14871 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_LIPO+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +! $as_echo "$LIPO" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 16424,16467 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_LIPO+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +! printf "%s\n" "$LIPO" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 14874,14911 **** + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_LIPO+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +! $as_echo "$ac_ct_LIPO" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_LIPO" = x; then +--- 16470,16513 ---- + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_LIPO+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +! printf "%s\n" "$ac_ct_LIPO" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_LIPO" = x; then +*************** +*** 14913,14920 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + LIPO=$ac_ct_LIPO +--- 16515,16522 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + LIPO=$ac_ct_LIPO +*************** +*** 14926,14963 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_OTOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +! $as_echo "$OTOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 16528,16571 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_OTOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +! printf "%s\n" "$OTOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 14966,15003 **** + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +! $as_echo "$ac_ct_OTOOL" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_OTOOL" = x; then +--- 16574,16617 ---- + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_OTOOL+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +! printf "%s\n" "$ac_ct_OTOOL" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_OTOOL" = x; then +*************** +*** 15005,15012 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OTOOL=$ac_ct_OTOOL +--- 16619,16626 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OTOOL=$ac_ct_OTOOL +*************** +*** 15018,15055 **** + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_OTOOL64+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +! $as_echo "$OTOOL64" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 16632,16675 ---- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_OTOOL64+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +! printf "%s\n" "$OTOOL64" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 15058,15095 **** + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +! $as_echo "$ac_ct_OTOOL64" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + if test "x$ac_ct_OTOOL64" = x; then +--- 16678,16721 ---- + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_ac_ct_OTOOL64+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +! printf "%s\n" "$ac_ct_OTOOL64" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + if test "x$ac_ct_OTOOL64" = x; then +*************** +*** 15097,15104 **** + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OTOOL64=$ac_ct_OTOOL64 +--- 16723,16730 ---- + else + case $cross_compiling:$ac_tool_warned in + yes:) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +! printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac + OTOOL64=$ac_ct_OTOOL64 +*************** +*** 15133,15144 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +! $as_echo_n "checking for -single_module linker flag... " >&6; } +! if ${lt_cv_apple_cc_single_mod+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE +--- 16759,16771 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +! printf %s "checking for -single_module linker flag... " >&6; } +! if test ${lt_cv_apple_cc_single_mod+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE +*************** +*** 15164,15180 **** + fi + rm -rf libconftest.dylib* + rm -f conftest.* +! fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +! $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +! $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +! if ${lt_cv_ld_exported_symbols_list+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +--- 16791,16848 ---- + fi + rm -rf libconftest.dylib* + rm -f conftest.* +! fi ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +! printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } + +! # Feature test to disable chained fixups since it is not +! # compatible with '-undefined dynamic_lookup' +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5 +! printf %s "checking for -no_fixup_chains linker flag... " >&6; } +! if test ${lt_cv_support_no_fixup_chains+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) save_LDFLAGS=$LDFLAGS +! LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains" +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! +! int +! main (void) +! { +! +! ; +! return 0; +! } +! _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : +! lt_cv_support_no_fixup_chains=yes +! else case e in #( +! e) lt_cv_support_no_fixup_chains=no +! ;; +! esac +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ +! conftest$ac_exeext conftest.$ac_ext +! LDFLAGS=$save_LDFLAGS +! +! ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5 +! printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; } +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +! printf %s "checking for -exported_symbols_list linker flag... " >&6; } +! if test ${lt_cv_ld_exported_symbols_list+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +*************** +*** 15182,15224 **** + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +! else +! lt_cv_ld_exported_symbols_list=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +! $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +! $as_echo_n "checking for -force_load linker flag... " >&6; } +! if ${lt_cv_ld_force_load+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF + int forced_loaded() { return 2;} + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 +! echo "$AR cru libconftest.a conftest.o" >&5 +! $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +! int main() { return 0;} + _LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err +--- 16850,16896 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + lt_cv_ld_exported_symbols_list=yes +! else case e in #( +! e) lt_cv_ld_exported_symbols_list=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +! printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +! printf %s "checking for -force_load linker flag... " >&6; } +! if test ${lt_cv_ld_force_load+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF + int forced_loaded() { return 2;} + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 +! echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 +! $AR $AR_FLAGS libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +! int main(void) { return 0;} + _LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err +*************** +*** 15232,15263 **** + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +! $as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! darwin*) # darwin 5.x on +! # if running on 10.5 or later, the deployment target defaults +! # to the OS version, if on x86, and 10.4, the deployment +! # target defaults to 10.4. Don't you love it? +! case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +! 10.0,*86*-darwin8*|10.0,*-darwin[91]*) +! _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; +! 10.[012][,.]*) +! _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! 10.*) +! _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else +--- 16904,16950 ---- + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +! printf "%s\n" "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! darwin*) +! case $MACOSX_DEPLOYMENT_TARGET,$host in +! 10.[012],*|,*powerpc*-darwin[5-8]*) +! _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +! *) +! _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' +! if test yes = "$lt_cv_support_no_fixup_chains"; then +! as_fn_append _lt_dar_allow_undefined ' $wl-no_fixup_chains' +! fi +! ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi ++ _lt_dar_needs_single_mod=no ++ case $host_os in ++ rhapsody* | darwin1.*) ++ _lt_dar_needs_single_mod=yes ;; ++ darwin*) ++ # When targeting Mac OS X 10.4 (darwin 8) or later, ++ # -single_module is the default and -multi_module is unsupported. ++ # The toolchain on macOS 10.14 (darwin 18) and later cannot ++ # target any OS version that needs -single_module. ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*-darwin[567].*|10.[0-3],*-darwin[5-9].*|10.[0-3],*-darwin1[0-7].*) ++ _lt_dar_needs_single_mod=yes ;; ++ esac ++ ;; ++ esac + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else +*************** +*** 15306,15453 **** + esac + } + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +! $as_echo_n "checking for ANSI C header files... " >&6; } +! if ${ac_cv_header_stdc+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! #include +! #include +! #include +! +! int +! main () +! { +! +! ; +! return 0; +! } +! _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : +! ac_cv_header_stdc=yes +! else +! ac_cv_header_stdc=no +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! +! if test $ac_cv_header_stdc = yes; then +! # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! +! _ACEOF +! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "memchr" >/dev/null 2>&1; then : +! +! else +! ac_cv_header_stdc=no +! fi +! rm -f conftest* +! +! fi +! +! if test $ac_cv_header_stdc = yes; then +! # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! +! _ACEOF +! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "free" >/dev/null 2>&1; then : + +- else +- ac_cv_header_stdc=no +- fi +- rm -f conftest* + +- fi + +- if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then : +- : +- else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +- /* end confdefs.h. */ +- #include +- #include +- #if ((' ' & 0x0FF) == 0x020) +- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +- #else +- # define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +- # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +- #endif + +- #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +- int +- main () +- { +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +- } +- _ACEOF +- if ac_fn_c_try_run "$LINENO"; then : + +- else +- ac_cv_header_stdc=no +- fi +- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +- fi + +- fi +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +- $as_echo "$ac_cv_header_stdc" >&6; } +- if test $ac_cv_header_stdc = yes; then + +- $as_echo "#define STDC_HEADERS 1" >>confdefs.h + +! fi + +! # On IRIX 5.3, sys/types and inttypes.h are conflicting. +! for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +! inttypes.h stdint.h unistd.h +! do : +! as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +! ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +! " +! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +! cat >>confdefs.h <<_ACEOF +! #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +! _ACEOF + + fi +! +! done +! +! +! for ac_header in dlfcn.h +! do : +! ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default + " +! if test "x$ac_cv_header_dlfcn_h" = xyes; then : +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DLFCN_H 1 +! _ACEOF + + fi + +- done +- + + + +--- 16993,17035 ---- + esac + } + +! ac_header= ac_cache= +! for ac_item in $ac_header_c_list +! do +! if test $ac_cache; then +! ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" +! if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then +! printf "%s\n" "#define $ac_item 1" >> confdefs.h +! fi +! ac_header= ac_cache= +! elif test $ac_header; then +! ac_cache=$ac_item +! else +! ac_header=$ac_item +! fi +! done + + + + + + + + +! if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +! then : + +! printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + + fi +! ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default + " +! if test "x$ac_cv_header_dlfcn_h" = xyes +! then : +! printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h + + fi + + + + +*************** +*** 15472,15478 **** + + + # Check whether --enable-shared was given. +! if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +--- 17054,17061 ---- + + + # Check whether --enable-shared was given. +! if test ${enable_shared+y} +! then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +*************** +*** 15490,15497 **** + IFS=$lt_save_ifs + ;; + esac +! else +! enable_shared=yes + fi + + +--- 17073,17081 ---- + IFS=$lt_save_ifs + ;; + esac +! else case e in #( +! e) enable_shared=yes ;; +! esac + fi + + +*************** +*** 15503,15509 **** + + + # Check whether --enable-static was given. +! if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +--- 17087,17094 ---- + + + # Check whether --enable-static was given. +! if test ${enable_static+y} +! then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +*************** +*** 15521,15528 **** + IFS=$lt_save_ifs + ;; + esac +! else +! enable_static=yes + fi + + +--- 17106,17114 ---- + IFS=$lt_save_ifs + ;; + esac +! else case e in #( +! e) enable_static=yes ;; +! esac + fi + + +*************** +*** 15533,15559 **** + + + +! +! # Check whether --with-pic was given. +! if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} +! case $withval in +! yes|no) pic_mode=$withval ;; + *) +! pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for lt_pkg in $withval; do + IFS=$lt_save_ifs +! if test "X$lt_pkg" = "X$lt_p"; then +! pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +! else +! pic_mode=default + fi + + +--- 17119,17208 ---- + + + +! # Check whether --enable-pic was given. +! if test ${enable_pic+y} +! then : +! enableval=$enable_pic; lt_p=${PACKAGE-default} +! case $enableval in +! yes|no) pic_mode=$enableval ;; +! *) +! pic_mode=default +! # Look at the argument we got. We use all the common list separators. +! lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for lt_pkg in $enableval; do +! IFS=$lt_save_ifs +! if test "X$lt_pkg" = "X$lt_p"; then +! pic_mode=yes +! fi +! done +! IFS=$lt_save_ifs +! ;; +! esac +! else case e in #( +! e) # Check whether --with-pic was given. +! if test ${with_pic+y} +! then : + withval=$with_pic; lt_p=${PACKAGE-default} +! case $withval in +! yes|no) pic_mode=$withval ;; +! *) +! pic_mode=default +! # Look at the argument we got. We use all the common list separators. +! lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for lt_pkg in $withval; do +! IFS=$lt_save_ifs +! if test "X$lt_pkg" = "X$lt_p"; then +! pic_mode=yes +! fi +! done +! IFS=$lt_save_ifs +! ;; +! esac +! else case e in #( +! e) pic_mode=default ;; +! esac +! fi +! +! ;; +! esac +! fi +! +! +! +! +! +! +! +! +! stdlibflag=-nostdlib +! # Check whether --enable-cxx-stdlib was given. +! if test ${enable_cxx_stdlib+y} +! then : +! enableval=$enable_cxx_stdlib; p=${PACKAGE-default} +! case $enableval in +! yes) enable_cxx_stdlib=yes ;; +! no) enable_cxx_stdlib=no ;; + *) +! enable_cxx_stdlib=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, +! for pkg in $enableval; do + IFS=$lt_save_ifs +! if test "X$pkg" = "X$p"; then +! enable_cxx_stdlib=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +! else case e in #( +! e) enable_cxx_stdlib=no ;; +! esac +! fi +! +! +! if test yes = "$enable_cxx_stdlib"; then +! stdlibflag= + fi + + +*************** +*** 15563,15570 **** + + + + # Check whether --enable-fast-install was given. +! if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +--- 17212,17223 ---- + + + ++ ++ ++ + # Check whether --enable-fast-install was given. +! if test ${enable_fast_install+y} +! then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +*************** +*** 15582,15589 **** + IFS=$lt_save_ifs + ;; + esac +! else +! enable_fast_install=yes + fi + + +--- 17235,17243 ---- + IFS=$lt_save_ifs + ;; + esac +! else case e in #( +! e) enable_fast_install=yes ;; +! esac + fi + + +*************** +*** 15596,15626 **** + shared_archive_member_spec= + case $host,$enable_shared in + power*-*-aix[5-9]*,yes) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +! $as_echo_n "checking which variant of shared library versioning to provide... " >&6; } +! +! # Check whether --with-aix-soname was given. +! if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in +! aix|svr4|both) +! ;; +! *) +! as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 +! ;; +! esac +! lt_cv_with_aix_soname=$with_aix_soname +! else +! if ${lt_cv_with_aix_soname+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_with_aix_soname=aix + fi + +! with_aix_soname=$lt_cv_with_aix_soname + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +! $as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', +--- 17250,17299 ---- + shared_archive_member_spec= + case $host,$enable_shared in + power*-*-aix[5-9]*,yes) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +! printf %s "checking which variant of shared library versioning to provide... " >&6; } +! # Check whether --enable-aix-soname was given. +! if test ${enable_aix_soname+y} +! then : +! enableval=$enable_aix_soname; case $enableval in +! aix|svr4|both) +! ;; +! *) +! as_fn_error $? "Unknown argument to --enable-aix-soname" "$LINENO" 5 +! ;; +! esac +! lt_cv_with_aix_soname=$enable_aix_soname +! else case e in #( +! e) # Check whether --with-aix-soname was given. +! if test ${with_aix_soname+y} +! then : + withval=$with_aix_soname; case $withval in +! aix|svr4|both) +! ;; +! *) +! as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 +! ;; +! esac +! lt_cv_with_aix_soname=$with_aix_soname +! else case e in #( +! e) if test ${lt_cv_with_aix_soname+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_with_aix_soname=aix ;; +! esac +! fi +! ;; +! esac + fi + +! enable_aix_soname=$lt_cv_with_aix_soname ;; +! esac + fi + +! with_aix_soname=$enable_aix_soname +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +! printf "%s\n" "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', +*************** +*** 15634,15641 **** +--- 17307,17327 ---- + fi + fi + ;; ++ power*-*-aix[5-9]*,'') ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&5 ++ printf "%s\n" "$as_me: WARNING: for $host, specify if building shared libraries for versioning (svr4|both)" >&2;} ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 ++ printf %s "checking which variant of shared library versioning to provide... " >&6; } ++ with_aix_soname=aix ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5 ++ printf "%s\n" "(default) $with_aix_soname" >&6; } ++ ;; + *) ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 ++ printf %s "checking which variant of shared library versioning to provide... " >&6; } + with_aix_soname=aix ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (default) $with_aix_soname" >&5 ++ printf "%s\n" "(default) $with_aix_soname" >&6; } + ;; + esac + +*************** +*** 15702,15713 **** + setopt NO_GLOB_SUBST + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +! $as_echo_n "checking for objdir... " >&6; } +! if ${lt_cv_objdir+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null + if test -d .libs; then + lt_cv_objdir=.libs +--- 17388,17400 ---- + setopt NO_GLOB_SUBST + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +! printf %s "checking for objdir... " >&6; } +! if test ${lt_cv_objdir+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null + if test -d .libs; then + lt_cv_objdir=.libs +*************** +*** 15715,15733 **** + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs + fi +! rmdir .libs 2>/dev/null + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +! $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + + + + +! cat >>confdefs.h <<_ACEOF +! #define LT_OBJDIR "$lt_cv_objdir/" +! _ACEOF + + + +--- 17402,17419 ---- + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs + fi +! rmdir .libs 2>/dev/null ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +! printf "%s\n" "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + + + + + +! printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h + + + +*************** +*** 15748,15755 **** + ofile=libtool + can_build_shared=yes + +! # All known linkers require a '.a' archive for static linking (except MSVC, +! # which needs '.lib'). + libext=a + + with_gnu_ld=$lt_cv_prog_gnu_ld +--- 17434,17441 ---- + ofile=libtool + can_build_shared=yes + +! # All known linkers require a '.a' archive for static linking (except MSVC and +! # ICC, which need '.lib'). + libext=a + + with_gnu_ld=$lt_cv_prog_gnu_ld +*************** +*** 15773,15784 **** + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +! $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +! if ${lt_cv_path_MAGIC_CMD+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +--- 17459,17471 ---- + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +! printf %s "checking for ${ac_tool_prefix}file... " >&6; } +! if test ${lt_cv_path_MAGIC_CMD+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*************** +*** 15821,15836 **** + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; + esac + fi + + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +! $as_echo "$MAGIC_CMD" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 17508,17524 ---- + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; ++ esac ;; + esac + fi + + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +! printf "%s\n" "$MAGIC_CMD" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 15839,15850 **** + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +! $as_echo_n "checking for file... " >&6; } +! if ${lt_cv_path_MAGIC_CMD+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +--- 17527,17539 ---- + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +! printf %s "checking for file... " >&6; } +! if test ${lt_cv_path_MAGIC_CMD+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*************** +*** 15887,15902 **** + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; + esac + fi + + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +! $as_echo "$MAGIC_CMD" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 17576,17592 ---- + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; ++ esac ;; + esac + fi + + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if test -n "$MAGIC_CMD"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +! printf "%s\n" "$MAGIC_CMD" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 15930,15936 **** + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +! lt_simple_link_test_code='int main(){return(0);}' + + + +--- 17620,17626 ---- + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests +! lt_simple_link_test_code='int main(void){return(0);}' + + + +*************** +*** 15977,15988 **** + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +! $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +! if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment +--- 17667,17679 ---- + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +! printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +! if test ${lt_cv_prog_compiler_rtti_exceptions+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment +*************** +*** 16010,16019 **** + fi + fi + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +! $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +--- 17701,17711 ---- + fi + fi + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +*************** +*** 16066,16072 **** + # PIC is the default for these OSes. + ;; + +! mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +--- 17758,17764 ---- + # PIC is the default for these OSes. + ;; + +! mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +*************** +*** 16169,16175 **** + esac + ;; + +! mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' +--- 17861,17867 ---- + esac + ;; + +! mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' +*************** +*** 16210,16215 **** +--- 17902,17913 ---- + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; ++ *flang* | ftn | f18* | f95*) ++ # Flang compiler. ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) +*************** +*** 16254,16260 **** + lt_prog_compiler_static='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' +--- 17952,17958 ---- + lt_prog_compiler_static='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' +*************** +*** 16292,16297 **** +--- 17990,18001 ---- + lt_prog_compiler_static='-Bstatic' + ;; + ++ *-mlibc) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. +*************** +*** 16308,16313 **** +--- 18012,18020 ---- + lt_prog_compiler_static='-non_shared' + ;; + ++ serenity*) ++ ;; ++ + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' +*************** +*** 16370,16396 **** + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +! $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +! if ${lt_cv_prog_compiler_pic+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_pic=$lt_prog_compiler_pic + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +! $as_echo "$lt_cv_prog_compiler_pic" >&6; } + lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +! $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +! if ${lt_cv_prog_compiler_pic_works+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment +--- 18077,18106 ---- + ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +! printf %s "checking for $compiler option to produce PIC... " >&6; } +! if test ${lt_cv_prog_compiler_pic+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } + lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +! printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +! if test ${lt_cv_prog_compiler_pic_works+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment +*************** +*** 16418,16427 **** + fi + fi + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +! $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test yes = "$lt_cv_prog_compiler_pic_works"; then + case $lt_prog_compiler_pic in +--- 18128,18138 ---- + fi + fi + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } + + if test yes = "$lt_cv_prog_compiler_pic_works"; then + case $lt_prog_compiler_pic in +*************** +*** 16449,16460 **** + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +! $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +! if ${lt_cv_prog_compiler_static_works+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_static_works=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +--- 18160,18172 ---- + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +! printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +! if test ${lt_cv_prog_compiler_static_works+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_static_works=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +*************** +*** 16475,16484 **** + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +! $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test yes = "$lt_cv_prog_compiler_static_works"; then + : +--- 18187,18197 ---- + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } + + if test yes = "$lt_cv_prog_compiler_static_works"; then + : +*************** +*** 16492,16503 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if ${lt_cv_prog_compiler_c_o+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +--- 18205,18217 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if test ${lt_cv_prog_compiler_c_o+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +*************** +*** 16537,16558 **** + cd .. + $RM -r conftest + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +! $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if ${lt_cv_prog_compiler_c_o+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +--- 18251,18274 ---- + cd .. + $RM -r conftest + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if test ${lt_cv_prog_compiler_c_o+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +*************** +*** 16592,16601 **** + cd .. + $RM -r conftest + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +! $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + +--- 18308,18318 ---- + cd .. + $RM -r conftest + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } + + + +*************** +*** 16603,16621 **** + hard_links=nottested + if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +! $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +! $as_echo "$hard_links" >&6; } + if test no = "$hard_links"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +! $as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi + else +--- 18320,18338 ---- + hard_links=nottested + if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +! printf %s "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +! printf "%s\n" "$hard_links" >&6; } + if test no = "$hard_links"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +! printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi + else +*************** +*** 16627,16634 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +! $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= +--- 18344,18351 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +! printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= +*************** +*** 16671,16691 **** + extract_expsyms_cmds= + + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) +! # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) +! # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; +- openbsd* | bitrig*) +- with_gnu_ld=no +- ;; + esac + + ld_shlibs=yes +--- 18388,18405 ---- + extract_expsyms_cmds= + + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) +! # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++ or Intel C++ Compiler. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) +! # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + with_gnu_ld=yes + ;; + esac + + ld_shlibs=yes +*************** +*** 16732,16738 **** + whole_archive_flag_spec= + fi + supports_anon_versioning=no +! case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +--- 18446,18452 ---- + whole_archive_flag_spec= + fi + supports_anon_versioning=no +! case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +*************** +*** 16786,16792 **** + fi + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +--- 18500,18506 ---- + fi + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +*************** +*** 16796,16801 **** +--- 18510,18516 ---- + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' ++ file_list_spec='@' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +*************** +*** 16815,16821 **** + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! link_all_deplibs=yes + ;; + + os2*) +--- 18530,18536 ---- + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! link_all_deplibs=no + ;; + + os2*) +*************** +*** 16842,16849 **** + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + + interix[3-9]*) +--- 18557,18565 ---- + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ++ file_list_spec='@' + ;; + + interix[3-9]*) +*************** +*** 16858,16864 **** + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) +--- 18574,18580 ---- + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) +*************** +*** 16901,16907 **** + compiler_needs_object=yes + ;; + esac +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes +--- 18617,18623 ---- + compiler_needs_object=yes + ;; + esac +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes +*************** +*** 16913,16925 **** + + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) +--- 18629,18642 ---- + + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) +*************** +*** 16929,16935 **** + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi +--- 18646,18652 ---- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi +*************** +*** 16940,16946 **** + fi + ;; + +! netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +--- 18657,18668 ---- + fi + ;; + +! *-mlibc) +! archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' +! ;; +! +! netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +*************** +*** 17061,17067 **** + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + +--- 18783,18789 ---- + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + +*************** +*** 17183,17203 **** + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if ${lt_cv_aix_libpath_+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +--- 18905,18927 ---- + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if test ${lt_cv_aix_libpath_+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +*************** +*** 17212,17223 **** + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi +! + fi + + aix_libpath=$lt_cv_aix_libpath_ +--- 18936,18948 ---- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi +! ;; +! esac + fi + + aix_libpath=$lt_cv_aix_libpath_ +*************** +*** 17236,17256 **** + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if ${lt_cv_aix_libpath_+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +--- 18961,18983 ---- + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if test ${lt_cv_aix_libpath_+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +*************** +*** 17265,17276 **** + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi +! + fi + + aix_libpath=$lt_cv_aix_libpath_ +--- 18992,19004 ---- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi +! ;; +! esac + fi + + aix_libpath=$lt_cv_aix_libpath_ +*************** +*** 17326,17339 **** + export_dynamic_flag_spec=-rdynamic + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in +! cl*) +! # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes +--- 19054,19067 ---- + export_dynamic_flag_spec=-rdynamic + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using +! # Microsoft Visual C++ or Intel C++ Compiler. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in +! cl* | icl*) +! # Native MSVC or ICC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes +*************** +*** 17343,17356 **** + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +! archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ +! $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' +--- 19071,19084 ---- + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. +! archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ +! $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' +*************** +*** 17374,17380 **** + fi' + ;; + *) +! # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. +--- 19102,19108 ---- + fi' + ;; + *) +! # Assume MSVC and ICC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. +*************** +*** 17415,17422 **** + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" +! archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +! module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + + else + ld_shlibs=no +--- 19143,19150 ---- + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" +! archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +! module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + + else + ld_shlibs=no +*************** +*** 17450,17456 **** + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +! freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +--- 19178,19184 ---- + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +! freebsd* | dragonfly* | midnightbsd*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes +*************** +*** 17516,17527 **** + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +! $as_echo_n "checking if $CC understands -b... " >&6; } +! if ${lt_cv_prog_compiler__b+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler__b=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +--- 19244,19256 ---- + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +! printf %s "checking if $CC understands -b... " >&6; } +! if test ${lt_cv_prog_compiler__b+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler__b=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +*************** +*** 17542,17551 **** + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +! $as_echo "$lt_cv_prog_compiler__b" >&6; } + + if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +--- 19271,19281 ---- + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +! printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } + + if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +*************** +*** 17585,17612 **** + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +! $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +! if ${lt_cv_irix_exported_symbol+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int foo (void) { return 0; } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +! else +! lt_cv_irix_exported_symbol=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LDFLAGS=$save_LDFLAGS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +! $as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi +--- 19315,19346 ---- + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +! printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +! if test ${lt_cv_irix_exported_symbol+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int foo (void) { return 0; } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + lt_cv_irix_exported_symbol=yes +! else case e in #( +! e) lt_cv_irix_exported_symbol=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LDFLAGS=$save_LDFLAGS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +! printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi +*************** +*** 17627,17637 **** + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + +! netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +--- 19361,19375 ---- + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + ;; + esac + ;; + +! *-mlibc) +! ;; +! +! netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +*************** +*** 17653,17659 **** + *nto* | *qnx*) + ;; + +! openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no +--- 19391,19397 ---- + *nto* | *qnx*) + ;; + +! openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no +*************** +*** 17696,17703 **** + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + + osf3*) +--- 19434,19442 ---- + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ++ file_list_spec='@' + ;; + + osf3*) +*************** +*** 17731,17736 **** +--- 19470,19478 ---- + hardcode_libdir_separator=: + ;; + ++ serenity*) ++ ;; ++ + solaris*) + no_undefined_flag=' -z defs' + if test yes = "$GCC"; then +*************** +*** 17886,17893 **** + fi + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +! $as_echo "$ld_shlibs" >&6; } + test no = "$ld_shlibs" && can_build_shared=no + + with_gnu_ld=$with_gnu_ld +--- 19628,19635 ---- + fi + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +! printf "%s\n" "$ld_shlibs" >&6; } + test no = "$ld_shlibs" && can_build_shared=no + + with_gnu_ld=$with_gnu_ld +*************** +*** 17923,17940 **** + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +! $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +! if ${lt_cv_archive_cmds_need_lc+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest +--- 19665,19683 ---- + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +! printf %s "checking whether -lc should be explicitly linked in... " >&6; } +! if test ${lt_cv_archive_cmds_need_lc+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest +*************** +*** 17952,17958 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no +--- 19695,19701 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no +*************** +*** 17964,17973 **** + cat conftest.err 1>&5 + fi + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +! $as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac +--- 19707,19717 ---- + cat conftest.err 1>&5 + fi + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +! printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac +*************** +*** 18126,18133 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +! $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test yes = "$GCC"; then + case $host_os in +--- 19870,19877 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +! printf %s "checking dynamic linker characteristics... " >&6; } + + if test yes = "$GCC"; then + case $host_os in +*************** +*** 18135,18141 **** + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in +! mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` +--- 19879,19885 ---- + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in +! mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` +*************** +*** 18193,18199 **** + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in +! mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +--- 19937,19943 ---- + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in +! mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +*************** +*** 18267,18273 **** + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl +! # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the +--- 20011,20017 ---- + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl +! # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the +*************** +*** 18361,18367 **** + # libtool to hard-code these into programs + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no +--- 20105,20111 ---- + # libtool to hard-code these into programs + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no +*************** +*** 18372,18386 **** + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! test -d \$dldir || mkdir -p \$dldir~ +! $install_prog $dir/$dlname \$dldir/$dlname~ +! chmod a+x \$dldir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +! fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' +--- 20116,20144 ---- + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +! # If user builds GCC with multilib enabled, +! # it should just install on $(libdir) +! # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones. +! if test xyes = x"$multilib"; then +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! $install_prog $dir/$dlname $destdir/$dlname~ +! chmod a+x $destdir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib $destdir/$dlname'\'' || exit \$?; +! fi' +! else +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! test -d \$dldir || mkdir -p \$dldir~ +! $install_prog $dir/$dlname \$dldir/$dlname~ +! chmod a+x \$dldir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +! fi' +! fi + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' +*************** +*** 18389,18418 **** + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +! soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; +! mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +! library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + +! *,cl*) +! # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in +! mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' +--- 20147,20176 ---- + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +! soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; +! mingw* | windows* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +! library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + +! *,cl* | *,icl*) +! # Native MSVC or ICC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in +! mingw* | windows*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' +*************** +*** 18425,18431 **** + done + IFS=$lt_save_ifs + # Convert to MSYS style. +! sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form +--- 20183,20189 ---- + done + IFS=$lt_save_ifs + # Convert to MSYS style. +! sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form +*************** +*** 18462,18468 **** + ;; + + *) +! # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; +--- 20220,20226 ---- + ;; + + *) +! # Assume MSVC and ICC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; +*************** +*** 18495,18501 **** + shlibpath_var=LD_LIBRARY_PATH + ;; + +! freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then +--- 20253,20259 ---- + shlibpath_var=LD_LIBRARY_PATH + ;; + +! freebsd* | dragonfly* | midnightbsd*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then +*************** +*** 18519,18525 **** +--- 20277,20304 ---- + need_version=yes + ;; + esac ++ case $host_cpu in ++ powerpc64) ++ # On FreeBSD bi-arch platforms, a different variable is used for 32-bit ++ # binaries. See . ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ /* end confdefs.h. */ ++ int test_pointer_size[sizeof (void *) - 5]; ++ ++ _ACEOF ++ if ac_fn_c_try_compile "$LINENO" ++ then : + shlibpath_var=LD_LIBRARY_PATH ++ else case e in #( ++ e) shlibpath_var=LD_32_LIBRARY_PATH ;; ++ esac ++ fi ++ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ ;; ++ *) ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ esac + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes +*************** +*** 18549,18556 **** + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no +! sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' +! hardcode_into_libs=yes + ;; + + hpux9* | hpux10* | hpux11*) +--- 20328,20336 ---- + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no +! sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib' +! sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib' +! hardcode_into_libs=no + ;; + + hpux9* | hpux10* | hpux11*) +*************** +*** 18660,18666 **** + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no +! library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH +--- 20440,20446 ---- + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no +! library_names_spec='$libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH +*************** +*** 18672,18679 **** + hardcode_into_libs=yes + + dynamic_linker='Android linker' +! # Don't embed -rpath directories since the linker doesn't support them. +! hardcode_libdir_flag_spec='-L$libdir' + ;; + + # This must be glibc/ELF. +--- 20452,20460 ---- + hardcode_into_libs=yes + + dynamic_linker='Android linker' +! # -rpath works at least for libraries that are not overridden by +! # libraries installed in system locations. +! hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + ;; + + # This must be glibc/ELF. +*************** +*** 18688,18697 **** + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH +! if ${lt_cv_shlibpath_overrides_runpath+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ +--- 20469,20479 ---- + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH +! if test ${lt_cv_shlibpath_overrides_runpath+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ +*************** +*** 18700,18722 **** + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : +! if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes + fi + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir +! + fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath +--- 20482,20507 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : +! if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +! then : + lt_cv_shlibpath_overrides_runpath=yes + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir +! ;; +! esac + fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath +*************** +*** 18726,18732 **** + # before this can be enabled. + hardcode_into_libs=yes + +! # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, +--- 20511,20517 ---- + # before this can be enabled. + hardcode_into_libs=yes + +! # Ideally, we could use ldconfig to report *all* directories which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, +*************** +*** 18746,18751 **** +--- 20531,20550 ---- + dynamic_linker='GNU/Linux ld.so' + ;; + ++ netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ enable_cxx_stdlib=yes ++ stdlibflag= ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +*************** +*** 18762,18767 **** +--- 20561,20580 ---- + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes ++ enable_cxx_stdlib=yes ++ stdlibflag= ++ ;; ++ ++ *-mlibc) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ dynamic_linker='mlibc ld.so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes + ;; + + newsos6) +*************** +*** 18783,18789 **** + dynamic_linker='ldqnx.so' + ;; + +! openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +--- 20596,20602 ---- + dynamic_linker='ldqnx.so' + ;; + +! openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +*************** +*** 18843,18848 **** +--- 20656,20672 ---- + dynamic_linker=no + ;; + ++ serenity*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ dynamic_linker='SerenityOS LibELF' ++ ;; ++ + solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no +*************** +*** 18940,18951 **** + shlibpath_var=LD_LIBRARY_PATH + ;; + + *) + dynamic_linker=no + ;; + esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +! $as_echo "$dynamic_linker" >&6; } + test no = "$dynamic_linker" && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +--- 20764,21265 ---- + shlibpath_var=LD_LIBRARY_PATH + ;; + ++ emscripten*) ++ version_type=none ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext' ++ soname_spec='$libname$release$shared_ext' ++ finish_cmds= ++ dynamic_linker="Emscripten linker" ++ lt_prog_compiler_wl= ++ lt_prog_compiler_pic= ++ lt_prog_compiler_static= ++ ++ ++ if test yes = "$GCC"; then ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_static='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the '-m68020' flag to GCC prevents building anything better, ++ # like '-m68040'. ++ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ lt_prog_compiler_pic='-DDLL_EXPORT' ++ case $host_os in ++ os2*) ++ lt_prog_compiler_static='$wl-static' ++ ;; ++ esac ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' ++ ;; ++ ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ lt_prog_compiler_static= ++ ;; ++ ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared=no ++ enable_shared=no ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic=-Kconform_pic ++ fi ++ ;; ++ ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ++ case $cc_basename in ++ nvcc*) # Cuda Compiler Driver 2.2 ++ lt_prog_compiler_wl='-Xlinker ' ++ if test -n "$lt_prog_compiler_pic"; then ++ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" ++ fi ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl='-Wl,' ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ else ++ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' ++ case $cc_basename in ++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ esac ++ ;; ++ ++ mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic='-DDLL_EXPORT' ++ case $host_os in ++ os2*) ++ lt_prog_compiler_static='$wl-static' ++ ;; ++ esac ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static='$wl-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++ case $cc_basename in ++ # old Intel for x86_64, which still supported -KPIC. ++ ecc*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ *flang* | ftn | f18* | f95*) ++ # Flang compiler. ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='--shared' ++ lt_prog_compiler_static='--static' ++ ;; ++ nagfor*) ++ # NAG Fortran compiler ++ lt_prog_compiler_wl='-Wl,-Wl,,' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ tcc*) ++ # Fabrice Bellard et al's Tiny C Compiler ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl='-Wl,' ++ # All Alpha code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ xl* | bgxl* | bgf* | mpixl*) ++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-qpic' ++ lt_prog_compiler_static='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | $SED 5q` in ++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; ++ *Sun\ F* | *Sun*Fortran*) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Qoption ld ' ++ ;; ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ *Intel*\ [CF]*Compiler*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ *Portland\ Group*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *-mlibc) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl='-Wl,' ++ # All OSF/1 code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ serenity*) ++ ;; ++ ++ solaris*) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) ++ lt_prog_compiler_wl='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ lt_prog_compiler_wl='-Qoption ld ' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic='-Kconform_pic' ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ ++ uts4*) ++ lt_prog_compiler_pic='-pic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *) ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ esac ++ fi ++ ++ case $host_os in ++ # For platforms that do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic= ++ ;; ++ *) ++ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ++ ;; ++ esac ++ ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++ printf %s "checking for $compiler option to produce PIC... " >&6; } ++ if test ${lt_cv_prog_compiler_pic+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 ++ printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } ++ lt_prog_compiler_pic=$lt_cv_prog_compiler_pic ++ ++ # ++ # Check to make sure the PIC flag actually works. ++ # ++ if test -n "$lt_prog_compiler_pic"; then ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } ++ if test ${lt_cv_prog_compiler_pic_works+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) lt_cv_prog_compiler_pic_works=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works=yes ++ fi ++ fi ++ $RM conftest* ++ ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 ++ printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } ++ ++ if test yes = "$lt_cv_prog_compiler_pic_works"; then ++ case $lt_prog_compiler_pic in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; ++ esac ++ else ++ lt_prog_compiler_pic= ++ lt_prog_compiler_can_build_shared=no ++ fi ++ ++ fi ++ ++ ++ ++ ++ ++ # ++ # Check to make sure the static flag actually works. ++ # ++ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++ printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++ if test ${lt_cv_prog_compiler_static_works+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) lt_cv_prog_compiler_static_works=no ++ save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS=$save_LDFLAGS ++ ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 ++ printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } ++ ++ if test yes = "$lt_cv_prog_compiler_static_works"; then ++ : ++ else ++ lt_prog_compiler_static= ++ fi ++ ++ ++ ++ ='-fPIC' ++ archive_cmds='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym' ++ archive_cmds_need_lc=no ++ no_undefined_flag= ++ ;; ++ + *) + dynamic_linker=no + ;; + esac +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +! printf "%s\n" "$dynamic_linker" >&6; } + test no = "$dynamic_linker" && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +*************** +*** 19066,19073 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +! $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || +--- 21380,21387 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +! printf %s "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || +*************** +*** 19091,19098 **** + # directories. + hardcode_action=unsupported + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +! $as_echo "$hardcode_action" >&6; } + + if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then +--- 21405,21412 ---- + # directories. + hardcode_action=unsupported + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +! printf "%s\n" "$hardcode_action" >&6; } + + if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then +*************** +*** 19124,19130 **** + lt_cv_dlopen_self=yes + ;; + +! mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; +--- 21438,21444 ---- + lt_cv_dlopen_self=yes + ;; + +! mingw* | windows* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; +*************** +*** 19136,19185 **** + + darwin*) + # if libdl is installed we need to link against it +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +! $as_echo_n "checking for dlopen in -ldl... " >&6; } +! if ${ac_cv_lib_dl_dlopen+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char dlopen (); + int +! main () + { + return dlopen (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +! else +! ac_cv_lib_dl_dlopen=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +! $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +! if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +! else +! + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes +! + fi + + ;; +--- 21450,21508 ---- + + darwin*) + # if libdl is installed we need to link against it +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +! printf %s "checking for dlopen in -ldl... " >&6; } +! if test ${ac_cv_lib_dl_dlopen+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char dlopen (void); + int +! main (void) + { + return dlopen (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_dl_dlopen=yes +! else case e in #( +! e) ac_cv_lib_dl_dlopen=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +! printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +! if test "x$ac_cv_lib_dl_dlopen" = xyes +! then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +! else case e in #( +! e) + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes +! ;; +! esac + fi + + ;; +*************** +*** 19194,19376 **** + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +! if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen=shl_load +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +! $as_echo_n "checking for shl_load in -ldld... " >&6; } +! if ${ac_cv_lib_dld_shl_load+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char shl_load (); + int +! main () + { + return shl_load (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +! else +! ac_cv_lib_dld_shl_load=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +! $as_echo "$ac_cv_lib_dld_shl_load" >&6; } +! if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld +! else +! ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +! if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen=dlopen +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +! $as_echo_n "checking for dlopen in -ldl... " >&6; } +! if ${ac_cv_lib_dl_dlopen+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char dlopen (); + int +! main () + { + return dlopen (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +! else +! ac_cv_lib_dl_dlopen=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +! $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +! if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +! $as_echo_n "checking for dlopen in -lsvld... " >&6; } +! if ${ac_cv_lib_svld_dlopen+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char dlopen (); + int +! main () + { + return dlopen (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +! else +! ac_cv_lib_svld_dlopen=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +! $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +! if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +! $as_echo_n "checking for dld_link in -ldld... " >&6; } +! if ${ac_cv_lib_dld_dld_link+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char dld_link (); + int +! main () + { + return dld_link (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +! else +! ac_cv_lib_dld_dld_link=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +! $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +! if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld + fi + +! + fi + +! + fi + +! + fi + +! + fi + +! + fi + + ;; +--- 21517,21738 ---- + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +! if test "x$ac_cv_func_shl_load" = xyes +! then : + lt_cv_dlopen=shl_load +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +! printf %s "checking for shl_load in -ldld... " >&6; } +! if test ${ac_cv_lib_dld_shl_load+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char shl_load (void); + int +! main (void) + { + return shl_load (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_dld_shl_load=yes +! else case e in #( +! e) ac_cv_lib_dld_shl_load=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +! printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +! if test "x$ac_cv_lib_dld_shl_load" = xyes +! then : + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld +! else case e in #( +! e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +! if test "x$ac_cv_func_dlopen" = xyes +! then : + lt_cv_dlopen=dlopen +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +! printf %s "checking for dlopen in -ldl... " >&6; } +! if test ${ac_cv_lib_dl_dlopen+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char dlopen (void); + int +! main (void) + { + return dlopen (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_dl_dlopen=yes +! else case e in #( +! e) ac_cv_lib_dl_dlopen=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +! printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +! if test "x$ac_cv_lib_dl_dlopen" = xyes +! then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +! printf %s "checking for dlopen in -lsvld... " >&6; } +! if test ${ac_cv_lib_svld_dlopen+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char dlopen (void); + int +! main (void) + { + return dlopen (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_svld_dlopen=yes +! else case e in #( +! e) ac_cv_lib_svld_dlopen=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +! printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +! if test "x$ac_cv_lib_svld_dlopen" = xyes +! then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +! printf %s "checking for dld_link in -ldld... " >&6; } +! if test ${ac_cv_lib_dld_dld_link+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char dld_link (void); + int +! main (void) + { + return dld_link (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_dld_dld_link=yes +! else case e in #( +! e) ac_cv_lib_dld_dld_link=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +! printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +! if test "x$ac_cv_lib_dld_dld_link" = xyes +! then : + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld + fi + +! ;; +! esac + fi + +! ;; +! esac + fi + +! ;; +! esac + fi + +! ;; +! esac + fi + +! ;; +! esac + fi + + ;; +*************** +*** 19393,19404 **** + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +! $as_echo_n "checking whether a program can dlopen itself... " >&6; } +! if ${lt_cv_dlopen_self+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +--- 21755,21767 ---- + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +! printf %s "checking whether a program can dlopen itself... " >&6; } +! if test ${lt_cv_dlopen_self+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +*************** +*** 19448,19458 **** + /* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +! int fnord () __attribute__((visibility("default"))); + #endif + +! int fnord () { return 42; } +! int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; +--- 21811,21821 ---- + /* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +! int fnord (void) __attribute__((visibility("default"))); + #endif + +! int fnord (void) { return 42; } +! int main (void) + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; +*************** +*** 19476,19482 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +--- 21839,21845 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +*************** +*** 19492,19510 **** + fi + rm -fr conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +! $as_echo "$lt_cv_dlopen_self" >&6; } + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +! $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +! if ${lt_cv_dlopen_self_static+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +--- 21855,21875 ---- + fi + rm -fr conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +! printf "%s\n" "$lt_cv_dlopen_self" >&6; } + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +! printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +! if test ${lt_cv_dlopen_self_static+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +*************** +*** 19554,19564 **** + /* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +! int fnord () __attribute__((visibility("default"))); + #endif + +! int fnord () { return 42; } +! int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; +--- 21919,21929 ---- + /* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +! int fnord (void) __attribute__((visibility("default"))); + #endif + +! int fnord (void) { return 42; } +! int main (void) + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; +*************** +*** 19582,19588 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +--- 21947,21953 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +*************** +*** 19598,19607 **** + fi + rm -fr conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +! $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS=$save_CPPFLAGS +--- 21963,21973 ---- + fi + rm -fr conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +! printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS=$save_CPPFLAGS +*************** +*** 19639,19670 **** + + striplib= + old_striplib= +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +! $as_echo_n "checking whether stripping libraries is possible... " >&6; } +! if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +! test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +! test -z "$striplib" && striplib="$STRIP --strip-unneeded" +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } +! else +! # FIXME - insert some real tests, host_os isn't really good enough +! case $host_os in +! darwin*) +! if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! $as_echo "yes" >&6; } +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } +! fi +! ;; +! *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } +! ;; +! esac + fi + + +--- 22005,22047 ---- + + striplib= + old_striplib= +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +! printf %s "checking whether stripping libraries is possible... " >&6; } +! if test -z "$STRIP"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! else +! if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +! old_striplib="$STRIP --strip-debug" +! striplib="$STRIP --strip-unneeded" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } +! else +! case $host_os in +! darwin*) +! # FIXME - insert some real tests, host_os isn't really good enough + striplib="$STRIP -x" + old_striplib="$STRIP -S" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } +! ;; +! freebsd*) +! if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then +! old_striplib="$STRIP --strip-debug" +! striplib="$STRIP --strip-unneeded" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +! printf "%s\n" "yes" >&6; } +! else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! fi +! ;; +! *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } +! ;; +! esac +! fi + fi + + +*************** +*** 19679,19691 **** + + + # Report what library types will actually be built +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +! $as_echo_n "checking if libtool supports shared libraries... " >&6; } +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +! $as_echo "$can_build_shared" >&6; } + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +! $as_echo_n "checking whether to build shared libraries... " >&6; } + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +--- 22056,22068 ---- + + + # Report what library types will actually be built +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +! printf %s "checking if libtool supports shared libraries... " >&6; } +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +! printf "%s\n" "$can_build_shared" >&6; } + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +! printf %s "checking whether to build shared libraries... " >&6; } + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +*************** +*** 19709,19723 **** + fi + ;; + esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +! $as_echo "$enable_shared" >&6; } + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +! $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +! $as_echo "$enable_static" >&6; } + + + +--- 22086,22100 ---- + fi + ;; + esac +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +! printf "%s\n" "$enable_shared" >&6; } + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +! printf %s "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +! printf "%s\n" "$enable_static" >&6; } + + + +*************** +*** 19739,19776 **** + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +! $as_echo_n "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then +! if ${ac_cv_prog_CXXCPP+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # Double quotes because CXXCPP needs to be expanded +! for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + +! else +! # Broken: fails on valid input. +! continue + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +--- 22116,22150 ---- + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +! printf %s "checking how to run the C++ preprocessor... " >&6; } + if test -z "$CXXCPP"; then +! if test ${ac_cv_prog_CXXCPP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # Double quotes because $CXX needs to be expanded +! for CXXCPP in "$CXX -E" cpp /lib/cpp + do + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + +! else case e in #( +! e) # Broken: fails on valid input. +! continue ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +*************** +*** 19780,19835 **** + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +! else +! # Passes both tests. + ac_preproc_ok=: +! break + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok; then : + break + fi + + done + ac_cv_prog_CXXCPP=$CXXCPP +! + fi + CXXCPP=$ac_cv_prog_CXXCPP + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +! $as_echo "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #ifdef __STDC__ +! # include +! #else +! # include +! #endif + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + +! else +! # Broken: fails on valid input. +! continue + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +--- 22154,22209 ---- + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + # Broken: success on invalid input. + continue +! else case e in #( +! e) # Passes both tests. + ac_preproc_ok=: +! break ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok +! then : + break + fi + + done + ac_cv_prog_CXXCPP=$CXXCPP +! ;; +! esac + fi + CXXCPP=$ac_cv_prog_CXXCPP + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +! printf "%s\n" "$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! #include + Syntax error + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + +! else case e in #( +! e) # Broken: fails on valid input. +! continue ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +*************** +*** 19839,19864 **** + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +! else +! # Passes both tests. + ac_preproc_ok=: +! break + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok; then : + +! else +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +! See \`config.log' for more details" "$LINENO" 5; } + fi + + ac_ext=c +--- 22213,22242 ---- + /* end confdefs.h. */ + #include + _ACEOF +! if ac_fn_cxx_try_cpp "$LINENO" +! then : + # Broken: success on invalid input. + continue +! else case e in #( +! e) # Passes both tests. + ac_preproc_ok=: +! break ;; +! esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +! # Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.i conftest.err conftest.$ac_ext +! if $ac_preproc_ok +! then : + +! else case e in #( +! e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +! See 'config.log' for more details" "$LINENO" 5; } ;; +! esac + fi + + ac_ext=c +*************** +*** 19992,20010 **** + + + # Check whether --with-gnu-ld was given. +! if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes +! else +! with_gnu_ld=no + fi + + ac_prog=ld + if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +! $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in +! *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) +--- 22370,22390 ---- + + + # Check whether --with-gnu-ld was given. +! if test ${with_gnu_ld+y} +! then : + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes +! else case e in #( +! e) with_gnu_ld=no ;; +! esac + fi + + ac_prog=ld + if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +! printf %s "checking for ld used by $CC... " >&6; } + case $host in +! *-*-mingw* | *-*-windows*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) +*************** +*** 20031,20046 **** + ;; + esac + elif test yes = "$with_gnu_ld"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +! $as_echo_n "checking for GNU ld... " >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +! $as_echo_n "checking for non-GNU ld... " >&6; } + fi +! if ${lt_cv_path_LD+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs +--- 22411,22427 ---- + ;; + esac + elif test yes = "$with_gnu_ld"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +! printf %s "checking for GNU ld... " >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +! printf %s "checking for non-GNU ld... " >&6; } + fi +! if test ${lt_cv_path_LD+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs +*************** +*** 20063,20086 **** + IFS=$lt_save_ifs + else + lt_cv_path_LD=$LD # Let the user override the test with a path. +! fi + fi + + LD=$lt_cv_path_LD + if test -n "$LD"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +! $as_echo "$LD" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +! $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +! if ${lt_cv_prog_gnu_ld+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +! printf "%s\n" "$LD" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +! printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +! if test ${lt_cv_prog_gnu_ld+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 &5 +! $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +--- 22471,22481 ---- + *) + lt_cv_prog_gnu_ld=no + ;; ++ esac ;; + esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +! printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +*************** +*** 20103,20110 **** + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then +! archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' +! archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' +--- 22487,22494 ---- + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then +! archive_cmds_CXX='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' +! archive_expsym_cmds_CXX='$CC $pic_flag -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' +*************** +*** 20115,20122 **** + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. +! if eval "`$CC -print-prog-name=ld` --help 2>&1" | +! $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + whole_archive_flag_spec_CXX= +--- 22499,22505 ---- + wlarc='$wl' + + # ancient GNU ld didn't support --whole-archive et. al. +! if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + whole_archive_flag_spec_CXX= +*************** +*** 20130,20142 **** + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. +! archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no +--- 22513,22525 ---- + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. +! archive_cmds_CXX='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [-]L"' + + else + GXX=no +*************** +*** 20145,20152 **** + fi + + # PORTME: fill in a description of your system's C++ link characteristics +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +! $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +--- 22528,22535 ---- + fi + + # PORTME: fill in a description of your system's C++ link characteristics +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +! printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +*************** +*** 20284,20304 **** + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if ${lt_cv_aix_libpath__CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +--- 22667,22689 ---- + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if test ${lt_cv_aix_libpath__CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_link "$LINENO" +! then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +*************** +*** 20313,20324 **** + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=/usr/lib:/lib + fi +! + fi + + aix_libpath=$lt_cv_aix_libpath__CXX +--- 22698,22710 ---- + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=/usr/lib:/lib + fi +! ;; +! esac + fi + + aix_libpath=$lt_cv_aix_libpath__CXX +*************** +*** 20338,20358 **** + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if ${lt_cv_aix_libpath__CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +--- 22724,22746 ---- + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath + else +! if test ${lt_cv_aix_libpath__CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_link "$LINENO" +! then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +*************** +*** 20367,20378 **** + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=/usr/lib:/lib + fi +! + fi + + aix_libpath=$lt_cv_aix_libpath__CXX +--- 22755,22767 ---- + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=/usr/lib:/lib + fi +! ;; +! esac + fi + + aix_libpath=$lt_cv_aix_libpath__CXX +*************** +*** 20430,20439 **** + esac + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in +! ,cl* | no,cl*) +! # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' +--- 22819,22828 ---- + esac + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + case $GXX,$cc_basename in +! ,cl* | no,cl* | ,icl* | no,icl*) +! # Native MSVC or ICC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' +*************** +*** 20483,20491 **** + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +! archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then +--- 22872,22881 ---- + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes ++ file_list_spec_CXX='@' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +! archive_cmds_CXX='$CC -shared $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then +*************** +*** 20494,20500 **** + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +! $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi +--- 22884,22890 ---- + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +! $CC -shared $stdlibflag $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi +*************** +*** 20524,20534 **** + output_verbose_link_cmd=func_echo_all + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" +! archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +! module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" +! if test yes != "$lt_cv_apple_cc_single_mod"; then +! archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" +! archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi + + else +--- 22914,22924 ---- + output_verbose_link_cmd=func_echo_all + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" +! archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" +! module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" +! if test yes = "$_lt_dar_needs_single_mod" -a yes != "$lt_cv_apple_cc_single_mod"; then +! archive_cmds_CXX="\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" +! archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs $stdlibflag -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi + + else +*************** +*** 20561,20568 **** + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes + ;; + + dgux*) +--- 22951,22959 ---- + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' +! old_archive_from_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes_CXX=yes ++ file_list_spec_CXX='@' + ;; + + dgux*) +*************** +*** 20593,20599 **** + archive_cmds_need_lc_CXX=no + ;; + +! freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +--- 22984,22990 ---- + archive_cmds_need_lc_CXX=no + ;; + +! freebsd* | dragonfly* | midnightbsd*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes +*************** +*** 20601,20607 **** + + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! link_all_deplibs_CXX=yes + ;; + + hpux9*) +--- 22992,22998 ---- + + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +! link_all_deplibs_CXX=no + ;; + + hpux9*) +*************** +*** 20628,20638 **** + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then +! archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no +--- 23019,23029 ---- + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "[-]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then +! archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared $stdlibflag $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no +*************** +*** 20693,20712 **** + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +! archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +! archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +! archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +--- 23084,23103 ---- + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +! output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " [-]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) +! archive_cmds_CXX='$CC -shared $stdlibflag -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +! archive_cmds_CXX='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +! archive_cmds_CXX='$CC -shared $stdlibflag $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +*************** +*** 20730,20736 **** + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in +--- 23121,23127 ---- + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +! archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in +*************** +*** 20747,20755 **** + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then +! archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else +! archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + link_all_deplibs_CXX=yes +--- 23138,23146 ---- + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then +! archive_cmds_CXX='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else +! archive_cmds_CXX='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + link_all_deplibs_CXX=yes +*************** +*** 20870,20882 **** + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' +--- 23261,23273 ---- + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ +! cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' +*************** +*** 20925,20930 **** +--- 23316,23325 ---- + esac + ;; + ++ *-mlibc) ++ ld_shlibs_CXX=yes ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +*************** +*** 20932,20947 **** + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi +! # Workaround some broken pre-1.5 toolchains +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + ld_shlibs_CXX=yes + ;; + +! openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no +--- 23327,23344 ---- + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no ++ else ++ archive_cmds_CXX='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi +! output_verbose_link_cmd=func_echo_all + ;; + + *nto* | *qnx*) + ld_shlibs_CXX=yes + ;; + +! openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no +*************** +*** 21019,21028 **** + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) +! archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) +! archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + +--- 23416,23425 ---- + allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) +! archive_cmds_CXX='$CC -shared $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) +! archive_cmds_CXX='$CC -shared $pic_flag $stdlibflag $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + +*************** +*** 21032,21038 **** + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support +--- 23429,23435 ---- + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [-]L"' + + else + # FIXME: insert proper C++ library support +*************** +*** 21047,21052 **** +--- 23444,23452 ---- + ld_shlibs_CXX=no + ;; + ++ serenity*) ++ ;; ++ + sunos4*) + case $cc_basename in + CC*) +*************** +*** 21109,21133 **** + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +! archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. +! archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' +--- 23509,23533 ---- + if test yes,no = "$GXX,$with_gnu_ld"; then + no_undefined_flag_CXX=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +! archive_cmds_CXX='$CC -shared $pic_flag $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -shared $pic_flag $stdlibflag $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [-]L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. +! archive_cmds_CXX='$CC -G $stdlibflag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +! $CC -G $stdlibflag $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +! output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP -v "^Driving:" | $GREP " [-]L"' + fi + + hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir' +*************** +*** 21218,21225 **** + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +! $as_echo "$ld_shlibs_CXX" >&6; } + test no = "$ld_shlibs_CXX" && can_build_shared=no + + GCC_CXX=$GXX +--- 23618,23625 ---- + ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +! printf "%s\n" "$ld_shlibs_CXX" >&6; } + test no = "$ld_shlibs_CXX" && can_build_shared=no + + GCC_CXX=$GXX +*************** +*** 21257,21263 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +--- 23657,23663 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +*************** +*** 21266,21279 **** + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) +! # Some compilers place space between "-{L,R}" and the path. + # Remove the space. +! if test x-L = "$p" || +! test x-R = "$p"; then + prev=$p + continue + fi +--- 23666,23684 ---- + # the conftest object file. + pre_test_object_deps_done=no + ++ if test yes = "$enable_cxx_stdlib"; then ++ output_verbose_link_cmd= ++ fi ++ + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + + -L* | -R* | -l*) +! # Some compilers place space between "-{L,R,l}" and the path. + # Remove the space. +! if test x-L = x"$p" || +! test x-R = x"$p" || +! test x-l = x"$p"; then + prev=$p + continue + fi +*************** +*** 21440,21446 **** + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +! mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +--- 23845,23851 ---- + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; +! mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style +*************** +*** 21515,21521 **** + ;; + esac + ;; +! mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' +--- 23920,23926 ---- + ;; + esac + ;; +! mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' +*************** +*** 21533,21539 **** + ;; + esac + ;; +! freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +--- 23938,23944 ---- + ;; + esac + ;; +! freebsd* | dragonfly* | midnightbsd*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +*************** +*** 21616,21622 **** + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' +--- 24021,24027 ---- + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) +! case `$CC -V 2>&1 | $SED 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' +*************** +*** 21640,21646 **** + ;; + esac + ;; +! netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +--- 24045,24053 ---- + ;; + esac + ;; +! netbsd* | netbsdelf*-gnu) +! ;; +! *-mlibc) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +*************** +*** 21670,21675 **** +--- 24077,24084 ---- + ;; + psos*) + ;; ++ serenity*) ++ ;; + solaris*) + case $cc_basename in + CC* | sunCC*) +*************** +*** 21738,21764 **** + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +! $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +! if ${lt_cv_prog_compiler_pic_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +! $as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } + lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +! $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +! if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment +--- 24147,24176 ---- + ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +! printf %s "checking for $compiler option to produce PIC... " >&6; } +! if test ${lt_cv_prog_compiler_pic_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; } + lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +! printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +! if test ${lt_cv_prog_compiler_pic_works_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment +*************** +*** 21786,21795 **** + fi + fi + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +! $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + + if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then + case $lt_prog_compiler_pic_CXX in +--- 24198,24208 ---- + fi + fi + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + + if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then + case $lt_prog_compiler_pic_CXX in +*************** +*** 21811,21822 **** + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +! $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +! if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +--- 24224,24236 ---- + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +! printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +! if test ${lt_cv_prog_compiler_static_works_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +*************** +*** 21837,21846 **** + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +! $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } + + if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then + : +--- 24251,24261 ---- + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; } + + if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then + : +*************** +*** 21851,21862 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +--- 24266,24278 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if test ${lt_cv_prog_compiler_c_o_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +*************** +*** 21896,21914 **** + cd .. + $RM -r conftest + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +! $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +--- 24312,24332 ---- + cd .. + $RM -r conftest + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +! printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +! if test ${lt_cv_prog_compiler_c_o_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest +*************** +*** 21948,21957 **** + cd .. + $RM -r conftest + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +! $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + +--- 24366,24376 ---- + cd .. + $RM -r conftest + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +! printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + +*************** +*** 21959,21977 **** + hard_links=nottested + if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +! $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +! $as_echo "$hard_links" >&6; } + if test no = "$hard_links"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +! $as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi + else +--- 24378,24396 ---- + hard_links=nottested + if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +! printf %s "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +! printf "%s\n" "$hard_links" >&6; } + if test no = "$hard_links"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +! printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi + else +*************** +*** 21980,21987 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +! $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' +--- 24399,24406 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +! printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' +*************** +*** 21998,22012 **** + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX=$ltdll_cmds + ;; +! cygwin* | mingw* | cegcc*) + case $cc_basename in +! cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) +--- 24417,24431 ---- + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else +! export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX=$ltdll_cmds + ;; +! cygwin* | mingw* | windows* | cegcc*) + case $cc_basename in +! cl* | icl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) +*************** +*** 22020,22027 **** + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +! $as_echo "$ld_shlibs_CXX" >&6; } + test no = "$ld_shlibs_CXX" && can_build_shared=no + + with_gnu_ld_CXX=$with_gnu_ld +--- 24439,24446 ---- + ;; + esac + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +! printf "%s\n" "$ld_shlibs_CXX" >&6; } + test no = "$ld_shlibs_CXX" && can_build_shared=no + + with_gnu_ld_CXX=$with_gnu_ld +*************** +*** 22048,22065 **** + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +! $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +! if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest +--- 24467,24485 ---- + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +! printf %s "checking whether -lc should be explicitly linked in... " >&6; } +! if test ${lt_cv_archive_cmds_need_lc_CXX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest +*************** +*** 22077,22083 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no +--- 24497,24503 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no +*************** +*** 22089,22098 **** + cat conftest.err 1>&5 + fi + $RM conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +! $as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX + ;; + esac +--- 24509,24519 ---- + cat conftest.err 1>&5 + fi + $RM conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +! printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX + ;; + esac +*************** +*** 22161,22168 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +! $as_echo_n "checking dynamic linker characteristics... " >&6; } + + library_names_spec= + libname_spec='lib$name' +--- 24582,24589 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +! printf %s "checking dynamic linker characteristics... " >&6; } + + library_names_spec= + libname_spec='lib$name' +*************** +*** 22231,22237 **** + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl +! # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the +--- 24652,24658 ---- + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl +! # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the +*************** +*** 22325,22331 **** + # libtool to hard-code these into programs + ;; + +! cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no +--- 24746,24752 ---- + # libtool to hard-code these into programs + ;; + +! cygwin* | mingw* | windows* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no +*************** +*** 22336,22350 **** + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! test -d \$dldir || mkdir -p \$dldir~ +! $install_prog $dir/$dlname \$dldir/$dlname~ +! chmod a+x \$dldir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +! fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' +--- 24757,24785 ---- + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds +! # If user builds GCC with multilib enabled, +! # it should just install on $(libdir) +! # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones. +! if test xyes = x"$multilib"; then +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! $install_prog $dir/$dlname $destdir/$dlname~ +! chmod a+x $destdir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib $destdir/$dlname'\'' || exit \$?; +! fi' +! else +! postinstall_cmds='base_file=`basename \$file`~ +! dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ +! dldir=$destdir/`dirname \$dlpath`~ +! test -d \$dldir || mkdir -p \$dldir~ +! $install_prog $dir/$dlname \$dldir/$dlname~ +! chmod a+x \$dldir/$dlname~ +! if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +! eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +! fi' +! fi + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' +*************** +*** 22353,22381 **** + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +! soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + ;; +! mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +! library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + +! *,cl*) +! # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in +! mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' +--- 24788,24816 ---- + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +! soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + ;; +! mingw* | windows* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +! library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + +! *,cl* | *,icl*) +! # Native MSVC or ICC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in +! mingw* | windows*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' +*************** +*** 22388,22394 **** + done + IFS=$lt_save_ifs + # Convert to MSYS style. +! sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form +--- 24823,24829 ---- + done + IFS=$lt_save_ifs + # Convert to MSYS style. +! sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form +*************** +*** 22425,22431 **** + ;; + + *) +! # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; +--- 24860,24866 ---- + ;; + + *) +! # Assume MSVC and ICC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; +*************** +*** 22457,22463 **** + shlibpath_var=LD_LIBRARY_PATH + ;; + +! freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then +--- 24892,24898 ---- + shlibpath_var=LD_LIBRARY_PATH + ;; + +! freebsd* | dragonfly* | midnightbsd*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then +*************** +*** 22481,22487 **** +--- 24916,24943 ---- + need_version=yes + ;; + esac ++ case $host_cpu in ++ powerpc64) ++ # On FreeBSD bi-arch platforms, a different variable is used for 32-bit ++ # binaries. See . ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ /* end confdefs.h. */ ++ int test_pointer_size[sizeof (void *) - 5]; ++ ++ _ACEOF ++ if ac_fn_cxx_try_compile "$LINENO" ++ then : + shlibpath_var=LD_LIBRARY_PATH ++ else case e in #( ++ e) shlibpath_var=LD_32_LIBRARY_PATH ;; ++ esac ++ fi ++ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ ;; ++ *) ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ esac + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes +*************** +*** 22511,22518 **** + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no +! sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' +! hardcode_into_libs=yes + ;; + + hpux9* | hpux10* | hpux11*) +--- 24967,24975 ---- + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no +! sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib' +! sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib' +! hardcode_into_libs=no + ;; + + hpux9* | hpux10* | hpux11*) +*************** +*** 22622,22628 **** + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no +! library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH +--- 25079,25085 ---- + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no +! library_names_spec='$libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH +*************** +*** 22634,22641 **** + hardcode_into_libs=yes + + dynamic_linker='Android linker' +! # Don't embed -rpath directories since the linker doesn't support them. +! hardcode_libdir_flag_spec_CXX='-L$libdir' + ;; + + # This must be glibc/ELF. +--- 25091,25099 ---- + hardcode_into_libs=yes + + dynamic_linker='Android linker' +! # -rpath works at least for libraries that are not overridden by +! # libraries installed in system locations. +! hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + ;; + + # This must be glibc/ELF. +*************** +*** 22650,22659 **** + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH +! if ${lt_cv_shlibpath_overrides_runpath+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ +--- 25108,25118 ---- + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH +! if test ${lt_cv_shlibpath_overrides_runpath+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ +*************** +*** 22662,22684 **** + /* end confdefs.h. */ + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_link "$LINENO"; then : +! if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes + fi + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir +! + fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath +--- 25121,25146 ---- + /* end confdefs.h. */ + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_cxx_try_link "$LINENO" +! then : +! if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +! then : + lt_cv_shlibpath_overrides_runpath=yes + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir +! ;; +! esac + fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath +*************** +*** 22688,22694 **** + # before this can be enabled. + hardcode_into_libs=yes + +! # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, +--- 25150,25156 ---- + # before this can be enabled. + hardcode_into_libs=yes + +! # Ideally, we could use ldconfig to report *all* directories which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, +*************** +*** 22708,22713 **** +--- 25170,25189 ---- + dynamic_linker='GNU/Linux ld.so' + ;; + ++ netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ enable_cxx_stdlib=yes ++ stdlibflag= ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +*************** +*** 22724,22729 **** +--- 25200,25219 ---- + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes ++ enable_cxx_stdlib=yes ++ stdlibflag= ++ ;; ++ ++ *-mlibc) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ dynamic_linker='mlibc ld.so' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes + ;; + + newsos6) +*************** +*** 22745,22751 **** + dynamic_linker='ldqnx.so' + ;; + +! openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +--- 25235,25241 ---- + dynamic_linker='ldqnx.so' + ;; + +! openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no +*************** +*** 22805,22810 **** +--- 25295,25311 ---- + dynamic_linker=no + ;; + ++ serenity*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ dynamic_linker='SerenityOS LibELF' ++ ;; ++ + solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no +*************** +*** 22902,22913 **** + shlibpath_var=LD_LIBRARY_PATH + ;; + + *) + dynamic_linker=no + ;; + esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +! $as_echo "$dynamic_linker" >&6; } + test no = "$dynamic_linker" && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +--- 25403,25887 ---- + shlibpath_var=LD_LIBRARY_PATH + ;; + ++ emscripten*) ++ version_type=none ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext' ++ soname_spec='$libname$release$shared_ext' ++ finish_cmds= ++ dynamic_linker="Emscripten linker" ++ lt_prog_compiler_wl_CXX= ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX= ++ ++ ++ # C++ specific cases for pic, static, wl, etc. ++ if test yes = "$GXX"; then ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ fi ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the '-m68020' flag to GCC prevents building anything better, ++ # like '-m68040'. ++ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ++ case $host_os in ++ os2*) ++ lt_prog_compiler_static_CXX='$wl-static' ++ ;; ++ esac ++ ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_CXX='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ lt_prog_compiler_pic_CXX= ++ ;; ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ lt_prog_compiler_static_CXX= ++ ;; ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_CXX=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ esac ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix[4-9]*) ++ # All AIX code is PIC. ++ if test ia64 = "$host_cpu"; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ else ++ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | dragonfly* | midnightbsd*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='$wl-a ${wl}archive' ++ if test ia64 != "$host_cpu"; then ++ lt_prog_compiler_pic_CXX='+Z' ++ fi ++ ;; ++ aCC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='$wl-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ ecpc* ) ++ # old Intel C++ for x86_64, which still supported -KPIC. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fpic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) ++ # IBM XL 8.0, 9.0 on PPC and BlueGene ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-qpic' ++ lt_prog_compiler_static_CXX='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | $SED 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ lt_prog_compiler_pic_CXX='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu) ++ ;; ++ *-mlibc) ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ lt_prog_compiler_wl_CXX='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ serenity*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC* | sunCC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ lt_prog_compiler_pic_CXX='-pic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ lt_prog_compiler_can_build_shared_CXX=no ++ ;; ++ esac ++ fi ++ ++ case $host_os in ++ # For platforms that do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_CXX= ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ++ ;; ++ esac ++ ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++ printf %s "checking for $compiler option to produce PIC... " >&6; } ++ if test ${lt_cv_prog_compiler_pic_CXX+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 ++ printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; } ++ lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX ++ ++ # ++ # Check to make sure the PIC flag actually works. ++ # ++ if test -n "$lt_prog_compiler_pic_CXX"; then ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++ printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } ++ if test ${lt_cv_prog_compiler_pic_works_CXX+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) lt_cv_prog_compiler_pic_works_CXX=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_CXX=yes ++ fi ++ fi ++ $RM conftest* ++ ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++ printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++ ++ if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then ++ case $lt_prog_compiler_pic_CXX in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; ++ esac ++ else ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_can_build_shared_CXX=no ++ fi ++ ++ fi ++ ++ ++ ++ ++ ++ # ++ # Check to make sure the static flag actually works. ++ # ++ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++ printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++ if test ${lt_cv_prog_compiler_static_works_CXX+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) lt_cv_prog_compiler_static_works_CXX=no ++ save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS=$save_LDFLAGS ++ ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++ printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; } ++ ++ if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then ++ : ++ else ++ lt_prog_compiler_static_CXX= ++ fi ++ ++ ++ ++ ='-fPIC' ++ archive_cmds_CXX='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib' ++ archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym' ++ archive_cmds_need_lc_CXX=no ++ no_undefined_flag_CXX= ++ ;; ++ + *) + dynamic_linker=no + ;; + esac +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +! printf "%s\n" "$dynamic_linker" >&6; } + test no = "$dynamic_linker" && can_build_shared=no + + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +*************** +*** 22971,22978 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +! $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || +--- 25945,25952 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +! printf %s "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || +*************** +*** 22996,23003 **** + # directories. + hardcode_action_CXX=unsupported + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +! $as_echo "$hardcode_action_CXX" >&6; } + + if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then +--- 25970,25977 ---- + # directories. + hardcode_action_CXX=unsupported + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +! printf "%s\n" "$hardcode_action_CXX" >&6; } + + if test relink = "$hardcode_action_CXX" || + test yes = "$inherit_rpath_CXX"; then +*************** +*** 23083,23234 **** + # Many of these library and header checks are for the benefit of + # supplementary programs. libgmp doesn't use anything too weird. + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +! $as_echo_n "checking for ANSI C header files... " >&6; } +! if ${ac_cv_header_stdc+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! #include +! #include +! #include +! +! int +! main () +! { + +! ; +! return 0; +! } +! _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : +! ac_cv_header_stdc=yes +! else +! ac_cv_header_stdc=no +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! +! if test $ac_cv_header_stdc = yes; then +! # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! +! _ACEOF +! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "memchr" >/dev/null 2>&1; then : +! +! else +! ac_cv_header_stdc=no +! fi +! rm -f conftest* +! +! fi +! +! if test $ac_cv_header_stdc = yes; then +! # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! +! _ACEOF +! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "free" >/dev/null 2>&1; then : + + else +! ac_cv_header_stdc=no +! fi +! rm -f conftest* +! + fi + +! if test $ac_cv_header_stdc = yes; then +! # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +! if test "$cross_compiling" = yes; then : +! : +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! #include +! #if ((' ' & 0x0FF) == 0x020) +! # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +! # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +! #else +! # define ISLOWER(c) \ +! (('a' <= (c) && (c) <= 'i') \ +! || ('j' <= (c) && (c) <= 'r') \ +! || ('s' <= (c) && (c) <= 'z')) +! # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +! #endif +! +! #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +! int +! main () +! { +! int i; +! for (i = 0; i < 256; i++) +! if (XOR (islower (i), ISLOWER (i)) +! || toupper (i) != TOUPPER (i)) +! return 2; +! return 0; +! } +! _ACEOF +! if ac_fn_c_try_run "$LINENO"; then : +! +! else +! ac_cv_header_stdc=no +! fi +! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +! conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +! fi +! fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +! $as_echo "$ac_cv_header_stdc" >&6; } +! if test $ac_cv_header_stdc = yes; then + +- $as_echo "#define STDC_HEADERS 1" >>confdefs.h + +- fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +- $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +- if ${ac_cv_header_time+:} false; then : +- $as_echo_n "(cached) " >&6 +- else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +- /* end confdefs.h. */ +- #include +- #include +- #include + +! int +! main () +! { +! if ((struct tm *) 0) +! return 0; +! ; +! return 0; +! } +! _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : +! ac_cv_header_time=yes +! else +! ac_cv_header_time=no +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +! $as_echo "$ac_cv_header_time" >&6; } +! if test $ac_cv_header_time = yes; then + +! $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + + fi + + + # Reasons for testing: +--- 26061,26156 ---- + # Many of these library and header checks are for the benefit of + # supplementary programs. libgmp doesn't use anything too weird. + +! # Autoupdate added the next two lines to ensure that your configure +! # script's behavior did not change. They are probably safe to remove. + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +! printf %s "checking for egrep... " >&6; } +! if test ${ac_cv_path_EGREP+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +! then ac_cv_path_EGREP="$GREP -E" +! else +! if test -z "$EGREP"; then +! ac_path_EGREP_found=false +! # Loop through the user's path and test for each of PROGNAME-LIST +! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +! do +! IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! for ac_prog in egrep +! do +! for ac_exec_ext in '' $ac_executable_extensions; do +! ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" +! as_fn_executable_p "$ac_path_EGREP" || continue +! # Check for GNU ac_path_EGREP and select it if it is found. +! # Check for GNU $ac_path_EGREP +! case `"$ac_path_EGREP" --version 2>&1` in #( +! *GNU*) +! ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +! #( +! *) +! ac_count=0 +! printf %s 0123456789 >"conftest.in" +! while : +! do +! cat "conftest.in" "conftest.in" >"conftest.tmp" +! mv "conftest.tmp" "conftest.in" +! cp "conftest.in" "conftest.nl" +! printf "%s\n" 'EGREP' >> "conftest.nl" +! "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +! diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +! as_fn_arith $ac_count + 1 && ac_count=$as_val +! if test $ac_count -gt ${ac_path_EGREP_max-0}; then +! # Best one so far, save it but keep looking for a better one +! ac_cv_path_EGREP="$ac_path_EGREP" +! ac_path_EGREP_max=$ac_count +! fi +! # 10*(2^10) chars as input seems more than enough +! test $ac_count -gt 10 && break +! done +! rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +! esac + ++ $ac_path_EGREP_found && break 3 ++ done ++ done ++ done ++ IFS=$as_save_IFS ++ if test -z "$ac_cv_path_EGREP"; then ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi + else +! ac_cv_path_EGREP=$EGREP + fi + +! fi ;; +! esac + fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 ++ printf "%s\n" "$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" + +! EGREP_TRADITIONAL=$EGREP +! ac_cv_path_EGREP_TRADITIONAL=$EGREP + + + + +! # Obsolete code to be removed. +! if test $ac_cv_header_sys_time_h = yes; then + +! printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + + fi ++ # End of obsolete code. + + + # Reasons for testing: +*************** +*** 23256,23279 **** + # inttypes.h, stdint.h, unistd.h and sys/types.h are already in the autoconf + # default tests + # +! for ac_header in fcntl.h float.h invent.h langinfo.h locale.h nl_types.h sys/attributes.h sys/iograph.h sys/mman.h sys/param.h sys/processor.h sys/pstat.h sys/sysinfo.h sys/syssgi.h sys/systemcfg.h sys/time.h sys/times.h +! do : +! as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +! ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +! cat >>confdefs.h <<_ACEOF +! #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +! _ACEOF + + fi + +! done + + + # On SunOS, sys/resource.h needs sys/time.h (for struct timeval) +! for ac_header in sys/resource.h +! do : +! ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "#if TIME_WITH_SYS_TIME + # include + # include + #else +--- 26178,26289 ---- + # inttypes.h, stdint.h, unistd.h and sys/types.h are already in the autoconf + # default tests + # +! ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +! if test "x$ac_cv_header_fcntl_h" = xyes +! then : +! printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h + + fi ++ ac_fn_c_check_header_compile "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default" ++ if test "x$ac_cv_header_float_h" = xyes ++ then : ++ printf "%s\n" "#define HAVE_FLOAT_H 1" >>confdefs.h + +! fi +! ac_fn_c_check_header_compile "$LINENO" "invent.h" "ac_cv_header_invent_h" "$ac_includes_default" +! if test "x$ac_cv_header_invent_h" = xyes +! then : +! printf "%s\n" "#define HAVE_INVENT_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" +! if test "x$ac_cv_header_langinfo_h" = xyes +! then : +! printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +! if test "x$ac_cv_header_locale_h" = xyes +! then : +! printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "nl_types.h" "ac_cv_header_nl_types_h" "$ac_includes_default" +! if test "x$ac_cv_header_nl_types_h" = xyes +! then : +! printf "%s\n" "#define HAVE_NL_TYPES_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/attributes.h" "ac_cv_header_sys_attributes_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_attributes_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_ATTRIBUTES_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/iograph.h" "ac_cv_header_sys_iograph_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_iograph_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_IOGRAPH_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_mman_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_param_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/processor.h" "ac_cv_header_sys_processor_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_processor_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_PROCESSOR_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_pstat_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_sysinfo_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/syssgi.h" "ac_cv_header_sys_syssgi_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_syssgi_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_SYSSGI_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/systemcfg.h" "ac_cv_header_sys_systemcfg_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_systemcfg_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_SYSTEMCFG_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_time_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h +! +! fi +! ac_fn_c_check_header_compile "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default" +! if test "x$ac_cv_header_sys_times_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_TIMES_H 1" >>confdefs.h +! +! fi + + + # On SunOS, sys/resource.h needs sys/time.h (for struct timeval) +! ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "#if TIME_WITH_SYS_TIME + # include + # include + #else +*************** +*** 23284,23332 **** + # endif + #endif + " +! if test "x$ac_cv_header_sys_resource_h" = xyes; then : +! cat >>confdefs.h <<_ACEOF +! #define HAVE_SYS_RESOURCE_H 1 +! _ACEOF + + fi + +- done +- + + # On NetBSD and OpenBSD, sys/sysctl.h needs sys/param.h for various constants +! for ac_header in sys/sysctl.h +! do : +! ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if HAVE_SYS_PARAM_H + # include + #endif + " +! if test "x$ac_cv_header_sys_sysctl_h" = xyes; then : +! cat >>confdefs.h <<_ACEOF +! #define HAVE_SYS_SYSCTL_H 1 +! _ACEOF + + fi + +- done +- + + # On OSF 4.0, must have for ulong_t +! for ac_header in machine/hal_sysinfo.h +! do : +! ac_fn_c_check_header_compile "$LINENO" "machine/hal_sysinfo.h" "ac_cv_header_machine_hal_sysinfo_h" "#if HAVE_SYS_SYSINFO_H + # include + #endif + " +! if test "x$ac_cv_header_machine_hal_sysinfo_h" = xyes; then : +! cat >>confdefs.h <<_ACEOF +! #define HAVE_MACHINE_HAL_SYSINFO_H 1 +! _ACEOF + + fi + +- done +- + + # Reasons for testing: + # optarg - not declared in mingw +--- 26294,26329 ---- + # endif + #endif + " +! if test "x$ac_cv_header_sys_resource_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h + + fi + + + # On NetBSD and OpenBSD, sys/sysctl.h needs sys/param.h for various constants +! ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if HAVE_SYS_PARAM_H + # include + #endif + " +! if test "x$ac_cv_header_sys_sysctl_h" = xyes +! then : +! printf "%s\n" "#define HAVE_SYS_SYSCTL_H 1" >>confdefs.h + + fi + + + # On OSF 4.0, must have for ulong_t +! ac_fn_c_check_header_compile "$LINENO" "machine/hal_sysinfo.h" "ac_cv_header_machine_hal_sysinfo_h" "#if HAVE_SYS_SYSINFO_H + # include + #endif + " +! if test "x$ac_cv_header_machine_hal_sysinfo_h" = xyes +! then : +! printf "%s\n" "#define HAVE_MACHINE_HAL_SYSINFO_H 1" >>confdefs.h + + fi + + + # Reasons for testing: + # optarg - not declared in mingw +*************** +*** 23339,23452 **** + # sys_errlist and sys_nerr are supposed to be in on SunOS according + # to the man page (but aren't), in glibc they're in stdio.h. + # +! ac_fn_c_check_decl "$LINENO" "fgetc" "ac_cv_have_decl_fgetc" "$ac_includes_default" +! if test "x$ac_cv_have_decl_fgetc" = xyes; then : +! ac_have_decl=1 +! else +! ac_have_decl=0 +! fi + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_FGETC $ac_have_decl + _ACEOF +! ac_fn_c_check_decl "$LINENO" "fscanf" "ac_cv_have_decl_fscanf" "$ac_includes_default" +! if test "x$ac_cv_have_decl_fscanf" = xyes; then : +! ac_have_decl=1 +! else +! ac_have_decl=0 +! fi + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_FSCANF $ac_have_decl + _ACEOF +! ac_fn_c_check_decl "$LINENO" "optarg" "ac_cv_have_decl_optarg" "$ac_includes_default" +! if test "x$ac_cv_have_decl_optarg" = xyes; then : +! ac_have_decl=1 +! else +! ac_have_decl=0 + fi + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_OPTARG $ac_have_decl +! _ACEOF +! ac_fn_c_check_decl "$LINENO" "ungetc" "ac_cv_have_decl_ungetc" "$ac_includes_default" +! if test "x$ac_cv_have_decl_ungetc" = xyes; then : + ac_have_decl=1 +! else +! ac_have_decl=0 + fi +! +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_UNGETC $ac_have_decl +! _ACEOF +! ac_fn_c_check_decl "$LINENO" "vfprintf" "ac_cv_have_decl_vfprintf" "$ac_includes_default" +! if test "x$ac_cv_have_decl_vfprintf" = xyes; then : + ac_have_decl=1 +! else +! ac_have_decl=0 + fi + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_VFPRINTF $ac_have_decl +! _ACEOF +! +! ac_fn_c_check_decl "$LINENO" "sys_errlist" "ac_cv_have_decl_sys_errlist" "#include + #include +! " +! if test "x$ac_cv_have_decl_sys_errlist" = xyes; then : + ac_have_decl=1 +! else +! ac_have_decl=0 + fi +! +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_SYS_ERRLIST $ac_have_decl +! _ACEOF +! ac_fn_c_check_decl "$LINENO" "sys_nerr" "ac_cv_have_decl_sys_nerr" "#include + #include +! " +! if test "x$ac_cv_have_decl_sys_nerr" = xyes; then : + ac_have_decl=1 +! else +! ac_have_decl=0 + fi +! +! cat >>confdefs.h <<_ACEOF +! #define HAVE_DECL_SYS_NERR $ac_have_decl +! _ACEOF + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +! $as_echo_n "checking return type of signal handlers... " >&6; } +! if ${ac_cv_type_signal+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include + + int +! main () + { + return *(signal (0, 0)) (0) == 1; + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_signal=int +! else +! ac_cv_type_signal=void + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +! $as_echo "$ac_cv_type_signal" >&6; } + +! cat >>confdefs.h <<_ACEOF +! #define RETSIGTYPE $ac_cv_type_signal +! _ACEOF + + + +--- 26336,26527 ---- + # sys_errlist and sys_nerr are supposed to be in on SunOS according + # to the man page (but aren't), in glibc they're in stdio.h. + # +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +! printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +! if test ${ac_cv_c_undeclared_builtin_options+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_save_CFLAGS=$CFLAGS +! ac_cv_c_undeclared_builtin_options='cannot detect' +! for ac_arg in '' -fno-builtin; do +! CFLAGS="$ac_save_CFLAGS $ac_arg" +! # This test program should *not* compile successfully. +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ + +! int +! main (void) +! { +! (void) strchr; +! ; +! return 0; +! } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : +! +! else case e in #( +! e) # This test program should compile successfully. +! # No library function is consistently available on +! # freestanding implementations, so test against a dummy +! # declaration. Include always-available headers on the +! # off chance that they somehow elicit warnings. +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! #include +! #include +! #include +! #include +! extern void ac_decl (int, char *); +! +! int +! main (void) +! { +! (void) ac_decl (0, (char *) 0); +! (void) ac_decl; + +! ; +! return 0; +! } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : +! if test x"$ac_arg" = x +! then : +! ac_cv_c_undeclared_builtin_options='none needed' +! else case e in #( +! e) ac_cv_c_undeclared_builtin_options=$ac_arg ;; +! esac +! fi +! break +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! done +! CFLAGS=$ac_save_CFLAGS +! ;; +! esac + fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 ++ printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } ++ case $ac_cv_c_undeclared_builtin_options in #( ++ 'cannot detect') : ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++ printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} ++ as_fn_error $? "cannot make $CC report undeclared builtins ++ See 'config.log' for more details" "$LINENO" 5; } ;; #( ++ 'none needed') : ++ ac_c_undeclared_builtin_options='' ;; #( ++ *) : ++ ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; ++ esac + +! ac_fn_check_decl "$LINENO" "fgetc" "ac_cv_have_decl_fgetc" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +! if test "x$ac_cv_have_decl_fgetc" = xyes +! then : + ac_have_decl=1 +! else case e in #( +! e) ac_have_decl=0 ;; +! esac + fi +! printf "%s\n" "#define HAVE_DECL_FGETC $ac_have_decl" >>confdefs.h +! ac_fn_check_decl "$LINENO" "fscanf" "ac_cv_have_decl_fscanf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +! if test "x$ac_cv_have_decl_fscanf" = xyes +! then : + ac_have_decl=1 +! else case e in #( +! e) ac_have_decl=0 ;; +! esac + fi ++ printf "%s\n" "#define HAVE_DECL_FSCANF $ac_have_decl" >>confdefs.h ++ ac_fn_check_decl "$LINENO" "optarg" "ac_cv_have_decl_optarg" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" ++ if test "x$ac_cv_have_decl_optarg" = xyes ++ then : ++ ac_have_decl=1 ++ else case e in #( ++ e) ac_have_decl=0 ;; ++ esac ++ fi ++ printf "%s\n" "#define HAVE_DECL_OPTARG $ac_have_decl" >>confdefs.h ++ ac_fn_check_decl "$LINENO" "ungetc" "ac_cv_have_decl_ungetc" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" ++ if test "x$ac_cv_have_decl_ungetc" = xyes ++ then : ++ ac_have_decl=1 ++ else case e in #( ++ e) ac_have_decl=0 ;; ++ esac ++ fi ++ printf "%s\n" "#define HAVE_DECL_UNGETC $ac_have_decl" >>confdefs.h ++ ac_fn_check_decl "$LINENO" "vfprintf" "ac_cv_have_decl_vfprintf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" ++ if test "x$ac_cv_have_decl_vfprintf" = xyes ++ then : ++ ac_have_decl=1 ++ else case e in #( ++ e) ac_have_decl=0 ;; ++ esac ++ fi ++ printf "%s\n" "#define HAVE_DECL_VFPRINTF $ac_have_decl" >>confdefs.h + +! ac_fn_check_decl "$LINENO" "sys_errlist" "ac_cv_have_decl_sys_errlist" "#include + #include +! " "$ac_c_undeclared_builtin_options" "CFLAGS" +! if test "x$ac_cv_have_decl_sys_errlist" = xyes +! then : + ac_have_decl=1 +! else case e in #( +! e) ac_have_decl=0 ;; +! esac + fi +! printf "%s\n" "#define HAVE_DECL_SYS_ERRLIST $ac_have_decl" >>confdefs.h +! ac_fn_check_decl "$LINENO" "sys_nerr" "ac_cv_have_decl_sys_nerr" "#include + #include +! " "$ac_c_undeclared_builtin_options" "CFLAGS" +! if test "x$ac_cv_have_decl_sys_nerr" = xyes +! then : + ac_have_decl=1 +! else case e in #( +! e) ac_have_decl=0 ;; +! esac + fi +! printf "%s\n" "#define HAVE_DECL_SYS_NERR $ac_have_decl" >>confdefs.h + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +! printf %s "checking return type of signal handlers... " >&6; } +! if test ${ac_cv_type_signal+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include + + int +! main (void) + { + return *(signal (0, 0)) (0) == 1; + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_type_signal=int +! else case e in #( +! e) ac_cv_type_signal=void ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +! printf "%s\n" "$ac_cv_type_signal" >&6; } + +! printf "%s\n" "#define RETSIGTYPE $ac_cv_type_signal" >>confdefs.h + + + +*************** +*** 23461,23525 **** + # the default includes are sufficient for all these types + # + ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "$ac_includes_default" +! if test "x$ac_cv_type_intmax_t" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_INTMAX_T 1 +! _ACEOF + + + fi + ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default" +! if test "x$ac_cv_type_long_double" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_LONG_DOUBLE 1 +! _ACEOF + + + fi + ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" +! if test "x$ac_cv_type_long_long" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_LONG_LONG 1 +! _ACEOF + + + fi + ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" +! if test "x$ac_cv_type_ptrdiff_t" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_PTRDIFF_T 1 +! _ACEOF + + + fi + ac_fn_c_check_type "$LINENO" "quad_t" "ac_cv_type_quad_t" "$ac_includes_default" +! if test "x$ac_cv_type_quad_t" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_QUAD_T 1 +! _ACEOF + + + fi + ac_fn_c_check_type "$LINENO" "uint_least32_t" "ac_cv_type_uint_least32_t" "$ac_includes_default" +! if test "x$ac_cv_type_uint_least32_t" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_UINT_LEAST32_T 1 +! _ACEOF + + + fi + ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default" +! if test "x$ac_cv_type_intptr_t" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_INTPTR_T 1 +! _ACEOF + + + fi +--- 26536,26593 ---- + # the default includes are sufficient for all these types + # + ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "$ac_includes_default" +! if test "x$ac_cv_type_intmax_t" = xyes +! then : + +! printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h + + + fi + ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default" +! if test "x$ac_cv_type_long_double" = xyes +! then : + +! printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + + + fi + ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" +! if test "x$ac_cv_type_long_long" = xyes +! then : + +! printf "%s\n" "#define HAVE_LONG_LONG 1" >>confdefs.h + + + fi + ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default" +! if test "x$ac_cv_type_ptrdiff_t" = xyes +! then : + +! printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h + + + fi + ac_fn_c_check_type "$LINENO" "quad_t" "ac_cv_type_quad_t" "$ac_includes_default" +! if test "x$ac_cv_type_quad_t" = xyes +! then : + +! printf "%s\n" "#define HAVE_QUAD_T 1" >>confdefs.h + + + fi + ac_fn_c_check_type "$LINENO" "uint_least32_t" "ac_cv_type_uint_least32_t" "$ac_includes_default" +! if test "x$ac_cv_type_uint_least32_t" = xyes +! then : + +! printf "%s\n" "#define HAVE_UINT_LEAST32_T 1" >>confdefs.h + + + fi + ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default" +! if test "x$ac_cv_type_intptr_t" = xyes +! then : + +! printf "%s\n" "#define HAVE_INTPTR_T 1" >>confdefs.h + + + fi +*************** +*** 23528,23543 **** + # FIXME: Really want #ifndef __cplusplus around the #define volatile + # replacement autoconf gives, since volatile is always available in C++. + # But we don't use it in C++ currently. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 +! $as_echo_n "checking for working volatile... " >&6; } +! if ${ac_cv_c_volatile+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main () + { + + volatile int x; +--- 26596,26612 ---- + # FIXME: Really want #ifndef __cplusplus around the #define volatile + # replacement autoconf gives, since volatile is always available in C++. + # But we don't use it in C++ currently. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 +! printf %s "checking for working volatile... " >&6; } +! if test ${ac_cv_c_volatile+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +! main (void) + { + + volatile int x; +*************** +*** 23547,23661 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_volatile=yes +! else +! ac_cv_c_volatile=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 +! $as_echo "$ac_cv_c_volatile" >&6; } + if test $ac_cv_c_volatile = no; then + +! $as_echo "#define volatile /**/" >>confdefs.h + + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 +! $as_echo_n "checking for C/C++ restrict keyword... " >&6; } +! if ${ac_cv_c_restrict+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_cv_c_restrict=no +! # The order here caters to the fact that C++ does not require restrict. +! for ac_kw in __restrict __restrict__ _Restrict restrict; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! typedef int * int_ptr; +! int foo (int_ptr $ac_kw ip) { +! return ip[0]; +! } + int +! main () + { + int s[1]; +! int * $ac_kw t = s; +! t[0] = 0; +! return foo(t) + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_restrict=$ac_kw + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_restrict" != no && break + done +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 +! $as_echo "$ac_cv_c_restrict" >&6; } + + case $ac_cv_c_restrict in + restrict) ;; +! no) $as_echo "#define restrict /**/" >>confdefs.h + ;; +! *) cat >>confdefs.h <<_ACEOF +! #define restrict $ac_cv_c_restrict +! _ACEOF + ;; + esac + + + # GMP_C_STDARG +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((const)) works" >&5 +! $as_echo_n "checking whether gcc __attribute__ ((const)) works... " >&6; } +! if ${gmp_cv_c_attribute_const+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int foo (int x) __attribute__ ((const)); + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + gmp_cv_c_attribute_const=yes +! else +! gmp_cv_c_attribute_const=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_const" >&5 +! $as_echo "$gmp_cv_c_attribute_const" >&6; } + if test $gmp_cv_c_attribute_const = yes; then + +! $as_echo "#define HAVE_ATTRIBUTE_CONST 1" >>confdefs.h + + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((malloc)) works" >&5 +! $as_echo_n "checking whether gcc __attribute__ ((malloc)) works... " >&6; } +! if ${gmp_cv_c_attribute_malloc+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "attribute directive ignored" conftest.out >/dev/null; then + gmp_cv_c_attribute_malloc=no +--- 26616,26743 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_c_volatile=yes +! else case e in #( +! e) ac_cv_c_volatile=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 +! printf "%s\n" "$ac_cv_c_volatile" >&6; } + if test $ac_cv_c_volatile = no; then + +! printf "%s\n" "#define volatile /**/" >>confdefs.h + + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 +! printf %s "checking for C/C++ restrict keyword... " >&6; } +! if test ${ac_cv_c_restrict+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_cv_c_restrict=no +! # Put '__restrict__' first, to avoid problems with glibc and non-GCC; see: +! # https://lists.gnu.org/archive/html/bug-autoconf/2016-02/msg00006.html +! # Put 'restrict' last, because C++ lacks it. +! for ac_kw in __restrict__ __restrict _Restrict restrict; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! typedef int *int_ptr; +! int foo (int_ptr $ac_kw ip) { return ip[0]; } +! int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ +! int bar (int ip[$ac_kw]) { return ip[0]; } +! + int +! main (void) + { + int s[1]; +! int *$ac_kw t = s; +! t[0] = 0; +! return foo (t) + bar (t); +! + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_c_restrict=$ac_kw + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test "$ac_cv_c_restrict" != no && break + done +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 +! printf "%s\n" "$ac_cv_c_restrict" >&6; } + + case $ac_cv_c_restrict in + restrict) ;; +! no) printf "%s\n" "#define restrict /**/" >>confdefs.h + ;; +! *) printf "%s\n" "#define restrict $ac_cv_c_restrict" >>confdefs.h + ;; + esac + + + # GMP_C_STDARG +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((const)) works" >&5 +! printf %s "checking whether gcc __attribute__ ((const)) works... " >&6; } +! if test ${gmp_cv_c_attribute_const+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int foo (int x) __attribute__ ((const)); + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + gmp_cv_c_attribute_const=yes +! else case e in #( +! e) gmp_cv_c_attribute_const=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_const" >&5 +! printf "%s\n" "$gmp_cv_c_attribute_const" >&6; } + if test $gmp_cv_c_attribute_const = yes; then + +! printf "%s\n" "#define HAVE_ATTRIBUTE_CONST 1" >>confdefs.h + + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((malloc)) works" >&5 +! printf %s "checking whether gcc __attribute__ ((malloc)) works... " >&6; } +! if test ${gmp_cv_c_attribute_malloc+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep "attribute directive ignored" conftest.out >/dev/null; then + gmp_cv_c_attribute_malloc=no +*************** +*** 23667,23807 **** + fi + cat conftest.out >&5 + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_malloc" >&5 +! $as_echo "$gmp_cv_c_attribute_malloc" >&6; } + if test $gmp_cv_c_attribute_malloc = yes; then + +! $as_echo "#define HAVE_ATTRIBUTE_MALLOC 1" >>confdefs.h + + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((mode (XX))) works" >&5 +! $as_echo_n "checking whether gcc __attribute__ ((mode (XX))) works... " >&6; } +! if ${gmp_cv_c_attribute_mode+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + typedef int SItype __attribute__ ((mode (SI))); + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + gmp_cv_c_attribute_mode=yes +! else +! gmp_cv_c_attribute_mode=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_mode" >&5 +! $as_echo "$gmp_cv_c_attribute_mode" >&6; } + if test $gmp_cv_c_attribute_mode = yes; then + +! $as_echo "#define HAVE_ATTRIBUTE_MODE 1" >>confdefs.h + + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((noreturn)) works" >&5 +! $as_echo_n "checking whether gcc __attribute__ ((noreturn)) works... " >&6; } +! if ${gmp_cv_c_attribute_noreturn+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + void foo (int x) __attribute__ ((noreturn)); + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + gmp_cv_c_attribute_noreturn=yes +! else +! gmp_cv_c_attribute_noreturn=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_noreturn" >&5 +! $as_echo "$gmp_cv_c_attribute_noreturn" >&6; } + if test $gmp_cv_c_attribute_noreturn = yes; then + +! $as_echo "#define HAVE_ATTRIBUTE_NORETURN 1" >>confdefs.h + + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc hidden aliases work" >&5 +! $as_echo_n "checking whether gcc hidden aliases work... " >&6; } +! if ${gmp_cv_c_hidden_alias+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + void hid() __attribute__ ((visibility("hidden"))); + void hid() {} + void pub() __attribute__ ((alias("hid"))); + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + gmp_cv_c_hidden_alias=yes +! else +! gmp_cv_c_hidden_alias=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_hidden_alias" >&5 +! $as_echo "$gmp_cv_c_hidden_alias" >&6; } + if test $gmp_cv_c_hidden_alias = yes; then + +! $as_echo "#define HAVE_HIDDEN_ALIAS 1" >>confdefs.h + + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +! $as_echo_n "checking for inline... " >&6; } +! if ${ac_cv_c_inline+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifndef __cplusplus + typedef int foo_t; +! static $ac_kw foo_t static_foo () {return 0; } +! $ac_kw foo_t foo () {return 0; } + #endif + + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break + done +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +! $as_echo "$ac_cv_c_inline" >&6; } + + case $ac_cv_c_inline in + inline | yes) ;; +--- 26749,26905 ---- + fi + cat conftest.out >&5 + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_malloc" >&5 +! printf "%s\n" "$gmp_cv_c_attribute_malloc" >&6; } + if test $gmp_cv_c_attribute_malloc = yes; then + +! printf "%s\n" "#define HAVE_ATTRIBUTE_MALLOC 1" >>confdefs.h + + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((mode (XX))) works" >&5 +! printf %s "checking whether gcc __attribute__ ((mode (XX))) works... " >&6; } +! if test ${gmp_cv_c_attribute_mode+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + typedef int SItype __attribute__ ((mode (SI))); + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + gmp_cv_c_attribute_mode=yes +! else case e in #( +! e) gmp_cv_c_attribute_mode=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_mode" >&5 +! printf "%s\n" "$gmp_cv_c_attribute_mode" >&6; } + if test $gmp_cv_c_attribute_mode = yes; then + +! printf "%s\n" "#define HAVE_ATTRIBUTE_MODE 1" >>confdefs.h + + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc __attribute__ ((noreturn)) works" >&5 +! printf %s "checking whether gcc __attribute__ ((noreturn)) works... " >&6; } +! if test ${gmp_cv_c_attribute_noreturn+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + void foo (int x) __attribute__ ((noreturn)); + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + gmp_cv_c_attribute_noreturn=yes +! else case e in #( +! e) gmp_cv_c_attribute_noreturn=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_attribute_noreturn" >&5 +! printf "%s\n" "$gmp_cv_c_attribute_noreturn" >&6; } + if test $gmp_cv_c_attribute_noreturn = yes; then + +! printf "%s\n" "#define HAVE_ATTRIBUTE_NORETURN 1" >>confdefs.h + + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gcc hidden aliases work" >&5 +! printf %s "checking whether gcc hidden aliases work... " >&6; } +! if test ${gmp_cv_c_hidden_alias+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + void hid() __attribute__ ((visibility("hidden"))); + void hid() {} + void pub() __attribute__ ((alias("hid"))); + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + gmp_cv_c_hidden_alias=yes +! else case e in #( +! e) gmp_cv_c_hidden_alias=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_hidden_alias" >&5 +! printf "%s\n" "$gmp_cv_c_hidden_alias" >&6; } + if test $gmp_cv_c_hidden_alias = yes; then + +! printf "%s\n" "#define HAVE_HIDDEN_ALIAS 1" >>confdefs.h + + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +! printf %s "checking for inline... " >&6; } +! if test ${ac_cv_c_inline+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifndef __cplusplus + typedef int foo_t; +! static $ac_kw foo_t static_foo (void) {return 0; } +! $ac_kw foo_t foo (void) {return 0; } + #endif + + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_c_inline=$ac_kw + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + test "$ac_cv_c_inline" != no && break + done +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +! printf "%s\n" "$ac_cv_c_inline" >&6; } + + case $ac_cv_c_inline in + inline | yes) ;; +*************** +*** 23836,23859 **** + #endif + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + +! else +! case $ac_cv_c_inline in + yes) tmp_inline=inline ;; + *) tmp_inline=$ac_cv_c_inline ;; + esac +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gmp.h doesnt recognise compiler \"$tmp_inline\", inlines will be unavailable" >&5 +! $as_echo "$as_me: WARNING: gmp.h doesnt recognise compiler \"$tmp_inline\", inlines will be unavailable" >&2;} + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + esac + +--- 26934,26959 ---- + #endif + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + +! else case e in #( +! e) case $ac_cv_c_inline in + yes) tmp_inline=inline ;; + *) tmp_inline=$ac_cv_c_inline ;; + esac +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: gmp.h doesnt recognise compiler \"$tmp_inline\", inlines will be unavailable" >&5 +! printf "%s\n" "$as_me: WARNING: gmp.h doesnt recognise compiler \"$tmp_inline\", inlines will be unavailable" >&2;} ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; + esac + +*************** +*** 23861,23989 **** + # from libtool + LIBM= + case $host in +! *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 +! $as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; } +! if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lmw $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char _mwvalidcheckl (); + int +! main () + { + return _mwvalidcheckl (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mw__mwvalidcheckl=yes +! else +! ac_cv_lib_mw__mwvalidcheckl=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 +! $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } +! if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then : + LIBM=-lmw + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +! $as_echo_n "checking for cos in -lm... " >&6; } +! if ${ac_cv_lib_m_cos+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char cos (); + int +! main () + { + return cos (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cos=yes +! else +! ac_cv_lib_m_cos=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 +! $as_echo "$ac_cv_lib_m_cos" >&6; } +! if test "x$ac_cv_lib_m_cos" = xyes; then : + LIBM="$LIBM -lm" + fi + + ;; + *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +! $as_echo_n "checking for cos in -lm... " >&6; } +! if ${ac_cv_lib_m_cos+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char cos (); + int +! main () + { + return cos (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cos=yes +! else +! ac_cv_lib_m_cos=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 +! $as_echo "$ac_cv_lib_m_cos" >&6; } +! if test "x$ac_cv_lib_m_cos" = xyes; then : + LIBM=-lm + fi + +--- 26961,27113 ---- + # from libtool + LIBM= + case $host in +! *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 +! printf %s "checking for _mwvalidcheckl in -lmw... " >&6; } +! if test ${ac_cv_lib_mw__mwvalidcheckl+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lmw $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char _mwvalidcheckl (void); + int +! main (void) + { + return _mwvalidcheckl (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_mw__mwvalidcheckl=yes +! else case e in #( +! e) ac_cv_lib_mw__mwvalidcheckl=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 +! printf "%s\n" "$ac_cv_lib_mw__mwvalidcheckl" >&6; } +! if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes +! then : + LIBM=-lmw + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +! printf %s "checking for cos in -lm... " >&6; } +! if test ${ac_cv_lib_m_cos+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char cos (void); + int +! main (void) + { + return cos (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_m_cos=yes +! else case e in #( +! e) ac_cv_lib_m_cos=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 +! printf "%s\n" "$ac_cv_lib_m_cos" >&6; } +! if test "x$ac_cv_lib_m_cos" = xyes +! then : + LIBM="$LIBM -lm" + fi + + ;; + *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +! printf %s "checking for cos in -lm... " >&6; } +! if test ${ac_cv_lib_m_cos+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char cos (void); + int +! main (void) + { + return cos (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_m_cos=yes +! else case e in #( +! e) ac_cv_lib_m_cos=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 +! printf "%s\n" "$ac_cv_lib_m_cos" >&6; } +! if test "x$ac_cv_lib_m_cos" = xyes +! then : + LIBM=-lm + fi + +*************** +*** 23995,24039 **** + + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +! $as_echo_n "checking for working alloca.h... " >&6; } +! if ${gmp_cv_header_alloca+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +! main () + { + char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + gmp_cv_header_alloca=yes +! else +! gmp_cv_header_alloca=no + fi +! rm -f core conftest.err conftest.$ac_objext \ +! conftest$ac_exeext conftest.$ac_ext + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_header_alloca" >&5 +! $as_echo "$gmp_cv_header_alloca" >&6; } + if test $gmp_cv_header_alloca = yes; then + +! $as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h + + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca (via gmp-impl.h)" >&5 +! $as_echo_n "checking for alloca (via gmp-impl.h)... " >&6; } +! if ${gmp_cv_func_alloca+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS +--- 27119,27168 ---- + + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 +! printf %s "checking for working alloca.h... " >&6; } +! if test ${gmp_cv_header_alloca+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +! main (void) + { + char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + gmp_cv_header_alloca=yes +! else case e in #( +! e) gmp_cv_header_alloca=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ +! conftest$ac_exeext conftest.$ac_ext ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_header_alloca" >&5 +! printf "%s\n" "$gmp_cv_header_alloca" >&6; } + if test $gmp_cv_header_alloca = yes; then + +! printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h + + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca (via gmp-impl.h)" >&5 +! printf %s "checking for alloca (via gmp-impl.h)... " >&6; } +! if test ${gmp_cv_func_alloca+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS +*************** +*** 24044,24079 **** + #include "$srcdir/gmp-impl.h" + + int +! main () + { + char *p = (char *) alloca (1); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + gmp_cv_func_alloca=yes +! else +! gmp_cv_func_alloca=no + fi +! rm -f core conftest.err conftest.$ac_objext \ +! conftest$ac_exeext conftest.$ac_ext + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_func_alloca" >&5 +! $as_echo "$gmp_cv_func_alloca" >&6; } + if test $gmp_cv_func_alloca = yes; then + +! $as_echo "#define HAVE_ALLOCA 1" >>confdefs.h + + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to allocate temporary memory" >&5 +! $as_echo_n "checking how to allocate temporary memory... " >&6; } +! if ${gmp_cv_option_alloca+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $enable_alloca in + yes) + gmp_cv_option_alloca=alloca + ;; +--- 27173,27212 ---- + #include "$srcdir/gmp-impl.h" + + int +! main (void) + { + char *p = (char *) alloca (1); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + gmp_cv_func_alloca=yes +! else case e in #( +! e) gmp_cv_func_alloca=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ +! conftest$ac_exeext conftest.$ac_ext ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_func_alloca" >&5 +! printf "%s\n" "$gmp_cv_func_alloca" >&6; } + if test $gmp_cv_func_alloca = yes; then + +! printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h + + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to allocate temporary memory" >&5 +! printf %s "checking how to allocate temporary memory... " >&6; } +! if test ${gmp_cv_option_alloca+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $enable_alloca in + yes) + gmp_cv_option_alloca=alloca + ;; +*************** +*** 24090,24099 **** + gmp_cv_option_alloca=$enable_alloca + ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_option_alloca" >&5 +! $as_echo "$gmp_cv_option_alloca" >&6; } + + + +--- 27223,27233 ---- + gmp_cv_option_alloca=$enable_alloca + ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_option_alloca" >&5 +! printf "%s\n" "$gmp_cv_option_alloca" >&6; } + + + +*************** +*** 24102,24123 **** + if test $gmp_cv_func_alloca = no; then + as_fn_error $? "--enable-alloca=alloca specified, but alloca not available" "$LINENO" 5 + fi +! $as_echo "#define WANT_TMP_ALLOCA 1" >>confdefs.h + + TAL_OBJECT=tal-reent$U.lo + ;; + malloc-reentrant) +! $as_echo "#define WANT_TMP_REENTRANT 1" >>confdefs.h + + TAL_OBJECT=tal-reent$U.lo + ;; + malloc-notreentrant) +! $as_echo "#define WANT_TMP_NOTREENTRANT 1" >>confdefs.h + + TAL_OBJECT=tal-notreent$U.lo + ;; + debug) +! $as_echo "#define WANT_TMP_DEBUG 1" >>confdefs.h + + TAL_OBJECT=tal-debug$U.lo + ;; +--- 27236,27257 ---- + if test $gmp_cv_func_alloca = no; then + as_fn_error $? "--enable-alloca=alloca specified, but alloca not available" "$LINENO" 5 + fi +! printf "%s\n" "#define WANT_TMP_ALLOCA 1" >>confdefs.h + + TAL_OBJECT=tal-reent$U.lo + ;; + malloc-reentrant) +! printf "%s\n" "#define WANT_TMP_REENTRANT 1" >>confdefs.h + + TAL_OBJECT=tal-reent$U.lo + ;; + malloc-notreentrant) +! printf "%s\n" "#define WANT_TMP_NOTREENTRANT 1" >>confdefs.h + + TAL_OBJECT=tal-notreent$U.lo + ;; + debug) +! printf "%s\n" "#define WANT_TMP_DEBUG 1" >>confdefs.h + + TAL_OBJECT=tal-debug$U.lo + ;; +*************** +*** 24143,24170 **** + #endif + + int +! main () + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gmp.h doesnt recognise , FILE prototypes will be unavailable" >&5 +! $as_echo "$as_me: WARNING: gmp.h doesnt recognise , FILE prototypes will be unavailable" >&2;} + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +! $as_echo_n "checking whether byte ordering is bigendian... " >&6; } +! if ${ac_cv_c_bigendian+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +--- 27277,27307 ---- + #endif + + int +! main (void) + { + + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: gmp.h doesnt recognise , FILE prototypes will be unavailable" >&5 +! printf "%s\n" "$as_me: WARNING: gmp.h doesnt recognise , FILE prototypes will be unavailable" >&2;} ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +! printf %s "checking whether byte ordering is bigendian... " >&6; } +! if test ${ac_cv_c_bigendian+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +*************** +*** 24174,24180 **** + typedef int dummy; + + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. +--- 27311,27318 ---- + typedef int dummy; + + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. +*************** +*** 24198,24204 **** + fi + done + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +--- 27336,27342 ---- + fi + done + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +*************** +*** 24207,24216 **** + #include + + int +! main () + { +! #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ +! && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif +--- 27345,27354 ---- + #include + + int +! main (void) + { +! #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\ +! && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\ + && LITTLE_ENDIAN) + bogus endian macros + #endif +*************** +*** 24219,24225 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +--- 27357,27364 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +*************** +*** 24227,24233 **** + #include + + int +! main () + { + #if BYTE_ORDER != BIG_ENDIAN + not big endian +--- 27366,27372 ---- + #include + + int +! main (void) + { + #if BYTE_ORDER != BIG_ENDIAN + not big endian +*************** +*** 24237,24250 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +! else +! ac_cv_c_bigendian=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). +--- 27376,27391 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_c_bigendian=yes +! else case e in #( +! e) ac_cv_c_bigendian=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). +*************** +*** 24253,24259 **** + #include + + int +! main () + { + #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros +--- 27394,27400 ---- + #include + + int +! main (void) + { + #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros +*************** +*** 24263,24276 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + int +! main () + { + #ifndef _BIG_ENDIAN + not big endian +--- 27404,27418 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + int +! main (void) + { + #ifndef _BIG_ENDIAN + not big endian +*************** +*** 24280,24329 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +! else +! ac_cv_c_bigendian=no + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. +! if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +! short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } +! short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +! short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } +! extern int foo; +! +! int +! main () +! { +! return use_ascii (foo) == use_ebcdic (foo); +! ; +! return 0; +! } + _ACEOF +! if ac_fn_c_try_compile "$LINENO"; then : +! if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi +! if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else +--- 27422,27476 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_c_bigendian=yes +! else case e in #( +! e) ac_cv_c_bigendian=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. +! if test "$cross_compiling" = yes +! then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +! unsigned short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +! unsigned short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } +! unsigned short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +! unsigned short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } +! int +! main (int argc, char **argv) +! { +! /* Intimidate the compiler so that it does not +! optimize the arrays away. */ +! char *p = argv[0]; +! ascii_mm[1] = *p++; ebcdic_mm[1] = *p++; +! ascii_ii[1] = *p++; ebcdic_ii[1] = *p++; +! return use_ascii (argc) == use_ebcdic (*p); +! } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : +! if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then + ac_cv_c_bigendian=yes + fi +! if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else +*************** +*** 24332,24344 **** + fi + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + int +! main () + { + + /* Are we little or big endian? From Harbison&Steele. */ +--- 27479,27492 ---- + fi + fi + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ +! conftest$ac_exeext conftest.$ac_ext +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + int +! main (void) + { + + /* Are we little or big endian? From Harbison&Steele. */ +*************** +*** 24354,24381 **** + return 0; + } + _ACEOF +! if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +! else +! ac_cv_c_bigendian=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +! conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +! fi + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +! $as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) +! $as_echo "#define HAVE_LIMB_BIG_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_LIMB_BIG_ENDIAN')" >> $gmp_tmpconfigm4p + ;; #( + no) +! $as_echo "#define HAVE_LIMB_LITTLE_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_LIMB_LITTLE_ENDIAN')" >> $gmp_tmpconfigm4p +--- 27502,27533 ---- + return 0; + } + _ACEOF +! if ac_fn_c_try_run "$LINENO" +! then : + ac_cv_c_bigendian=no +! else case e in #( +! e) ac_cv_c_bigendian=yes ;; +! esac + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +! conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + +! fi ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +! printf "%s\n" "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) +! printf "%s\n" "#define HAVE_LIMB_BIG_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_LIMB_BIG_ENDIAN')" >> $gmp_tmpconfigm4p + ;; #( + no) +! printf "%s\n" "#define HAVE_LIMB_LITTLE_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_LIMB_LITTLE_ENDIAN')" >> $gmp_tmpconfigm4p +*************** +*** 24383,24389 **** + ;; #( + universal) + +! $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) +--- 27535,27541 ---- + ;; #( + universal) + +! printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) +*************** +*** 24394,24405 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking format of \`double' floating point" >&5 +! $as_echo_n "checking format of \`double' floating point... " >&6; } +! if ${gmp_cv_c_double_format+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_c_double_format=unknown + cat >conftest.c <<\EOF + #include + struct foo { +--- 27546,27558 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking format of \`double' floating point" >&5 +! printf %s "checking format of \`double' floating point... " >&6; } +! if test ${gmp_cv_c_double_format+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_c_double_format=unknown + cat >conftest.c <<\EOF + #include + struct foo { +*************** +*** 24425,24431 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat >conftest.awk <<\EOF + +--- 27578,27584 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat >conftest.awk <<\EOF + +*************** +*** 24586,24640 **** + ;; + esac + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: oops, cannot compile test program" >&5 +! $as_echo "$as_me: WARNING: oops, cannot compile test program" >&2;} + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_double_format" >&5 +! $as_echo "$gmp_cv_c_double_format" >&6; } + + + + case $gmp_cv_c_double_format in + "IEEE big endian") +! $as_echo "#define HAVE_DOUBLE_IEEE_BIG_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_DOUBLE_IEEE_BIG_ENDIAN')" >> $gmp_tmpconfigm4p + + ;; + "IEEE little endian") +! $as_echo "#define HAVE_DOUBLE_IEEE_LITTLE_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_DOUBLE_IEEE_LITTLE_ENDIAN')" >> $gmp_tmpconfigm4p + + ;; + "IEEE little endian, swapped halves") +! $as_echo "#define HAVE_DOUBLE_IEEE_LITTLE_SWAPPED 1" >>confdefs.h + ;; + "VAX D") +! $as_echo "#define HAVE_DOUBLE_VAX_D 1" >>confdefs.h + ;; + "VAX G") +! $as_echo "#define HAVE_DOUBLE_VAX_G 1" >>confdefs.h + ;; + "Cray CFP") +! $as_echo "#define HAVE_DOUBLE_CRAY_CFP 1" >>confdefs.h + ;; + "bad ARM software floats") + ;; + unknown*) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine float format." >&5 +! $as_echo "$as_me: WARNING: Could not determine float format." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Conversions to and from \"double\" may be slow." >&5 +! $as_echo "$as_me: WARNING: Conversions to and from \"double\" may be slow." >&2;} + ;; + *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: oops, unrecognised float format: $gmp_cv_c_double_format" >&5 +! $as_echo "$as_me: WARNING: oops, unrecognised float format: $gmp_cv_c_double_format" >&2;} + ;; + esac + +--- 27739,27794 ---- + ;; + esac + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: oops, cannot compile test program" >&5 +! printf "%s\n" "$as_me: WARNING: oops, cannot compile test program" >&2;} + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_c_double_format" >&5 +! printf "%s\n" "$gmp_cv_c_double_format" >&6; } + + + + case $gmp_cv_c_double_format in + "IEEE big endian") +! printf "%s\n" "#define HAVE_DOUBLE_IEEE_BIG_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_DOUBLE_IEEE_BIG_ENDIAN')" >> $gmp_tmpconfigm4p + + ;; + "IEEE little endian") +! printf "%s\n" "#define HAVE_DOUBLE_IEEE_LITTLE_ENDIAN 1" >>confdefs.h + + + echo "define_not_for_expansion(\`HAVE_DOUBLE_IEEE_LITTLE_ENDIAN')" >> $gmp_tmpconfigm4p + + ;; + "IEEE little endian, swapped halves") +! printf "%s\n" "#define HAVE_DOUBLE_IEEE_LITTLE_SWAPPED 1" >>confdefs.h + ;; + "VAX D") +! printf "%s\n" "#define HAVE_DOUBLE_VAX_D 1" >>confdefs.h + ;; + "VAX G") +! printf "%s\n" "#define HAVE_DOUBLE_VAX_G 1" >>confdefs.h + ;; + "Cray CFP") +! printf "%s\n" "#define HAVE_DOUBLE_CRAY_CFP 1" >>confdefs.h + ;; + "bad ARM software floats") + ;; + unknown*) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine float format." >&5 +! printf "%s\n" "$as_me: WARNING: Could not determine float format." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Conversions to and from \"double\" may be slow." >&5 +! printf "%s\n" "$as_me: WARNING: Conversions to and from \"double\" may be slow." >&2;} + ;; + *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: oops, unrecognised float format: $gmp_cv_c_double_format" >&5 +! printf "%s\n" "$as_me: WARNING: oops, unrecognised float format: $gmp_cv_c_double_format" >&2;} + ;; + esac + +*************** +*** 24669,24685 **** + # __gmp_replacement_vsnprintf which is not required on AIX since it has a + # vsnprintf. + # +! for ac_func in alarm attr_get clock cputime getpagesize getrusage gettimeofday getsysinfo localeconv memset mmap mprotect nl_langinfo obstack_vprintf popen processor_info pstat_getprocessor raise read_real_time sigaction sigaltstack sigstack syssgi strchr strerror strnlen strtol strtoul sysconf sysctl sysctlbyname times +! do : +! as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +! ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +! if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +! cat >>confdefs.h <<_ACEOF +! #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +! _ACEOF + + fi +- done + + + # clock_gettime is in librt on *-*-osf5.1 and on glibc, so att -lrt to +--- 27823,28014 ---- + # __gmp_replacement_vsnprintf which is not required on AIX since it has a + # vsnprintf. + # +! ac_fn_c_check_func "$LINENO" "alarm" "ac_cv_func_alarm" +! if test "x$ac_cv_func_alarm" = xyes +! then : +! printf "%s\n" "#define HAVE_ALARM 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "attr_get" "ac_cv_func_attr_get" +! if test "x$ac_cv_func_attr_get" = xyes +! then : +! printf "%s\n" "#define HAVE_ATTR_GET 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "clock" "ac_cv_func_clock" +! if test "x$ac_cv_func_clock" = xyes +! then : +! printf "%s\n" "#define HAVE_CLOCK 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "cputime" "ac_cv_func_cputime" +! if test "x$ac_cv_func_cputime" = xyes +! then : +! printf "%s\n" "#define HAVE_CPUTIME 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +! if test "x$ac_cv_func_getpagesize" = xyes +! then : +! printf "%s\n" "#define HAVE_GETPAGESIZE 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage" +! if test "x$ac_cv_func_getrusage" = xyes +! then : +! printf "%s\n" "#define HAVE_GETRUSAGE 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +! if test "x$ac_cv_func_gettimeofday" = xyes +! then : +! printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "getsysinfo" "ac_cv_func_getsysinfo" +! if test "x$ac_cv_func_getsysinfo" = xyes +! then : +! printf "%s\n" "#define HAVE_GETSYSINFO 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "localeconv" "ac_cv_func_localeconv" +! if test "x$ac_cv_func_localeconv" = xyes +! then : +! printf "%s\n" "#define HAVE_LOCALECONV 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset" +! if test "x$ac_cv_func_memset" = xyes +! then : +! printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +! if test "x$ac_cv_func_mmap" = xyes +! then : +! printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect" +! if test "x$ac_cv_func_mprotect" = xyes +! then : +! printf "%s\n" "#define HAVE_MPROTECT 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" +! if test "x$ac_cv_func_nl_langinfo" = xyes +! then : +! printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "popen" "ac_cv_func_popen" +! if test "x$ac_cv_func_popen" = xyes +! then : +! printf "%s\n" "#define HAVE_POPEN 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "processor_info" "ac_cv_func_processor_info" +! if test "x$ac_cv_func_processor_info" = xyes +! then : +! printf "%s\n" "#define HAVE_PROCESSOR_INFO 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "pstat_getprocessor" "ac_cv_func_pstat_getprocessor" +! if test "x$ac_cv_func_pstat_getprocessor" = xyes +! then : +! printf "%s\n" "#define HAVE_PSTAT_GETPROCESSOR 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise" +! if test "x$ac_cv_func_raise" = xyes +! then : +! printf "%s\n" "#define HAVE_RAISE 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "read_real_time" "ac_cv_func_read_real_time" +! if test "x$ac_cv_func_read_real_time" = xyes +! then : +! printf "%s\n" "#define HAVE_READ_REAL_TIME 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +! if test "x$ac_cv_func_sigaction" = xyes +! then : +! printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack" +! if test "x$ac_cv_func_sigaltstack" = xyes +! then : +! printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "sigstack" "ac_cv_func_sigstack" +! if test "x$ac_cv_func_sigstack" = xyes +! then : +! printf "%s\n" "#define HAVE_SIGSTACK 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "syssgi" "ac_cv_func_syssgi" +! if test "x$ac_cv_func_syssgi" = xyes +! then : +! printf "%s\n" "#define HAVE_SYSSGI 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr" +! if test "x$ac_cv_func_strchr" = xyes +! then : +! printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +! if test "x$ac_cv_func_strerror" = xyes +! then : +! printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" +! if test "x$ac_cv_func_strnlen" = xyes +! then : +! printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" +! if test "x$ac_cv_func_strtol" = xyes +! then : +! printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" +! if test "x$ac_cv_func_strtoul" = xyes +! then : +! printf "%s\n" "#define HAVE_STRTOUL 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf" +! if test "x$ac_cv_func_sysconf" = xyes +! then : +! printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "sysctl" "ac_cv_func_sysctl" +! if test "x$ac_cv_func_sysctl" = xyes +! then : +! printf "%s\n" "#define HAVE_SYSCTL 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname" +! if test "x$ac_cv_func_sysctlbyname" = xyes +! then : +! printf "%s\n" "#define HAVE_SYSCTLBYNAME 1" >>confdefs.h +! +! fi +! ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times" +! if test "x$ac_cv_func_times" = xyes +! then : +! printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h + + fi + + + # clock_gettime is in librt on *-*-osf5.1 and on glibc, so att -lrt to +*************** +*** 24688,24749 **** + # clock_getres said only 1 millisecond. + + old_LIBS="$LIBS" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +! $as_echo_n "checking for library containing clock_gettime... " >&6; } +! if ${ac_cv_search_clock_gettime+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char clock_gettime (); + int +! main () + { + return clock_gettime (); + ; + return 0; + } + _ACEOF +! for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext +! if ${ac_cv_search_clock_gettime+:} false; then : + break + fi + done +! if ${ac_cv_search_clock_gettime+:} false; then : + +! else +! ac_cv_search_clock_gettime=no + fi + rm conftest.$ac_ext +! LIBS=$ac_func_search_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +! $as_echo "$ac_cv_search_clock_gettime" >&6; } + ac_res=$ac_cv_search_clock_gettime +! if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + +! $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + fi + +--- 28017,28089 ---- + # clock_getres said only 1 millisecond. + + old_LIBS="$LIBS" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +! printf %s "checking for library containing clock_gettime... " >&6; } +! if test ${ac_cv_search_clock_gettime+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char clock_gettime (void); + int +! main (void) + { + return clock_gettime (); + ; + return 0; + } + _ACEOF +! for ac_lib in '' rt +! do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_search_clock_gettime=$ac_res + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext +! if test ${ac_cv_search_clock_gettime+y} +! then : + break + fi + done +! if test ${ac_cv_search_clock_gettime+y} +! then : + +! else case e in #( +! e) ac_cv_search_clock_gettime=no ;; +! esac + fi + rm conftest.$ac_ext +! LIBS=$ac_func_search_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +! printf "%s\n" "$ac_cv_search_clock_gettime" >&6; } + ac_res=$ac_cv_search_clock_gettime +! if test "$ac_res" != no +! then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + +! printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + fi + +*************** +*** 24753,24778 **** + + + ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +! if test "x$ac_cv_func_vsnprintf" = xyes; then : + gmp_vsnprintf_exists=yes +! else +! gmp_vsnprintf_exists=no + fi + + if test "$gmp_vsnprintf_exists" = no; then + gmp_cv_func_vsnprintf=no + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf works" >&5 +! $as_echo_n "checking whether vsnprintf works... " >&6; } +! if ${gmp_cv_func_vsnprintf+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_func_vsnprintf=yes + for i in 'return check ("hello world");' 'int n; return check ("%nhello world", &n);'; do +! if test "$cross_compiling" = yes; then : + gmp_cv_func_vsnprintf=probably; break +! else +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include /* for strcmp */ +--- 28093,28122 ---- + + + ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +! if test "x$ac_cv_func_vsnprintf" = xyes +! then : + gmp_vsnprintf_exists=yes +! else case e in #( +! e) gmp_vsnprintf_exists=no ;; +! esac + fi + + if test "$gmp_vsnprintf_exists" = no; then + gmp_cv_func_vsnprintf=no + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf works" >&5 +! printf %s "checking whether vsnprintf works... " >&6; } +! if test ${gmp_cv_func_vsnprintf+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_func_vsnprintf=yes + for i in 'return check ("hello world");' 'int n; return check ("%nhello world", &n);'; do +! if test "$cross_compiling" = yes +! then : + gmp_cv_func_vsnprintf=probably; break +! else case e in #( +! e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include /* for strcmp */ +*************** +*** 24808,24855 **** + } + + _ACEOF +! if ac_fn_c_try_run "$LINENO"; then : + : +! else +! gmp_cv_func_vsnprintf=no; break + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +! conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + + done +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_func_vsnprintf" >&5 +! $as_echo "$gmp_cv_func_vsnprintf" >&6; } + if test "$gmp_cv_func_vsnprintf" = probably; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check for properly working vsnprintf when cross compiling, will assume it's ok" >&5 +! $as_echo "$as_me: WARNING: cannot check for properly working vsnprintf when cross compiling, will assume it's ok" >&2;} + fi + if test "$gmp_cv_func_vsnprintf" != no; then + +! $as_echo "#define HAVE_VSNPRINTF 1" >>confdefs.h + + fi + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sscanf needs writable input" >&5 +! $as_echo_n "checking whether sscanf needs writable input... " >&6; } +! if ${gmp_cv_func_sscanf_writable_input+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $host in + *-*-hpux9 | *-*-hpux9.*) + gmp_cv_func_sscanf_writable_input=yes ;; + *) gmp_cv_func_sscanf_writable_input=no ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_func_sscanf_writable_input" >&5 +! $as_echo "$gmp_cv_func_sscanf_writable_input" >&6; } + case $gmp_cv_func_sscanf_writable_input in + yes) +! $as_echo "#define SSCANF_WRITABLE_INPUT 1" >>confdefs.h + ;; + no) ;; + *) as_fn_error $? "unrecognised \$gmp_cv_func_sscanf_writable_input" "$LINENO" 5 ;; +--- 28152,28205 ---- + } + + _ACEOF +! if ac_fn_c_try_run "$LINENO" +! then : + : +! else case e in #( +! e) gmp_cv_func_vsnprintf=no; break ;; +! esac + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +! conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +! esac + fi + + done +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_func_vsnprintf" >&5 +! printf "%s\n" "$gmp_cv_func_vsnprintf" >&6; } + if test "$gmp_cv_func_vsnprintf" = probably; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot check for properly working vsnprintf when cross compiling, will assume it's ok" >&5 +! printf "%s\n" "$as_me: WARNING: cannot check for properly working vsnprintf when cross compiling, will assume it's ok" >&2;} + fi + if test "$gmp_cv_func_vsnprintf" != no; then + +! printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h + + fi + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sscanf needs writable input" >&5 +! printf %s "checking whether sscanf needs writable input... " >&6; } +! if test ${gmp_cv_func_sscanf_writable_input+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $host in + *-*-hpux9 | *-*-hpux9.*) + gmp_cv_func_sscanf_writable_input=yes ;; + *) gmp_cv_func_sscanf_writable_input=no ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_func_sscanf_writable_input" >&5 +! printf "%s\n" "$gmp_cv_func_sscanf_writable_input" >&6; } + case $gmp_cv_func_sscanf_writable_input in + yes) +! printf "%s\n" "#define SSCANF_WRITABLE_INPUT 1" >>confdefs.h + ;; + no) ;; + *) as_fn_error $? "unrecognised \$gmp_cv_func_sscanf_writable_input" "$LINENO" 5 ;; +*************** +*** 24861,24869 **** + # + ac_fn_c_check_member "$LINENO" "struct pst_processor" "psp_iticksperclktick" "ac_cv_member_struct_pst_processor_psp_iticksperclktick" "#include + " +! if test "x$ac_cv_member_struct_pst_processor_psp_iticksperclktick" = xyes; then : + +! $as_echo "#define HAVE_PSP_ITICKSPERCLKTICK 1" >>confdefs.h + + fi + +--- 28211,28220 ---- + # + ac_fn_c_check_member "$LINENO" "struct pst_processor" "psp_iticksperclktick" "ac_cv_member_struct_pst_processor_psp_iticksperclktick" "#include + " +! if test "x$ac_cv_member_struct_pst_processor_psp_iticksperclktick" = xyes +! then : + +! printf "%s\n" "#define HAVE_PSP_ITICKSPERCLKTICK 1" >>confdefs.h + + fi + +*************** +*** 24882,24907 **** + # - not in g++ 2.95.2 + # std::locale - not in g++ 2.95.4 + # +! +! for ac_header in sstream +! do : +! ac_fn_cxx_check_header_mongrel "$LINENO" "sstream" "ac_cv_header_sstream" "$ac_includes_default" +! if test "x$ac_cv_header_sstream" = xyes; then : +! cat >>confdefs.h <<_ACEOF +! #define HAVE_SSTREAM 1 +! _ACEOF + + fi + +- done +- + ac_fn_cxx_check_type "$LINENO" "std::locale" "ac_cv_type_std__locale" "#include + " +! if test "x$ac_cv_type_std__locale" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_STD__LOCALE 1 +! _ACEOF + + + fi +--- 28233,28251 ---- + # - not in g++ 2.95.2 + # std::locale - not in g++ 2.95.4 + # +! ac_fn_cxx_check_header_compile "$LINENO" "sstream" "ac_cv_header_sstream" "$ac_includes_default" +! if test "x$ac_cv_header_sstream" = xyes +! then : +! printf "%s\n" "#define HAVE_SSTREAM 1" >>confdefs.h + + fi + + ac_fn_cxx_check_type "$LINENO" "std::locale" "ac_cv_type_std__locale" "#include + " +! if test "x$ac_cv_type_std__locale" = xyes +! then : + +! printf "%s\n" "#define HAVE_STD__LOCALE 1" >>confdefs.h + + + fi +*************** +*** 25047,25053 **** + echo " Generated by configure - DO NOT EDIT. */" >>fat.h + + +! $as_echo "#define WANT_FAT_BINARY 1" >>confdefs.h + + + echo 'define(, )' >>$gmp_tmpconfigm4 +--- 28391,28397 ---- + echo " Generated by configure - DO NOT EDIT. */" >>fat.h + + +! printf "%s\n" "#define WANT_FAT_BINARY 1" >>confdefs.h + + + echo 'define(, )' >>$gmp_tmpconfigm4 +*************** +*** 25100,25108 **** + #endif + DECL_$tmp_fbase (__MPN(${tmp_fbase}_init));" >>fat.h + # encourage various macros to use fat functions +! cat >>confdefs.h <<_ACEOF +! #define HAVE_NATIVE_mpn_$tmp_fbase 1 +! _ACEOF + + done + +--- 28444,28450 ---- + #endif + DECL_$tmp_fbase (__MPN(${tmp_fbase}_init));" >>fat.h + # encourage various macros to use fat functions +! printf "%s\n" "#define HAVE_NATIVE_mpn_$tmp_fbase 1" >>confdefs.h + + done + +*************** +*** 25560,25568 **** + sed -n 's/^[ ]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file + ` + for gmp_tmp in $gmp_ep; do +! cat >>confdefs.h <<_ACEOF +! #define HAVE_NATIVE_$gmp_tmp 1 +! _ACEOF + + eval HAVE_NATIVE_$gmp_tmp=yes + done +--- 28902,28908 ---- + sed -n 's/^[ ]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file + ` + for gmp_tmp in $gmp_ep; do +! printf "%s\n" "#define HAVE_NATIVE_$gmp_tmp 1" >>confdefs.h + + eval HAVE_NATIVE_$gmp_tmp=yes + done +*************** +*** 25603,25614 **** + # Don't demand an m4 unless it's actually needed. + if test $found_asm = yes; then + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suitable m4" >&5 +! $as_echo_n "checking for suitable m4... " >&6; } +! if ${gmp_cv_prog_m4+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$M4"; then + gmp_cv_prog_m4="$M4" + else + cat >conftest.m4 <<\EOF +--- 28943,28955 ---- + # Don't demand an m4 unless it's actually needed. + if test $found_asm = yes; then + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suitable m4" >&5 +! printf %s "checking for suitable m4... " >&6; } +! if test ${gmp_cv_prog_m4+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$M4"; then + gmp_cv_prog_m4="$M4" + else + cat >conftest.m4 <<\EOF +*************** +*** 25645,25664 **** + fi + fi + rm -f conftest.m4 + fi +! fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_prog_m4" >&5 +! $as_echo "$gmp_cv_prog_m4" >&6; } + M4="$gmp_cv_prog_m4" + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if m4wrap produces spurious output" >&5 +! $as_echo_n "checking if m4wrap produces spurious output... " >&6; } +! if ${gmp_cv_m4_m4wrap_spurious+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # hide the d-n-l from autoconf's error checking + tmp_d_n_l=d""nl + cat >conftest.m4 <&5 +! printf "%s\n" "$gmp_cv_prog_m4" >&6; } + M4="$gmp_cv_prog_m4" + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if m4wrap produces spurious output" >&5 +! printf %s "checking if m4wrap produces spurious output... " >&6; } +! if test ${gmp_cv_m4_m4wrap_spurious+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # hide the d-n-l from autoconf's error checking + tmp_d_n_l=d""nl + cat >conftest.m4 <&5 +! $as_echo "$gmp_cv_m4_m4wrap_spurious" >&6; } + + echo "define(,<$gmp_cv_m4_m4wrap_spurious>)" >> $gmp_tmpconfigm4 + +--- 29016,29026 ---- + else + gmp_cv_m4_m4wrap_spurious=yes + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_m4_m4wrap_spurious" >&5 +! printf "%s\n" "$gmp_cv_m4_m4wrap_spurious" >&6; } + + echo "define(,<$gmp_cv_m4_m4wrap_spurious>)" >> $gmp_tmpconfigm4 + +*************** +*** 25696,25707 **** + if test "$gmp_asm_syntax_testing" != no; then + SAVE_CFLAGS="$CFLAGS" + CFLAGS="`echo $SAVE_CFLAGS | sed 's;-flto[-=a-z0-9]*;;g'`" +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to switch to text section" >&5 +! $as_echo_n "checking how to switch to text section... " >&6; } +! if ${gmp_cv_asm_text+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! for i in ".text" ".code" ".csect .text[PR]"; do + echo "trying $i" >&5 + cat >conftest.s <&5 +! printf %s "checking how to switch to text section... " >&6; } +! if test ${gmp_cv_asm_text+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) for i in ".text" ".code" ".csect .text[PR]"; do + echo "trying $i" >&5 + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_text=$i +--- 29055,29061 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_text=$i +*************** +*** 25728,25761 **** + if test -z "$gmp_cv_asm_text"; then + as_fn_error $? "Cannot determine text section directive" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_text" >&5 +! $as_echo "$gmp_cv_asm_text" >&6; } + echo "define(, <$gmp_cv_asm_text>)" >> $gmp_tmpconfigm4 + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to switch to data section" >&5 +! $as_echo_n "checking how to switch to data section... " >&6; } +! if ${gmp_cv_asm_data+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $host in + *-*-aix*) gmp_cv_asm_data=".csect .data[RW]" ;; + *) gmp_cv_asm_data=".data" ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_data" >&5 +! $as_echo "$gmp_cv_asm_data" >&6; } + echo "define(, <$gmp_cv_asm_data>)" >> $gmp_tmpconfigm4 + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler label suffix" >&5 +! $as_echo_n "checking for assembler label suffix... " >&6; } +! if ${gmp_cv_asm_label_suffix+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_asm_label_suffix=unknown + for i in "" ":"; do + echo "trying $i" >&5 + cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_text" >&6; } + echo "define(, <$gmp_cv_asm_text>)" >> $gmp_tmpconfigm4 + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to switch to data section" >&5 +! printf %s "checking how to switch to data section... " >&6; } +! if test ${gmp_cv_asm_data+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $host in + *-*-aix*) gmp_cv_asm_data=".csect .data[RW]" ;; + *) gmp_cv_asm_data=".data" ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_data" >&5 +! printf "%s\n" "$gmp_cv_asm_data" >&6; } + echo "define(, <$gmp_cv_asm_data>)" >> $gmp_tmpconfigm4 + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler label suffix" >&5 +! printf %s "checking for assembler label suffix... " >&6; } +! if test ${gmp_cv_asm_label_suffix+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_asm_label_suffix=unknown + for i in "" ":"; do + echo "trying $i" >&5 + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_label_suffix=$i +--- 29115,29121 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_label_suffix=$i +*************** +*** 25784,25835 **** + if test "$gmp_cv_asm_label_suffix" = "unknown"; then + as_fn_error $? "Cannot determine label suffix" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_label_suffix" >&5 +! $as_echo "$gmp_cv_asm_label_suffix" >&6; } + echo "define(, <$gmp_cv_asm_label_suffix>)" >> $gmp_tmpconfigm4 + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler global directive" >&5 +! $as_echo_n "checking for assembler global directive... " >&6; } +! if ${gmp_cv_asm_globl+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $host in + hppa*-*-*) gmp_cv_asm_globl=.export ;; + ia64*-*-* | itanium-*-* | itanium2-*-*) gmp_cv_asm_globl=.global ;; + *) gmp_cv_asm_globl=.globl ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_globl" >&5 +! $as_echo "$gmp_cv_asm_globl" >&6; } + echo "define(, <$gmp_cv_asm_globl>)" >> $gmp_tmpconfigm4 + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler global directive attribute" >&5 +! $as_echo_n "checking for assembler global directive attribute... " >&6; } +! if ${gmp_cv_asm_globl_attr+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $gmp_cv_asm_globl in + .export) gmp_cv_asm_globl_attr=",entry" ;; + *) gmp_cv_asm_globl_attr="" ;; + esac +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_globl_attr" >&5 +! $as_echo "$gmp_cv_asm_globl_attr" >&6; } + echo "define(, <$gmp_cv_asm_globl_attr>)" >> $gmp_tmpconfigm4 + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if globals are prefixed by underscore" >&5 +! $as_echo_n "checking if globals are prefixed by underscore... " >&6; } +! if ${gmp_cv_asm_underscore+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_asm_underscore="unknown" + cat >conftest.c <&5 +! printf "%s\n" "$gmp_cv_asm_label_suffix" >&6; } + echo "define(, <$gmp_cv_asm_label_suffix>)" >> $gmp_tmpconfigm4 + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler global directive" >&5 +! printf %s "checking for assembler global directive... " >&6; } +! if test ${gmp_cv_asm_globl+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $host in + hppa*-*-*) gmp_cv_asm_globl=.export ;; + ia64*-*-* | itanium-*-* | itanium2-*-*) gmp_cv_asm_globl=.global ;; + *) gmp_cv_asm_globl=.globl ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_globl" >&5 +! printf "%s\n" "$gmp_cv_asm_globl" >&6; } + echo "define(, <$gmp_cv_asm_globl>)" >> $gmp_tmpconfigm4 + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler global directive attribute" >&5 +! printf %s "checking for assembler global directive attribute... " >&6; } +! if test ${gmp_cv_asm_globl_attr+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $gmp_cv_asm_globl in + .export) gmp_cv_asm_globl_attr=",entry" ;; + *) gmp_cv_asm_globl_attr="" ;; + esac +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_globl_attr" >&5 +! printf "%s\n" "$gmp_cv_asm_globl_attr" >&6; } + echo "define(, <$gmp_cv_asm_globl_attr>)" >> $gmp_tmpconfigm4 + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if globals are prefixed by underscore" >&5 +! printf %s "checking if globals are prefixed by underscore... " >&6; } +! if test ${gmp_cv_asm_underscore+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_asm_underscore="unknown" + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + $NM conftest.$OBJEXT >conftest.out + if grep "[ ]_gurkmacka" conftest.out >/dev/null; then +--- 29192,29198 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + $NM conftest.$OBJEXT >conftest.out + if grep "[ ]_gurkmacka" conftest.out >/dev/null; then +*************** +*** 25853,25862 **** + cat conftest.c >&5 + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_underscore" >&5 +! $as_echo "$gmp_cv_asm_underscore" >&6; } + case $gmp_cv_asm_underscore in + yes) + +--- 29208,29218 ---- + cat conftest.c >&5 + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_underscore" >&5 +! printf "%s\n" "$gmp_cv_asm_underscore" >&6; } + case $gmp_cv_asm_underscore in + yes) + +*************** +*** 25867,25890 **** + echo 'define(, <>)' >>$gmp_tmpconfigm4 + ;; + *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Cannot determine global symbol prefix." >&5 +! $as_echo "$as_me: WARNING: | Cannot determine global symbol prefix." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | $NM output doesn't contain a global data symbol." >&5 +! $as_echo "$as_me: WARNING: | $NM output doesn't contain a global data symbol." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Will proceed with no underscore." >&5 +! $as_echo "$as_me: WARNING: | Will proceed with no underscore." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | If this is wrong then you'll get link errors referring" >&5 +! $as_echo "$as_me: WARNING: | If this is wrong then you'll get link errors referring" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | to ___gmpn_add_n (note three underscores)." >&5 +! $as_echo "$as_me: WARNING: | to ___gmpn_add_n (note three underscores)." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | In this case do a fresh build with an override," >&5 +! $as_echo "$as_me: WARNING: | In this case do a fresh build with an override," >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | ./configure gmp_cv_asm_underscore=yes" >&5 +! $as_echo "$as_me: WARNING: | ./configure gmp_cv_asm_underscore=yes" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} + + echo 'define(, <>)' >>$gmp_tmpconfigm4 + +--- 29223,29246 ---- + echo 'define(, <>)' >>$gmp_tmpconfigm4 + ;; + *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Cannot determine global symbol prefix." >&5 +! printf "%s\n" "$as_me: WARNING: | Cannot determine global symbol prefix." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | $NM output doesn't contain a global data symbol." >&5 +! printf "%s\n" "$as_me: WARNING: | $NM output doesn't contain a global data symbol." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Will proceed with no underscore." >&5 +! printf "%s\n" "$as_me: WARNING: | Will proceed with no underscore." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | If this is wrong then you'll get link errors referring" >&5 +! printf "%s\n" "$as_me: WARNING: | If this is wrong then you'll get link errors referring" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | to ___gmpn_add_n (note three underscores)." >&5 +! printf "%s\n" "$as_me: WARNING: | to ___gmpn_add_n (note three underscores)." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | In this case do a fresh build with an override," >&5 +! printf "%s\n" "$as_me: WARNING: | In this case do a fresh build with an override," >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | ./configure gmp_cv_asm_underscore=yes" >&5 +! printf "%s\n" "$as_me: WARNING: | ./configure gmp_cv_asm_underscore=yes" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} + + echo 'define(, <>)' >>$gmp_tmpconfigm4 + +*************** +*** 25895,25906 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to switch to read-only data section" >&5 +! $as_echo_n "checking how to switch to read-only data section... " >&6; } +! if ${gmp_cv_asm_rodata+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! + case $host in + i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-* | x86_64-*-*) + gmp_cv_asm_rodata="$gmp_cv_asm_data" ;; +--- 29251,29263 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to switch to read-only data section" >&5 +! printf %s "checking how to switch to read-only data section... " >&6; } +! if test ${gmp_cv_asm_rodata+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) + case $host in + i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-* | x86_64-*-*) + gmp_cv_asm_rodata="$gmp_cv_asm_data" ;; +*************** +*** 25918,25924 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + echo "Compiler output:" >&5 + cat conftest.s >&5 +--- 29275,29281 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + echo "Compiler output:" >&5 + cat conftest.s >&5 +*************** +*** 25947,25964 **** + fi + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_rodata" >&5 +! $as_echo "$gmp_cv_asm_rodata" >&6; } + echo "define(, <$gmp_cv_asm_rodata>)" >> $gmp_tmpconfigm4 + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler .type directive" >&5 +! $as_echo_n "checking for assembler .type directive... " >&6; } +! if ${gmp_cv_asm_type+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_asm_type= + for gmp_tmp_prefix in @ \# %; do + cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_rodata" >&6; } + echo "define(, <$gmp_cv_asm_rodata>)" >> $gmp_tmpconfigm4 + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler .type directive" >&5 +! printf %s "checking for assembler .type directive... " >&6; } +! if test ${gmp_cv_asm_type+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_asm_type= + for gmp_tmp_prefix in @ \# %; do + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if grep "\.type pseudo-op used outside of \.def/\.endef ignored" conftest.out >/dev/null; then : ; +--- 29326,29332 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if grep "\.type pseudo-op used outside of \.def/\.endef ignored" conftest.out >/dev/null; then : ; +*************** +*** 25985,26002 **** + + done + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_type" >&5 +! $as_echo "$gmp_cv_asm_type" >&6; } + echo "define(, <$gmp_cv_asm_type>)" >> $gmp_tmpconfigm4 + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler .size directive" >&5 +! $as_echo_n "checking for assembler .size directive... " >&6; } +! if ${gmp_cv_asm_size+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_asm_size= + cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_type" >&6; } + echo "define(, <$gmp_cv_asm_type>)" >> $gmp_tmpconfigm4 + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler .size directive" >&5 +! printf %s "checking for assembler .size directive... " >&6; } +! if test ${gmp_cv_asm_size+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_asm_size= + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if grep "\.size pseudo-op used outside of \.def/\.endef ignored" conftest.out >/dev/null; then : ; +--- 29365,29371 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if grep "\.size pseudo-op used outside of \.def/\.endef ignored" conftest.out >/dev/null; then : ; +*************** +*** 26019,26039 **** + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_size" >&5 +! $as_echo "$gmp_cv_asm_size" >&6; } + echo "define(, <$gmp_cv_asm_size>)" >> $gmp_tmpconfigm4 + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler local label prefix" >&5 +! $as_echo_n "checking for assembler local label prefix... " >&6; } +! if ${gmp_cv_asm_lsym_prefix+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_tmp_pre_appears=yes + for gmp_tmp_pre in L .L $L $ L$; do + echo "Trying $gmp_tmp_pre" >&5 + cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_size" >&6; } + echo "define(, <$gmp_cv_asm_size>)" >> $gmp_tmpconfigm4 + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler local label prefix" >&5 +! printf %s "checking for assembler local label prefix... " >&6; } +! if test ${gmp_cv_asm_lsym_prefix+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_tmp_pre_appears=yes + for gmp_tmp_pre in L .L $L $ L$; do + echo "Trying $gmp_tmp_pre" >&5 + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if $NM conftest.$OBJEXT >conftest.nm 2>&5; then : ; else + cat conftest.nm >&5 +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"$NM\" failure" >&5 +! $as_echo "$as_me: WARNING: \"$NM\" failure" >&2;} + break + fi + cat conftest.nm >&5 +--- 29408,29420 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if $NM conftest.$OBJEXT >conftest.nm 2>&5; then : ; else + cat conftest.nm >&5 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"$NM\" failure" >&5 +! printf "%s\n" "$as_me: WARNING: \"$NM\" failure" >&2;} + break + fi + cat conftest.nm >&5 +*************** +*** 26084,26113 **** + rm -f conftest* + if test -z "$gmp_cv_asm_lsym_prefix"; then + gmp_cv_asm_lsym_prefix=L +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine local label, using default $gmp_cv_asm_lsym_prefix" >&5 +! $as_echo "$as_me: WARNING: cannot determine local label, using default $gmp_cv_asm_lsym_prefix" >&2;} + fi + # for development purposes, note whether we got a purely temporary local label + echo "Local label appears in object files: $gmp_tmp_pre_appears" >&5 +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_lsym_prefix" >&5 +! $as_echo "$gmp_cv_asm_lsym_prefix" >&6; } + echo "define(, <${gmp_cv_asm_lsym_prefix}>)" >> $gmp_tmpconfigm4 + +! cat >>confdefs.h <<_ACEOF +! #define LSYM_PREFIX "$gmp_cv_asm_lsym_prefix" +! _ACEOF + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler byte directive" >&5 +! $as_echo_n "checking for assembler byte directive... " >&6; } +! if ${gmp_cv_asm_byte+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! for i in .byte data1; do + echo "trying $i" >&5 + cat >conftest.s <&5 +! printf "%s\n" "$as_me: WARNING: cannot determine local label, using default $gmp_cv_asm_lsym_prefix" >&2;} + fi + # for development purposes, note whether we got a purely temporary local label + echo "Local label appears in object files: $gmp_tmp_pre_appears" >&5 +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_lsym_prefix" >&5 +! printf "%s\n" "$gmp_cv_asm_lsym_prefix" >&6; } + echo "define(, <${gmp_cv_asm_lsym_prefix}>)" >> $gmp_tmpconfigm4 + +! printf "%s\n" "#define LSYM_PREFIX \"$gmp_cv_asm_lsym_prefix\"" >>confdefs.h + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for assembler byte directive" >&5 +! printf %s "checking for assembler byte directive... " >&6; } +! if test ${gmp_cv_asm_byte+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) for i in .byte data1; do + echo "trying $i" >&5 + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_byte=$i +--- 29481,29487 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_byte=$i +*************** +*** 26136,26157 **** + if test -z "$gmp_cv_asm_byte"; then + as_fn_error $? "Cannot determine how to emit a data byte" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_byte" >&5 +! $as_echo "$gmp_cv_asm_byte" >&6; } + + + + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to define a 32-bit word" >&5 +! $as_echo_n "checking how to define a 32-bit word... " >&6; } +! if ${gmp_cv_asm_w32+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $host in + *-*-hpux*) + # FIXME: HPUX puts first symbol at 0x40000000, breaking our assumption + # that it's at 0x0. We'll have to declare another symbol before the +--- 29499,29522 ---- + if test -z "$gmp_cv_asm_byte"; then + as_fn_error $? "Cannot determine how to emit a data byte" "$LINENO" 5 + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_byte" >&5 +! printf "%s\n" "$gmp_cv_asm_byte" >&6; } + + + + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to define a 32-bit word" >&5 +! printf %s "checking how to define a 32-bit word... " >&6; } +! if test ${gmp_cv_asm_w32+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $host in + *-*-hpux*) + # FIXME: HPUX puts first symbol at 0x40000000, breaking our assumption + # that it's at 0x0. We'll have to declare another symbol before the +*************** +*** 26174,26180 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_tmp_val=`$NM conftest.$OBJEXT | grep foo | \ +--- 29539,29545 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_tmp_val=`$NM conftest.$OBJEXT | grep foo | \ +*************** +*** 26198,26207 **** + if test -z "$gmp_cv_asm_w32"; then + as_fn_error $? "cannot determine how to define a 32-bit word" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_w32" >&5 +! $as_echo "$gmp_cv_asm_w32" >&6; } + echo "define(, <$gmp_cv_asm_w32>)" >> $gmp_tmpconfigm4 + + +--- 29563,29573 ---- + if test -z "$gmp_cv_asm_w32"; then + as_fn_error $? "cannot determine how to define a 32-bit word" "$LINENO" 5 + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_w32" >&5 +! printf "%s\n" "$gmp_cv_asm_w32" >&6; } + echo "define(, <$gmp_cv_asm_w32>)" >> $gmp_tmpconfigm4 + + +*************** +*** 26209,26220 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .align assembly directive is logarithmic" >&5 +! $as_echo_n "checking if .align assembly directive is logarithmic... " >&6; } +! if ${gmp_cv_asm_align_log+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if .align assembly directive is logarithmic... " >&6; } +! if test ${gmp_cv_asm_align_log+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_tmp_val=`$NM conftest.$OBJEXT | grep foo | \ +--- 29594,29600 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_tmp_val=`$NM conftest.$OBJEXT | grep foo | \ +*************** +*** 26244,26253 **** + as_fn_error $? "cannot assemble alignment test" "$LINENO" 5 + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_align_log" >&5 +! $as_echo "$gmp_cv_asm_align_log" >&6; } + + + echo "define(,<$gmp_cv_asm_align_log>)" >> $gmp_tmpconfigm4 +--- 29611,29621 ---- + as_fn_error $? "cannot assemble alignment test" "$LINENO" 5 + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_align_log" >&5 +! printf "%s\n" "$gmp_cv_asm_align_log" >&6; } + + + echo "define(,<$gmp_cv_asm_align_log>)" >> $gmp_tmpconfigm4 +*************** +*** 26283,26294 **** + + ;; + ia64*-*-* | itanium-*-* | itanium2-*-*) +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether assembler .align padding is good" >&5 +! $as_echo_n "checking whether assembler .align padding is good... " >&6; } +! if ${gmp_cv_asm_ia64_align_ok+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.awk <<\EOF + BEGIN { + want[0] = "011" + want[1] = "160" +--- 29651,29663 ---- + + ;; + ia64*-*-* | itanium-*-* | itanium2-*-*) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether assembler .align padding is good" >&5 +! printf %s "checking whether assembler .align padding is good... " >&6; } +! if test ${gmp_cv_asm_ia64_align_ok+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.awk <<\EOF + BEGIN { + want[0] = "011" + want[1] = "160" +*************** +*** 26384,26390 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_ia64_align_ok=`od -b conftest.$OBJEXT | $AWK -f conftest.awk` +--- 29753,29759 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_ia64_align_ok=`od -b conftest.$OBJEXT | $AWK -f conftest.awk` +*************** +*** 26392,26407 **** + cat conftest.out >&5 + echo "configure: failed program was:" >&5 + cat conftest.s >&5 +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: oops, cannot compile test program" >&5 +! $as_echo "$as_me: WARNING: oops, cannot compile test program" >&2;} + gmp_cv_asm_ia64_align_ok=yes + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_ia64_align_ok" >&5 +! $as_echo "$gmp_cv_asm_ia64_align_ok" >&6; } + + echo "define(, <\`$gmp_cv_asm_ia64_align_ok'>)" >> $gmp_tmpconfigm4 + +--- 29761,29777 ---- + cat conftest.out >&5 + echo "configure: failed program was:" >&5 + cat conftest.s >&5 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: oops, cannot compile test program" >&5 +! printf "%s\n" "$as_me: WARNING: oops, cannot compile test program" >&2;} + gmp_cv_asm_ia64_align_ok=yes + fi + rm -f conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_ia64_align_ok" >&5 +! printf "%s\n" "$gmp_cv_asm_ia64_align_ok" >&6; } + + echo "define(, <\`$gmp_cv_asm_ia64_align_ok'>)" >> $gmp_tmpconfigm4 + +*************** +*** 26409,26420 **** + ;; + m68k-*-* | m68[0-9][0-9][0-9]-*-*) + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler instruction and register style" >&5 +! $as_echo_n "checking assembler instruction and register style... " >&6; } +! if ${gmp_cv_asm_m68k_instruction+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! for i in "addl %d0,%d1" "add.l %d0,%d1" "addl d0,d1" "add.l d0,d1"; do + cat >conftest.s <&5 +! printf %s "checking assembler instruction and register style... " >&6; } +! if test ${gmp_cv_asm_m68k_instruction+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) for i in "addl %d0,%d1" "add.l %d0,%d1" "addl d0,d1" "add.l d0,d1"; do + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_instruction=$i +--- 29794,29800 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_instruction=$i +*************** +*** 26441,26450 **** + if test -z "$gmp_cv_asm_m68k_instruction"; then + as_fn_error $? "cannot determine assembler instruction and register style" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_m68k_instruction" >&5 +! $as_echo "$gmp_cv_asm_m68k_instruction" >&6; } + case $gmp_cv_asm_m68k_instruction in + "addl d0,d1") want_dot_size=no; want_register_percent=no ;; + "addl %d0,%d1") want_dot_size=no; want_register_percent=yes ;; +--- 29812,29822 ---- + if test -z "$gmp_cv_asm_m68k_instruction"; then + as_fn_error $? "cannot determine assembler instruction and register style" "$LINENO" 5 + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_m68k_instruction" >&5 +! printf "%s\n" "$gmp_cv_asm_m68k_instruction" >&6; } + case $gmp_cv_asm_m68k_instruction in + "addl d0,d1") want_dot_size=no; want_register_percent=no ;; + "addl %d0,%d1") want_dot_size=no; want_register_percent=yes ;; +*************** +*** 26461,26472 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler addressing style" >&5 +! $as_echo_n "checking assembler addressing style... " >&6; } +! if ${gmp_cv_asm_m68k_addressing+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! case $gmp_cv_asm_m68k_instruction in + addl*) movel=movel ;; + add.l*) movel=move.l ;; + *) as_fn_error $? "oops, unrecognised gmp_cv_asm_m68k_instruction" "$LINENO" 5 ;; +--- 29833,29845 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking assembler addressing style" >&5 +! printf %s "checking assembler addressing style... " >&6; } +! if test ${gmp_cv_asm_m68k_addressing+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) case $gmp_cv_asm_m68k_instruction in + addl*) movel=movel ;; + add.l*) movel=move.l ;; + *) as_fn_error $? "oops, unrecognised gmp_cv_asm_m68k_instruction" "$LINENO" 5 ;; +*************** +*** 26484,26490 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_addressing=mit +--- 29857,29863 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_addressing=mit +*************** +*** 26500,26506 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_addressing=motorola +--- 29873,29879 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_addressing=motorola +*************** +*** 26515,26535 **** + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_m68k_addressing" >&5 +! $as_echo "$gmp_cv_asm_m68k_addressing" >&6; } + + echo "define(, <\`$gmp_cv_asm_m68k_addressing'>)" >> $gmp_tmpconfigm4 + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler shortest branches" >&5 +! $as_echo_n "checking assembler shortest branches... " >&6; } +! if ${gmp_cv_asm_m68k_branches+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! for i in jra jbra bra; do + cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_m68k_addressing" >&6; } + + echo "define(, <\`$gmp_cv_asm_m68k_addressing'>)" >> $gmp_tmpconfigm4 + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking assembler shortest branches" >&5 +! printf %s "checking assembler shortest branches... " >&6; } +! if test ${gmp_cv_asm_m68k_branches+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) for i in jra jbra bra; do + cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_branches=$i +--- 29914,29920 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_m68k_branches=$i +*************** +*** 26557,26566 **** + if test -z "$gmp_cv_asm_m68k_branches"; then + as_fn_error $? "cannot determine assembler branching style" "$LINENO" 5 + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_m68k_branches" >&5 +! $as_echo "$gmp_cv_asm_m68k_branches" >&6; } + + echo "define(, <\`$gmp_cv_asm_m68k_branches'>)" >> $gmp_tmpconfigm4 + +--- 29932,29942 ---- + if test -z "$gmp_cv_asm_m68k_branches"; then + as_fn_error $? "cannot determine assembler branching style" "$LINENO" 5 + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_m68k_branches" >&5 +! printf "%s\n" "$gmp_cv_asm_m68k_branches" >&6; } + + echo "define(, <\`$gmp_cv_asm_m68k_branches'>)" >> $gmp_tmpconfigm4 + +*************** +*** 26568,26579 **** + ;; + powerpc*-*-* | power[3-9]-*-* | power1[0-9]-*-*) + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler output is PIC by default" >&5 +! $as_echo_n "checking whether compiler output is PIC by default... " >&6; } +! if ${gmp_cv_asm_powerpc_pic+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_asm_powerpc_pic=yes + cat >conftest.c <&5 +! printf %s "checking whether compiler output is PIC by default... " >&6; } +! if test ${gmp_cv_asm_powerpc_pic+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_asm_powerpc_pic=yes + cat >conftest.c <&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + echo "Compiler output:" >&5 + cat conftest.s >&5 +--- 29961,29967 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + echo "Compiler output:" >&5 + cat conftest.s >&5 +*************** +*** 26596,26616 **** + fi + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_powerpc_pic" >&5 +! $as_echo "$gmp_cv_asm_powerpc_pic" >&6; } + + echo "define(,<$gmp_cv_asm_powerpc_pic>)" >> $gmp_tmpconfigm4 + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler needs r on registers" >&5 +! $as_echo_n "checking if the assembler needs r on registers... " >&6; } +! if ${gmp_cv_asm_powerpc_r_registers+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_powerpc_pic" >&6; } + + echo "define(,<$gmp_cv_asm_powerpc_pic>)" >> $gmp_tmpconfigm4 + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the assembler needs r on registers" >&5 +! printf %s "checking if the assembler needs r on registers... " >&6; } +! if test ${gmp_cv_asm_powerpc_r_registers+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_powerpc_r_registers=no +--- 29997,30003 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_powerpc_r_registers=no +*************** +*** 26634,26640 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_powerpc_r_registers=yes +--- 30013,30019 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_powerpc_r_registers=yes +*************** +*** 26648,26657 **** + + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_powerpc_r_registers" >&5 +! $as_echo "$gmp_cv_asm_powerpc_r_registers" >&6; } + + + echo "define(,<$gmp_cv_asm_powerpc_r_registers>)" >> $gmp_tmpconfigm4 +--- 30027,30037 ---- + + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_powerpc_r_registers" >&5 +! printf "%s\n" "$gmp_cv_asm_powerpc_r_registers" >&6; } + + + echo "define(,<$gmp_cv_asm_powerpc_r_registers>)" >> $gmp_tmpconfigm4 +*************** +*** 26669,26680 **** + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "yes" >/dev/null 2>&1; then : + + echo "define()" >> $gmp_tmpconfigm4 + + fi +! rm -f conftest* + + + # Check for Linux ELFv2 ABI +--- 30049,30061 ---- + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 +! then : + + echo "define()" >> $gmp_tmpconfigm4 + + fi +! rm -rf conftest* + + + # Check for Linux ELFv2 ABI +*************** +*** 26685,26696 **** + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP "yes" >/dev/null 2>&1; then : + + echo "define()" >> $gmp_tmpconfigm4 + + fi +! rm -f conftest* + + + case $host in +--- 30066,30078 ---- + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +! $EGREP_TRADITIONAL "yes" >/dev/null 2>&1 +! then : + + echo "define()" >> $gmp_tmpconfigm4 + + fi +! rm -rf conftest* + + + case $host in +*************** +*** 26741,26752 **** + case $ABI in + 64) + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler accepts \".register\"" >&5 +! $as_echo_n "checking if the assembler accepts \".register\"... " >&6; } +! if ${gmp_cv_asm_sparc_register+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if the assembler accepts \".register\"... " >&6; } +! if test ${gmp_cv_asm_sparc_register+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_sparc_register=yes +--- 30138,30144 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_sparc_register=yes +*************** +*** 26766,26775 **** + gmp_cv_asm_sparc_register=no + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_sparc_register" >&5 +! $as_echo "$gmp_cv_asm_sparc_register" >&6; } + + + echo "define(,<$gmp_cv_asm_sparc_register>)" >> $gmp_tmpconfigm4 +--- 30149,30159 ---- + gmp_cv_asm_sparc_register=no + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_sparc_register" >&5 +! printf "%s\n" "$gmp_cv_asm_sparc_register" >&6; } + + + echo "define(,<$gmp_cv_asm_sparc_register>)" >> $gmp_tmpconfigm4 +*************** +*** 26778,26789 **** + ;; + esac + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler accepts gdop relocations" >&5 +! $as_echo_n "checking if the assembler accepts gdop relocations... " >&6; } +! if ${gmp_cv_asm_sparc_gdop+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if the assembler accepts gdop relocations... " >&6; } +! if test ${gmp_cv_asm_sparc_gdop+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_sparc_gdop=yes +--- 30179,30185 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_sparc_gdop=yes +*************** +*** 26805,26826 **** + gmp_cv_asm_sparc_gdop=no + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_sparc_gdop" >&5 +! $as_echo "$gmp_cv_asm_sparc_gdop" >&6; } + + + echo "define(,<$gmp_cv_asm_sparc_gdop>)" >> $gmp_tmpconfigm4 + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler can support shared PIC thunks" >&5 +! $as_echo_n "checking if the assembler can support shared PIC thunks... " >&6; } +! if ${gmp_cv_asm_sparc_shared_thunks+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_sparc_gdop" >&6; } + + + echo "define(,<$gmp_cv_asm_sparc_gdop>)" >> $gmp_tmpconfigm4 + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the assembler can support shared PIC thunks" >&5 +! printf %s "checking if the assembler can support shared PIC thunks... " >&6; } +! if test ${gmp_cv_asm_sparc_shared_thunks+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_sparc_shared_thunks=yes +--- 30222,30228 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_sparc_shared_thunks=yes +*************** +*** 26846,26855 **** + gmp_cv_asm_sparc_shared_thunks=no + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_sparc_shared_thunks" >&5 +! $as_echo "$gmp_cv_asm_sparc_shared_thunks" >&6; } + + + echo "define(,<$gmp_cv_asm_sparc_shared_thunks>)" >> $gmp_tmpconfigm4 +--- 30233,30243 ---- + gmp_cv_asm_sparc_shared_thunks=no + fi + rm -f conftest* +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_sparc_shared_thunks" >&5 +! printf "%s\n" "$gmp_cv_asm_sparc_shared_thunks" >&6; } + + + echo "define(,<$gmp_cv_asm_sparc_shared_thunks>)" >> $gmp_tmpconfigm4 +*************** +*** 26858,26869 **** + ;; + i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-* | athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | jaguar*-*-* | bulldozer*-*-* | piledriver*-*-* | steamroller*-*-* | excavator*-*-* | zen*-*-* | pentium4-*-* | atom-*-* | silvermont-*-* | goldmont-*-* | tremont-*-* | core2-*-* | corei*-*-* | x86_64-*-* | nano-*-* | nehalem*-*-* | westmere*-*-* | sandybridge*-*-* | ivybridge*-*-* | haswell*-*-* | broadwell*-*-* | skylake*-*-* | kabylake*-*-* | icelake*-*-* | tigerlake*-*-* | rocketlake*-*-* | alderlake*-*-* | raptorlake*-*-*) + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the .align directive accepts an 0x90 fill in .text" >&5 +! $as_echo_n "checking if the .align directive accepts an 0x90 fill in .text... " >&6; } +! if ${gmp_cv_asm_align_fill_0x90+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if the .align directive accepts an 0x90 fill in .text... " >&6; } +! if test ${gmp_cv_asm_align_fill_0x90+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if grep "Warning: Fill parameter ignored for executable section" conftest.out >/dev/null; then +--- 30262,30268 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + if grep "Warning: Fill parameter ignored for executable section" conftest.out >/dev/null; then +*************** +*** 26889,26910 **** + gmp_cv_asm_align_fill_0x90=no + fi + rm -f conftest* +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_align_fill_0x90" >&5 +! $as_echo "$gmp_cv_asm_align_fill_0x90" >&6; } + + + echo "define(,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4 + + + if test "$x86_have_mulx" = yes; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler knows about the mulx instruction" >&5 +! $as_echo_n "checking if the assembler knows about the mulx instruction... " >&6; } +! if ${gmp_cv_asm_x86_mulx+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf "%s\n" "$gmp_cv_asm_align_fill_0x90" >&6; } + + + echo "define(,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4 + + + if test "$x86_have_mulx" = yes; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the assembler knows about the mulx instruction" >&5 +! printf %s "checking if the assembler knows about the mulx instruction... " >&6; } +! if test ${gmp_cv_asm_x86_mulx+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_mulx=yes +--- 30303,30309 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_mulx=yes +*************** +*** 26924,26957 **** + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_mulx" >&5 +! $as_echo "$gmp_cv_asm_x86_mulx" >&6; } + case $gmp_cv_asm_x86_mulx in + yes) + +! $as_echo "#define X86_ASM_MULX 1" >>confdefs.h + + : + ;; + *) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! $as_echo "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has the mulx instruction, but it can't be" >&5 +! $as_echo "$as_me: WARNING: | Host CPU has the mulx instruction, but it can't be" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | assembled by" >&5 +! $as_echo "$as_me: WARNING: | assembled by" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! $as_echo "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | Older x86 instructions will be used." >&5 +! $as_echo "$as_me: WARNING: | Older x86 instructions will be used." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! $as_echo "$as_me: WARNING: | This will be an inferior build." >&2;} +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! $as_echo "$as_me: WARNING: +----------------------------------------------------------" >&2;} + : + ;; + esac +--- 30315,30349 ---- + fi + rm -f conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_mulx" >&5 +! printf "%s\n" "$gmp_cv_asm_x86_mulx" >&6; } + case $gmp_cv_asm_x86_mulx in + yes) + +! printf "%s\n" "#define X86_ASM_MULX 1" >>confdefs.h + + : + ;; + *) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | WARNING WARNING WARNING" >&5 +! printf "%s\n" "$as_me: WARNING: | WARNING WARNING WARNING" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Host CPU has the mulx instruction, but it can't be" >&5 +! printf "%s\n" "$as_me: WARNING: | Host CPU has the mulx instruction, but it can't be" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | assembled by" >&5 +! printf "%s\n" "$as_me: WARNING: | assembled by" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&5 +! printf "%s\n" "$as_me: WARNING: | $CCAS $CFLAGS $CPPFLAGS" >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | Older x86 instructions will be used." >&5 +! printf "%s\n" "$as_me: WARNING: | Older x86 instructions will be used." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: | This will be an inferior build." >&5 +! printf "%s\n" "$as_me: WARNING: | This will be an inferior build." >&2;} +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: +----------------------------------------------------------" >&5 +! printf "%s\n" "$as_me: WARNING: +----------------------------------------------------------" >&2;} + : + ;; + esac +*************** +*** 26962,26973 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler COFF type directives" >&5 +! $as_echo_n "checking for assembler COFF type directives... " >&6; } +! if ${gmp_cv_asm_x86_coff_type+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking for assembler COFF type directives... " >&6; } +! if test ${gmp_cv_asm_x86_coff_type+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_coff_type=yes +--- 30374,30380 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_coff_type=yes +*************** +*** 26993,27002 **** + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_coff_type" >&5 +! $as_echo "$gmp_cv_asm_x86_coff_type" >&6; } + echo "define(, <$gmp_cv_asm_x86_coff_type>)" >> $gmp_tmpconfigm4 + + case $ABI in +--- 30386,30396 ---- + fi + rm -f conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_coff_type" >&5 +! printf "%s\n" "$gmp_cv_asm_x86_coff_type" >&6; } + echo "define(, <$gmp_cv_asm_x86_coff_type>)" >> $gmp_tmpconfigm4 + + case $ABI in +*************** +*** 27004,27010 **** + + echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i + +! $as_echo "#define HAVE_HOST_CPU_FAMILY_x86 1" >>confdefs.h + + + +--- 30398,30404 ---- + + echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i + +! printf "%s\n" "#define HAVE_HOST_CPU_FAMILY_x86 1" >>confdefs.h + + + +*************** +*** 27013,27024 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if _GLOBAL_OFFSET_TABLE_ is prefixed by underscore" >&5 +! $as_echo_n "checking if _GLOBAL_OFFSET_TABLE_ is prefixed by underscore... " >&6; } +! if ${gmp_cv_asm_x86_got_underscore+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! gmp_cv_asm_x86_got_underscore="not applicable" + if test $gmp_cv_asm_underscore = yes; then + tmp_gsym_prefix=_ + else +--- 30407,30419 ---- + + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if _GLOBAL_OFFSET_TABLE_ is prefixed by underscore" >&5 +! printf %s "checking if _GLOBAL_OFFSET_TABLE_ is prefixed by underscore... " >&6; } +! if test ${gmp_cv_asm_x86_got_underscore+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) gmp_cv_asm_x86_got_underscore="not applicable" + if test $gmp_cv_asm_underscore = yes; then + tmp_gsym_prefix=_ + else +*************** +*** 27035,27041 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$tmp_underscore" = "_"; then + gmp_cv_asm_x86_got_underscore=yes +--- 30430,30436 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_compile\""; } >&5 + (eval $gmp_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$tmp_underscore" = "_"; then + gmp_cv_asm_x86_got_underscore=yes +*************** +*** 27046,27055 **** + fi + done + rm -f conftest* a.out b.out a.exe a_out.exe +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_got_underscore" >&5 +! $as_echo "$gmp_cv_asm_x86_got_underscore" >&6; } + if test "$gmp_cv_asm_x86_got_underscore" = "yes"; then + + echo 'define(, <_>)' >>$gmp_tmpconfigm4 +--- 30441,30451 ---- + fi + done + rm -f conftest* a.out b.out a.exe a_out.exe +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_got_underscore" >&5 +! printf "%s\n" "$gmp_cv_asm_x86_got_underscore" >&6; } + if test "$gmp_cv_asm_x86_got_underscore" = "yes"; then + + echo 'define(, <_>)' >>$gmp_tmpconfigm4 +*************** +*** 27061,27072 **** + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler takes cl with shldl" >&5 +! $as_echo_n "checking if the assembler takes cl with shldl... " >&6; } +! if ${gmp_cv_asm_x86_shldl_cl+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! cat >conftest.s <&5 +! printf %s "checking if the assembler takes cl with shldl... " >&6; } +! if test ${gmp_cv_asm_x86_shldl_cl+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) cat >conftest.s <&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_shldl_cl=yes +--- 30471,30477 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_assemble\""; } >&5 + (eval $gmp_assemble) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + cat conftest.out >&5 + gmp_cv_asm_x86_shldl_cl=yes +*************** +*** 27086,27095 **** + fi + rm -f conftest* + +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_shldl_cl" >&5 +! $as_echo "$gmp_cv_asm_x86_shldl_cl" >&6; } + if test "$gmp_cv_asm_x86_shldl_cl" = "yes"; then + + echo 'define(, <1>)' >>$gmp_tmpconfigm4 +--- 30483,30493 ---- + fi + rm -f conftest* + +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_shldl_cl" >&5 +! printf "%s\n" "$gmp_cv_asm_x86_shldl_cl" >&6; } + if test "$gmp_cv_asm_x86_shldl_cl" = "yes"; then + + echo 'define(, <1>)' >>$gmp_tmpconfigm4 +*************** +*** 27102,27108 **** + + case $enable_profiling in + prof | gprof) # Check whether --enable-shared was given. +! if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +--- 30500,30507 ---- + + case $enable_profiling in + prof | gprof) # Check whether --enable-shared was given. +! if test ${enable_shared+y} +! then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +*************** +*** 27120,27127 **** + IFS=$lt_save_ifs + ;; + esac +! else +! enable_shared=yes + fi + + +--- 30519,30527 ---- + IFS=$lt_save_ifs + ;; + esac +! else case e in #( +! e) enable_shared=yes ;; +! esac + fi + + +*************** +*** 27131,27138 **** + + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to call x86 mcount" >&5 +! $as_echo_n "checking how to call x86 mcount... " >&6; } + cat >conftest.c <&5 +! printf %s "checking how to call x86 mcount... " >&6; } + cat >conftest.c <&5 + (eval $gmp_asmout_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep '\.data' conftest.s >/dev/null; then + mcount_nonpic_reg=`sed -n '/esp/!s/.*movl.*,\(%[a-z]*\).*$/\1/p' conftest.s` +--- 30542,30548 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_asmout_compile\""; } >&5 + (eval $gmp_asmout_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep '\.data' conftest.s >/dev/null; then + mcount_nonpic_reg=`sed -n '/esp/!s/.*movl.*,\(%[a-z]*\).*$/\1/p' conftest.s` +*************** +*** 27163,27169 **** + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_asmout_compile\""; } >&5 + (eval $gmp_asmout_compile) 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep '\.data' conftest.s >/dev/null; then + case $lt_prog_compiler_pic in +--- 30563,30569 ---- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gmp_asmout_compile\""; } >&5 + (eval $gmp_asmout_compile) 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if grep '\.data' conftest.s >/dev/null; then + case $lt_prog_compiler_pic in +*************** +*** 27201,27208 **** + + + rm -f conftest.* +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: determined" >&5 +! $as_echo "determined" >&6; } + ;; + esac + case $host in +--- 30601,30608 ---- + + + rm -f conftest.* +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: determined" >&5 +! printf "%s\n" "determined" >&6; } + ;; + esac + case $host in +*************** +*** 27216,27222 **** + + echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i + +! $as_echo "#define HAVE_HOST_CPU_FAMILY_x86_64 1" >>confdefs.h + + case $host in + *-*-darwin*) +--- 30616,30622 ---- + + echo "include_mpn(\`x86_64/x86_64-defs.m4')" >> $gmp_tmpconfigm4i + +! printf "%s\n" "#define HAVE_HOST_CPU_FAMILY_x86_64 1" >>confdefs.h + + case $host in + *-*-darwin*) +*************** +*** 27274,27282 **** + fi + fi + +! cat >>confdefs.h <<_ACEOF +! #define GMP_MPARAM_H_SUGGEST "$gmp_mparam_source" +! _ACEOF + + + +--- 30674,30680 ---- + fi + fi + +! printf "%s\n" "#define GMP_MPARAM_H_SUGGEST \"$gmp_mparam_source\"" >>confdefs.h + + + +*************** +*** 27305,27477 **** + # + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 +! $as_echo_n "checking size of void *... " >&6; } +! if ${ac_cv_sizeof_void_p+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : +! +! else +! if test "$ac_cv_type_void_p" = yes; then +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (void *) +! See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_void_p=0 +! fi + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 +! $as_echo "$ac_cv_sizeof_void_p" >&6; } + + + +! cat >>confdefs.h <<_ACEOF +! #define SIZEOF_VOID_P $ac_cv_sizeof_void_p +! _ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5 +! $as_echo_n "checking size of unsigned short... " >&6; } +! if ${ac_cv_sizeof_unsigned_short+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short" "$ac_includes_default"; then : +! +! else +! if test "$ac_cv_type_unsigned_short" = yes; then +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (unsigned short) +! See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_short=0 +! fi + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_short" >&5 +! $as_echo "$ac_cv_sizeof_unsigned_short" >&6; } + + + +! cat >>confdefs.h <<_ACEOF +! #define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short +! _ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned" >&5 +! $as_echo_n "checking size of unsigned... " >&6; } +! if ${ac_cv_sizeof_unsigned+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned))" "ac_cv_sizeof_unsigned" "$ac_includes_default"; then : +! +! else +! if test "$ac_cv_type_unsigned" = yes; then +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (unsigned) +! See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned=0 +! fi + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned" >&5 +! $as_echo "$ac_cv_sizeof_unsigned" >&6; } + + + +! cat >>confdefs.h <<_ACEOF +! #define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned +! _ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 +! $as_echo_n "checking size of unsigned long... " >&6; } +! if ${ac_cv_sizeof_unsigned_long+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : +! +! else +! if test "$ac_cv_type_unsigned_long" = yes; then +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (unsigned long) +! See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long=0 +! fi + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 +! $as_echo "$ac_cv_sizeof_unsigned_long" >&6; } + + + +! cat >>confdefs.h <<_ACEOF +! #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long +! _ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of mp_limb_t" >&5 +! $as_echo_n "checking size of mp_limb_t... " >&6; } +! if ${ac_cv_sizeof_mp_limb_t+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (mp_limb_t))" "ac_cv_sizeof_mp_limb_t" "#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS + #define GMP_LIMB_BITS 123 + $DEFN_LONG_LONG_LIMB + #include \"$srcdir/gmp-h.in\" + +! "; then : + +! else +! if test "$ac_cv_type_mp_limb_t" = yes; then +! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (mp_limb_t) +! See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_mp_limb_t=0 +! fi + fi +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_mp_limb_t" >&5 +! $as_echo "$ac_cv_sizeof_mp_limb_t" >&6; } + + + +! cat >>confdefs.h <<_ACEOF +! #define SIZEOF_MP_LIMB_T $ac_cv_sizeof_mp_limb_t +! _ACEOF + + + if test "$ac_cv_sizeof_mp_limb_t" = 0; then +--- 30703,30885 ---- + # + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 +! printf %s "checking size of void *... " >&6; } +! if test ${ac_cv_sizeof_void_p+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" +! then : +! +! else case e in #( +! e) if test "$ac_cv_type_void_p" = yes; then +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (void *) +! See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_void_p=0 +! fi ;; +! esac + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 +! printf "%s\n" "$ac_cv_sizeof_void_p" >&6; } + + + +! printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5 +! printf %s "checking size of unsigned short... " >&6; } +! if test ${ac_cv_sizeof_unsigned_short+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short" "$ac_includes_default" +! then : +! +! else case e in #( +! e) if test "$ac_cv_type_unsigned_short" = yes; then +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (unsigned short) +! See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_short=0 +! fi ;; +! esac + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_short" >&5 +! printf "%s\n" "$ac_cv_sizeof_unsigned_short" >&6; } + + + +! printf "%s\n" "#define SIZEOF_UNSIGNED_SHORT $ac_cv_sizeof_unsigned_short" >>confdefs.h + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of unsigned" >&5 +! printf %s "checking size of unsigned... " >&6; } +! if test ${ac_cv_sizeof_unsigned+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned))" "ac_cv_sizeof_unsigned" "$ac_includes_default" +! then : +! +! else case e in #( +! e) if test "$ac_cv_type_unsigned" = yes; then +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (unsigned) +! See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned=0 +! fi ;; +! esac + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned" >&5 +! printf "%s\n" "$ac_cv_sizeof_unsigned" >&6; } + + + +! printf "%s\n" "#define SIZEOF_UNSIGNED $ac_cv_sizeof_unsigned" >>confdefs.h + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 +! printf %s "checking size of unsigned long... " >&6; } +! if test ${ac_cv_sizeof_unsigned_long+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default" +! then : +! +! else case e in #( +! e) if test "$ac_cv_type_unsigned_long" = yes; then +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (unsigned long) +! See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long=0 +! fi ;; +! esac + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 +! printf "%s\n" "$ac_cv_sizeof_unsigned_long" >&6; } + + + +! printf "%s\n" "#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long" >>confdefs.h + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +! # declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of mp_limb_t" >&5 +! printf %s "checking size of mp_limb_t... " >&6; } +! if test ${ac_cv_sizeof_mp_limb_t+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (mp_limb_t))" "ac_cv_sizeof_mp_limb_t" "#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS + #define GMP_LIMB_BITS 123 + $DEFN_LONG_LONG_LIMB + #include \"$srcdir/gmp-h.in\" + +! " +! then : + +! else case e in #( +! e) if test "$ac_cv_type_mp_limb_t" = yes; then +! { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +! printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error 77 "cannot compute sizeof (mp_limb_t) +! See 'config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_mp_limb_t=0 +! fi ;; +! esac + fi +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_mp_limb_t" >&5 +! printf "%s\n" "$ac_cv_sizeof_mp_limb_t" >&6; } + + + +! printf "%s\n" "#define SIZEOF_MP_LIMB_T $ac_cv_sizeof_mp_limb_t" >>confdefs.h + + + if test "$ac_cv_sizeof_mp_limb_t" = 0; then +*************** +*** 27528,27536 **** + if test -n "$sqr_max"; then + TUNE_SQR_OBJ=sqr_asm.o + +! cat >>confdefs.h <<_ACEOF +! #define TUNE_SQR_TOOM2_MAX $sqr_max +! _ACEOF + + fi + cat >tune/sqr_basecase.c <>confdefs.h + + fi + cat >tune/sqr_basecase.c <>confdefs.h + + cat >tune/sqr_basecase.c <>confdefs.h + + cat >tune/sqr_basecase.c < + " +! if test "x$ac_cv_type_stack_t" = xyes; then : + +! cat >>confdefs.h <<_ACEOF +! #define HAVE_STACK_T 1 +! _ACEOF + + HAVE_STACK_T_01=1 +! else +! HAVE_STACK_T_01=0 + fi + + +--- 31014,31028 ---- + + ac_fn_c_check_type "$LINENO" "stack_t" "ac_cv_type_stack_t" "#include + " +! if test "x$ac_cv_type_stack_t" = xyes +! then : + +! printf "%s\n" "#define HAVE_STACK_T 1" >>confdefs.h + + HAVE_STACK_T_01=1 +! else case e in #( +! e) HAVE_STACK_T_01=0 ;; +! esac + fi + + +*************** +*** 27644,27728 **** + + LIBCURSES= + if test $with_readline != no; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -lncurses" >&5 +! $as_echo_n "checking for tputs in -lncurses... " >&6; } +! if ${ac_cv_lib_ncurses_tputs+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lncurses $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char tputs (); + int +! main () + { + return tputs (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncurses_tputs=yes +! else +! ac_cv_lib_ncurses_tputs=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tputs" >&5 +! $as_echo "$ac_cv_lib_ncurses_tputs" >&6; } +! if test "x$ac_cv_lib_ncurses_tputs" = xyes; then : + LIBCURSES=-lncurses +! else +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -lcurses" >&5 +! $as_echo_n "checking for tputs in -lcurses... " >&6; } +! if ${ac_cv_lib_curses_tputs+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lcurses $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char tputs (); + int +! main () + { + return tputs (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_curses_tputs=yes +! else +! ac_cv_lib_curses_tputs=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tputs" >&5 +! $as_echo "$ac_cv_lib_curses_tputs" >&6; } +! if test "x$ac_cv_lib_curses_tputs" = xyes; then : + LIBCURSES=-lcurses + fi +! + fi + + fi +--- 31050,31151 ---- + + LIBCURSES= + if test $with_readline != no; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tputs in -lncurses" >&5 +! printf %s "checking for tputs in -lncurses... " >&6; } +! if test ${ac_cv_lib_ncurses_tputs+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lncurses $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char tputs (void); + int +! main (void) + { + return tputs (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_ncurses_tputs=yes +! else case e in #( +! e) ac_cv_lib_ncurses_tputs=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tputs" >&5 +! printf "%s\n" "$ac_cv_lib_ncurses_tputs" >&6; } +! if test "x$ac_cv_lib_ncurses_tputs" = xyes +! then : + LIBCURSES=-lncurses +! else case e in #( +! e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tputs in -lcurses" >&5 +! printf %s "checking for tputs in -lcurses... " >&6; } +! if test ${ac_cv_lib_curses_tputs+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lcurses $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char tputs (void); + int +! main (void) + { + return tputs (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_curses_tputs=yes +! else case e in #( +! e) ac_cv_lib_curses_tputs=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tputs" >&5 +! printf "%s\n" "$ac_cv_lib_curses_tputs" >&6; } +! if test "x$ac_cv_lib_curses_tputs" = xyes +! then : + LIBCURSES=-lcurses + fi +! ;; +! esac + fi + + fi +*************** +*** 27730,27776 **** + use_readline=$with_readline + if test $with_readline = detect; then + use_readline=no +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 +! $as_echo_n "checking for readline in -lreadline... " >&6; } +! if ${ac_cv_lib_readline_readline+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBCURSES $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +! char readline (); + int +! main () + { + return readline (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_readline=yes +! else +! ac_cv_lib_readline_readline=no + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +! $as_echo "$ac_cv_lib_readline_readline" >&6; } +! if test "x$ac_cv_lib_readline_readline" = xyes; then : +! ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" +! if test "x$ac_cv_header_readline_readline_h" = xyes; then : +! ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" +! if test "x$ac_cv_header_readline_history_h" = xyes; then : + use_readline=yes + fi + +--- 31153,31209 ---- + use_readline=$with_readline + if test $with_readline = detect; then + use_readline=no +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5 +! printf %s "checking for readline in -lreadline... " >&6; } +! if test ${ac_cv_lib_readline_readline+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_check_lib_save_LIBS=$LIBS + LIBS="-lreadline $LIBCURSES $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ + #ifdef __cplusplus + extern "C" + #endif +! char readline (void); + int +! main (void) + { + return readline (); + ; + return 0; + } + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : + ac_cv_lib_readline_readline=yes +! else case e in #( +! e) ac_cv_lib_readline_readline=no ;; +! esac + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_check_lib_save_LIBS ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5 +! printf "%s\n" "$ac_cv_lib_readline_readline" >&6; } +! if test "x$ac_cv_lib_readline_readline" = xyes +! then : +! ac_fn_c_check_header_compile "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" +! if test "x$ac_cv_header_readline_readline_h" = xyes +! then : +! ac_fn_c_check_header_compile "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" +! if test "x$ac_cv_header_readline_history_h" = xyes +! then : + use_readline=yes + fi + +*************** +*** 27774,27789 **** + use_readline=yes + fi + +- + fi + +- + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking readline detected" >&5 +! $as_echo_n "checking readline detected... " >&6; } +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_readline" >&5 +! $as_echo "$use_readline" >&6; } + fi + if test $use_readline = yes; then + WITH_READLINE_01=1 +--- 31207,31220 ---- + use_readline=yes + fi + + fi + + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking readline detected" >&5 +! printf %s "checking readline detected... " >&6; } +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $use_readline" >&5 +! printf "%s\n" "$use_readline" >&6; } + fi + if test $use_readline = yes; then + WITH_READLINE_01=1 +*************** +*** 27797,27834 **** + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_YACC+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + YACC=$ac_cv_prog_YACC + if test -n "$YACC"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +! $as_echo "$YACC" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 31228,31271 ---- + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_YACC+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_YACC="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + YACC=$ac_cv_prog_YACC + if test -n "$YACC"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +! printf "%s\n" "$YACC" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 27840,27877 **** + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! $as_echo_n "checking for $ac_word... " >&6; } +! if ${ac_cv_prog_LEX+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LEX="$ac_prog" +! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi + fi + LEX=$ac_cv_prog_LEX + if test -n "$LEX"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +! $as_echo "$LEX" >&6; } + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! $as_echo "no" >&6; } + fi + + +--- 31277,31320 ---- + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +! printf %s "checking for $ac_word... " >&6; } +! if test ${ac_cv_prog_LEX+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac + for ac_exec_ext in '' $ac_executable_extensions; do +! if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_LEX="$ac_prog" +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +! fi ;; +! esac + fi + LEX=$ac_cv_prog_LEX + if test -n "$LEX"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +! printf "%s\n" "$LEX" >&6; } + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +! printf "%s\n" "no" >&6; } + fi + + +*************** +*** 27879,27893 **** + done + test -n "$LEX" || LEX=":" + +! if test "x$LEX" != "x:"; then +! cat >conftest.l <<_ACEOF + %% + a { ECHO; } + b { REJECT; } + c { yymore (); } + d { yyless (1); } + e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ +! yyless ((input () != 0)); } + f { unput (yytext[0]); } + . { BEGIN INITIAL; } + %% +--- 31322,31347 ---- + done + test -n "$LEX" || LEX=":" + +! if test "x$LEX" != "x:"; then +! cat >conftest.l <<_ACEOF +! %{ +! #ifdef __cplusplus +! extern "C" +! #endif +! int yywrap(void); +! %} + %% + a { ECHO; } + b { REJECT; } + c { yymore (); } + d { yyless (1); } + e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ +! #ifdef __cplusplus +! yyless ((yyinput () != 0)); +! #else +! yyless ((input () != 0)); +! #endif +! } + f { unput (yytext[0]); } + . { BEGIN INITIAL; } + %% +*************** +*** 27895,27995 **** + extern char *yytext; + #endif + int + main (void) + { +! return ! yylex () + ! yywrap (); + } + _ACEOF + { { ac_try="$LEX conftest.l" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! $as_echo "$ac_try_echo"; } >&5 + (eval "$LEX conftest.l") 2>&5 + ac_status=$? +! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; } +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 +! $as_echo_n "checking lex output file root... " >&6; } +! if ${ac_cv_prog_lex_root+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! + if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy + elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +! else +! as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 + fi + fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +- $as_echo "$ac_cv_prog_lex_root" >&6; } + LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + +! if test -z "${LEXLIB+set}"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 +! $as_echo_n "checking lex library... " >&6; } +! if ${ac_cv_lib_lex+:} false; then : +! $as_echo_n "(cached) " >&6 +! else + +- ac_save_LIBS=$LIBS +- ac_cv_lib_lex='none needed' +- for ac_lib in '' -lfl -ll; do +- LIBS="$ac_lib $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + `cat $LEX_OUTPUT_ROOT.c` + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : +! ac_cv_lib_lex=$ac_lib + fi +! rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +! test "$ac_cv_lib_lex" != 'none needed' && break + done +! LIBS=$ac_save_LIBS + + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +! $as_echo "$ac_cv_lib_lex" >&6; } +! test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +! $as_echo_n "checking whether yytext is a pointer... " >&6; } +! if ${ac_cv_prog_lex_yytext_pointer+:} false; then : +! $as_echo_n "(cached) " >&6 +! else +! # POSIX says lex can declare yytext either as a pointer or an array; the + # default is implementation-dependent. Figure out which it is, since + # not all implementations provide the %pointer and %array declarations. + ac_cv_prog_lex_yytext_pointer=no +- ac_save_LIBS=$LIBS +- LIBS="$LEXLIB $ac_save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #define YYTEXT_POINTER 1 + `cat $LEX_OUTPUT_ROOT.c` + _ACEOF +! if ac_fn_c_try_link "$LINENO"; then : + ac_cv_prog_lex_yytext_pointer=yes + fi +! rm -f core conftest.err conftest.$ac_objext \ +! conftest$ac_exeext conftest.$ac_ext +! LIBS=$ac_save_LIBS +! + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +! $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } + if test $ac_cv_prog_lex_yytext_pointer = yes; then + +! $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h + + fi + rm -f conftest.l $LEX_OUTPUT_ROOT.c +--- 31349,31566 ---- + extern char *yytext; + #endif + int ++ yywrap (void) ++ { ++ return 1; ++ } ++ int + main (void) + { +! return ! yylex (); + } + _ACEOF ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex output file root" >&5 ++ printf %s "checking for lex output file root... " >&6; } ++ if test ${ac_cv_prog_lex_root+y} ++ then : ++ printf %s "(cached) " >&6 ++ else case e in #( ++ e) ++ ac_cv_prog_lex_root=unknown + { { ac_try="$LEX conftest.l" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +! printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$LEX conftest.l") 2>&5 + ac_status=$? +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +! test $ac_status = 0; } && + if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy + elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +! fi ;; +! esac + fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 ++ printf "%s\n" "$ac_cv_prog_lex_root" >&6; } ++ if test "$ac_cv_prog_lex_root" = unknown ++ then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find output from $LEX; giving up on $LEX" >&5 ++ printf "%s\n" "$as_me: WARNING: cannot find output from $LEX; giving up on $LEX" >&2;} ++ LEX=: LEXLIB= + fi + LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root + +! if test ${LEXLIB+y} +! then : +! +! else case e in #( +! e) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 +! printf %s "checking for lex library... " >&6; } +! if test ${ac_cv_lib_lex+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) +! ac_save_LIBS="$LIBS" +! ac_found=false +! for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do +! case $ac_cv_lib_lex in #( +! 'none needed') : +! ;; #( +! 'not found') : +! break ;; #( +! *) : +! LIBS="$ac_cv_lib_lex $ac_save_LIBS" ;; #( +! *) : +! ;; +! esac + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + `cat $LEX_OUTPUT_ROOT.c` + _ACEOF +! if ac_fn_c_try_link "$LINENO" +! then : +! ac_found=: + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +! if $ac_found; then +! break +! fi + done +! LIBS="$ac_save_LIBS" +! ;; +! esac +! fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +! printf "%s\n" "$ac_cv_lib_lex" >&6; } +! if test "$ac_cv_lib_lex" = 'not found' +! then : +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: required lex library not found; giving up on $LEX" >&5 +! printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LEX" >&2;} +! LEX=: LEXLIB= +! elif test "$ac_cv_lib_lex" = 'none needed' +! then : +! LEXLIB='' +! else case e in #( +! e) LEXLIB=$ac_cv_lib_lex ;; +! esac +! fi +! ac_save_LIBS="$LIBS" +! LIBS= +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing yywrap" >&5 +! printf %s "checking for library containing yywrap... " >&6; } +! if test ${ac_cv_search_yywrap+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) ac_func_search_save_LIBS=$LIBS +! cat confdefs.h - <<_ACEOF >conftest.$ac_ext +! /* end confdefs.h. */ +! +! /* Override any GCC internal prototype to avoid an error. +! Use char because int might match the return type of a GCC +! builtin and then its argument prototype would still apply. +! The 'extern "C"' is for builds by C++ compilers; +! although this is not generally supported in C code supporting it here +! has little cost and some practical benefit (sr 110532). */ +! #ifdef __cplusplus +! extern "C" +! #endif +! char yywrap (void); +! int +! main (void) +! { +! return yywrap (); +! ; +! return 0; +! } +! _ACEOF +! for ac_lib in '' fl l +! do +! if test -z "$ac_lib"; then +! ac_res="none required" +! else +! ac_res=-l$ac_lib +! LIBS="-l$ac_lib $ac_func_search_save_LIBS" +! fi +! if ac_fn_c_try_link "$LINENO" +! then : +! ac_cv_search_yywrap=$ac_res +! fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam \ +! conftest$ac_exeext +! if test ${ac_cv_search_yywrap+y} +! then : +! break +! fi +! done +! if test ${ac_cv_search_yywrap+y} +! then : + ++ else case e in #( ++ e) ac_cv_search_yywrap=no ;; ++ esac ++ fi ++ rm conftest.$ac_ext ++ LIBS=$ac_func_search_save_LIBS ;; ++ esac ++ fi ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yywrap" >&5 ++ printf "%s\n" "$ac_cv_search_yywrap" >&6; } ++ ac_res=$ac_cv_search_yywrap ++ if test "$ac_res" != no ++ then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ LEXLIB="$LIBS" + fi +! +! LIBS="$ac_save_LIBS" ;; +! esac + fi + + +! if test "$LEX" != : +! then : +! +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +! printf %s "checking whether yytext is a pointer... " >&6; } +! if test ${ac_cv_prog_lex_yytext_pointer+y} +! then : +! printf %s "(cached) " >&6 +! else case e in #( +! e) # POSIX says lex can declare yytext either as a pointer or an array; the + # default is implementation-dependent. Figure out which it is, since + # not all implementations provide the %pointer and %array declarations. + ac_cv_prog_lex_yytext_pointer=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #define YYTEXT_POINTER 1 + `cat $LEX_OUTPUT_ROOT.c` + _ACEOF +! if ac_fn_c_try_compile "$LINENO" +! then : + ac_cv_prog_lex_yytext_pointer=yes + fi +! rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +! ;; +! esac + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +! printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } + if test $ac_cv_prog_lex_yytext_pointer = yes; then + +! printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h +! +! fi + + fi + rm -f conftest.l $LEX_OUTPUT_ROOT.c +*************** +*** 28042,28049 **** + # config.status only pays attention to the cache file if you give it + # the --recheck option to rerun configure. + # +! # `ac_cv_env_foo' variables (set or unset) will be overridden when +! # loading this file, other *unset* `ac_cv_foo' will be assigned the + # following values. + + _ACEOF +--- 31613,31620 ---- + # config.status only pays attention to the cache file if you give it + # the --recheck option to rerun configure. + # +! # 'ac_cv_env_foo' variables (set or unset) will be overridden when +! # loading this file, other *unset* 'ac_cv_foo' will be assigned the + # following values. + + _ACEOF +*************** +*** 28059,28066 **** + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +! *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +--- 31630,31637 ---- + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +! *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +! printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +*************** +*** 28073,28086 **** + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +! # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) +! # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | +--- 31644,31657 ---- + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +! # 'set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) +! # 'set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | +*************** +*** 28090,28104 **** + /^ac_cv_env_/b end + t clear + :clear +! s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +! $as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else +--- 31661,31675 ---- + /^ac_cv_env_/b end + t clear + :clear +! s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +! printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else +*************** +*** 28112,28119 **** + fi + fi + else +! { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +! $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +--- 31683,31690 ---- + fi + fi + else +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +! printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +*************** +*** 28130,28136 **** + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +! ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" +--- 31701,31707 ---- + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +! ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" +*************** +*** 28141,28154 **** + LTLIBOBJS=$ac_ltlibobjs + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +! $as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi +! { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +! $as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +--- 31712,31737 ---- + LTLIBOBJS=$ac_ltlibobjs + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +! printf %s "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +! printf "%s\n" "done" >&6; } +! case $enable_silent_rules in # ((( +! yes) AM_DEFAULT_VERBOSITY=0;; +! no) AM_DEFAULT_VERBOSITY=1;; +! esac +! if test $am_cv_make_support_nested_variables = yes; then +! AM_V='$(V)' +! AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +! else +! AM_V=$AM_DEFAULT_VERBOSITY +! AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +! fi +! + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +*************** +*** 28175,28182 **** + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +! { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +! $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} + as_write_fail=0 + cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL +--- 31758,31765 ---- + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +! printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} + as_write_fail=0 + cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL +*************** +*** 28199,28261 **** + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +! if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +! else +! case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; + esac + fi + + + as_nl=' + ' + export as_nl +! # Printing a long string crashes Solaris 7 /usr/bin/printf. +! as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +! as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +! as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +! # Prefer a ksh shell builtin over an external printf program on Solaris, +! # but without wasting forks for bash or zsh. +! if test -z "$BASH_VERSION$ZSH_VERSION" \ +! && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then +! as_echo='print -r --' +! as_echo_n='print -rn --' +! elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +! as_echo='printf %s\n' +! as_echo_n='printf %s' +! else +! if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +! as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +! as_echo_n='/usr/ucb/echo -n' +! else +! as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +! as_echo_n_body='eval +! arg=$1; +! case $arg in #( +! *"$as_nl"*) +! expr "X$arg" : "X\\(.*\\)$as_nl"; +! arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +! esac; +! expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +! ' +! export as_echo_n_body +! as_echo_n='sh -c $as_echo_n_body as_echo' +! fi +! export as_echo_body +! as_echo='sh -c $as_echo_body as_echo' +! fi + + # The user is always right. +! if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +--- 31782,31846 ---- + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +! if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +! then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +! else case e in #( +! e) case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; ++ esac ;; + esac + fi + + ++ ++ # Reset variables that may have inherited troublesome values from ++ # the environment. ++ ++ # IFS needs to be set, to space, tab, and newline, in precisely that order. ++ # (If _AS_PATH_WALK were called with IFS unset, it would have the ++ # side effect of setting IFS to empty, thus disabling word splitting.) ++ # Quoting is to prevent editors from complaining about space-tab. + as_nl=' + ' + export as_nl +! IFS=" "" $as_nl" +! +! PS1='$ ' +! PS2='> ' +! PS4='+ ' +! +! # Ensure predictable behavior from utilities with locale-dependent output. +! LC_ALL=C +! export LC_ALL +! LANGUAGE=C +! export LANGUAGE +! +! # We cannot yet rely on "unset" to work, but we need these variables +! # to be unset--not just set to an empty or harmless value--now, to +! # avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +! # also avoids known problems related to "unset" and subshell syntax +! # in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +! for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +! do eval test \${$as_var+y} \ +! && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +! done +! +! # Ensure that fds 0, 1, and 2 are open. +! if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +! if (exec 3>&2) ; then :; else exec 2>/dev/null; fi + + # The user is always right. +! if ${PATH_SEPARATOR+false} :; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +*************** +*** 28264,28276 **** + fi + + +- # IFS +- # We need space, tab and new line, in precisely that order. Quoting is +- # there to prevent editors from complaining about space-tab. +- # (If _AS_PATH_WALK were called with IFS unset, it would disable word +- # splitting by setting IFS to empty value.) +- IFS=" "" $as_nl" +- + # Find who we are. Look in the path if we contain no directory separator. + as_myself= + case $0 in #(( +--- 31849,31854 ---- +*************** +*** 28279,28321 **** + for as_dir in $PATH + do + IFS=$as_save_IFS +! test -z "$as_dir" && as_dir=. +! test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done + IFS=$as_save_IFS + + ;; + esac +! # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +! $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 + fi + +- # Unset variables that we do not need and which cause bugs (e.g. in +- # pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +- # suppresses any "Segmentation fault" message there. '((' could +- # trigger a bug in pdksh 5.2.14. +- for as_var in BASH_ENV ENV MAIL MAILPATH +- do eval test x\${$as_var+set} = xset \ +- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +- done +- PS1='$ ' +- PS2='> ' +- PS4='+ ' +- +- # NLS nuisances. +- LC_ALL=C +- export LC_ALL +- LANGUAGE=C +- export LANGUAGE +- +- # CDPATH. +- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + + # as_fn_error STATUS ERROR [LINENO LOG_FD] +--- 31857,31883 ---- + for as_dir in $PATH + do + IFS=$as_save_IFS +! case $as_dir in #((( +! '') as_dir=./ ;; +! */) ;; +! *) as_dir=$as_dir/ ;; +! esac +! test -r "$as_dir$0" && as_myself=$as_dir$0 && break + done + IFS=$as_save_IFS + + ;; + esac +! # We did not find ourselves, most probably we were run as 'sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +! printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 + fi + + + + # as_fn_error STATUS ERROR [LINENO LOG_FD] +*************** +*** 28328,28336 **** + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +! $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +--- 31890,31898 ---- + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +! printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi +! printf "%s\n" "$as_me: error: $2" >&2 + as_fn_exit $as_status + } # as_fn_error + +*************** +*** 28361,28382 **** + { eval $1=; unset $1;} + } + as_unset=as_fn_unset + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take + # advantage of any shell optimizations that allow amortized linear growth over + # repeated appends, instead of the typical quadratic growth present in naive + # implementations. +! if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +! else +! as_fn_append () + { + eval $1=\$$1\$2 +! } + fi # as_fn_append + + # as_fn_arith ARG... +--- 31923,31947 ---- + { eval $1=; unset $1;} + } + as_unset=as_fn_unset ++ + # as_fn_append VAR VALUE + # ---------------------- + # Append the text in VALUE to the end of the definition contained in VAR. Take + # advantage of any shell optimizations that allow amortized linear growth over + # repeated appends, instead of the typical quadratic growth present in naive + # implementations. +! if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +! then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +! else case e in #( +! e) as_fn_append () + { + eval $1=\$$1\$2 +! } ;; +! esac + fi # as_fn_append + + # as_fn_arith ARG... +*************** +*** 28384,28399 **** + # Perform arithmetic evaluation on the ARGs, and store the result in the + # global $as_val. Take advantage of shells that can avoid forks. The arguments + # must be portable across $(()) and expr. +! if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +! else +! as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` +! } + fi # as_fn_arith + + +--- 31949,31966 ---- + # Perform arithmetic evaluation on the ARGs, and store the result in the + # global $as_val. Take advantage of shells that can avoid forks. The arguments + # must be portable across $(()) and expr. +! if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +! then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +! else case e in #( +! e) as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` +! } ;; +! esac + fi # as_fn_arith + + +*************** +*** 28420,28426 **** + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +--- 31987,31993 ---- + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +*************** +*** 28442,28447 **** +--- 32009,32018 ---- + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + ++ ++ # Determine whether it's possible to make 'echo' print without a newline. ++ # These variables are no longer used directly by Autoconf, but are AC_SUBSTed ++ # for compatibility with existing Makefiles. + ECHO_C= ECHO_N= ECHO_T= + case `echo -n x` in #((((( + -n*) +*************** +*** 28455,28460 **** +--- 32026,32037 ---- + ECHO_N='-n';; + esac + ++ # For backward compatibility with old third-party macros, we provide ++ # the shell variables $as_echo and $as_echo_n. New code should use ++ # AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++ + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +*************** +*** 28466,28474 **** + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: +! # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +! # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +! # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then +--- 32043,32051 ---- + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: +! # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. +! # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. +! # In both cases, we have to default to 'cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then +*************** +*** 28496,28502 **** + as_dirs= + while :; do + case $as_dir in #( +! *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +--- 32073,32079 ---- + as_dirs= + while :; do + case $as_dir in #( +! *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +*************** +*** 28505,28511 **** + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +--- 32082,32088 ---- + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +*************** +*** 28549,28558 **** + as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. +! as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + + # Sed expression to map a string onto a valid variable name. +! as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + exec 6>&1 +--- 32126,32137 ---- + as_executable_p=as_fn_executable_p + + # Sed expression to map a string onto a valid CPP name. +! as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +! as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated + + # Sed expression to map a string onto a valid variable name. +! as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +! as_tr_sh="eval sed '$as_sed_sh'" # deprecated + + + exec 6>&1 +*************** +*** 28568,28574 **** + # values after options handling. + ac_log=" + This file was extended by GNU MP $as_me 6.3.0, which was +! generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +--- 32147,32153 ---- + # values after options handling. + ac_log=" + This file was extended by GNU MP $as_me 6.3.0, which was +! generated by GNU Autoconf 2.72. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +*************** +*** 28601,28607 **** + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +! \`$as_me' instantiates files and other configuration actions + from templates according to the current configuration. Unless the files + and actions are specified as TAGs, all are instantiated by default. + +--- 32180,32186 ---- + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +! '$as_me' instantiates files and other configuration actions + from templates according to the current configuration. Unless the files + and actions are specified as TAGs, all are instantiated by default. + +*************** +*** 28632,28649 **** + $config_commands + + Report bugs to . +! GNU MP home page: . +! General help using GNU software: ." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +! ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + GNU MP config.status 6.3.0 +! configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +! Copyright (C) 2012 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +--- 32211,32230 ---- + $config_commands + + Report bugs to . +! GNU MP home page: . +! General help using GNU software: ." + + _ACEOF ++ ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` ++ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +! ac_cs_config='$ac_cs_config_escaped' + ac_cs_version="\\ + GNU MP config.status 6.3.0 +! configured by $0, generated by GNU Autoconf 2.72, + with options \\"\$ac_cs_config\\" + +! Copyright (C) 2023 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +*************** +*** 28683,28697 **** + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +! $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) +! $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in +! *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" +--- 32264,32278 ---- + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +! printf "%s\n" "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) +! printf "%s\n" "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in +! *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" +*************** +*** 28699,28721 **** + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in +! *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +! as_fn_error $? "ambiguous option: \`$1' +! Try \`$0 --help' for more information.";; + --help | --hel | -h ) +! $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +! -*) as_fn_error $? "unrecognized option: \`$1' +! Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; +--- 32280,32302 ---- + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in +! *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +! as_fn_error $? "ambiguous option: '$1' +! Try '$0 --help' for more information.";; + --help | --hel | -h ) +! printf "%s\n" "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. +! -*) as_fn_error $? "unrecognized option: '$1' +! Try '$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; +*************** +*** 28736,28742 **** + if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift +! \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +--- 32317,32323 ---- + if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift +! \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +*************** +*** 28750,28756 **** + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +! $as_echo "$ac_log" + } >&5 + + _ACEOF +--- 32331,32337 ---- + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +! printf "%s\n" "$ac_log" + } >&5 + + _ACEOF +*************** +*** 28776,28781 **** +--- 32357,32364 ---- + enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' + enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' + pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' ++ enable_cxx_stdlib='`$ECHO "$enable_cxx_stdlib" | $SED "$delay_single_quote_subst"`' ++ stdlibflag='`$ECHO "$stdlibflag" | $SED "$delay_single_quote_subst"`' + enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' + shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' + SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +*************** +*** 28804,28815 **** +--- 32387,32400 ---- + lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' + reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' + reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' ++ FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' + deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' + file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' + file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' + want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' + sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' + AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' ++ lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' + AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' + archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' + STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +*************** +*** 28987,28999 **** + lt_SP2NL \ + lt_NL2SP \ + reload_flag \ + deplibs_check_method \ + file_magic_cmd \ + file_magic_glob \ + want_nocaseglob \ + sharedlib_from_linklib_cmd \ + AR \ +- AR_FLAGS \ + archiver_list_spec \ + STRIP \ + RANLIB \ +--- 32572,32584 ---- + lt_SP2NL \ + lt_NL2SP \ + reload_flag \ ++ FILECMD \ + deplibs_check_method \ + file_magic_cmd \ + file_magic_glob \ + want_nocaseglob \ + sharedlib_from_linklib_cmd \ + AR \ + archiver_list_spec \ + STRIP \ + RANLIB \ +*************** +*** 29183,29189 **** + "gmp.pc") CONFIG_FILES="$CONFIG_FILES gmp.pc:gmp.pc.in" ;; + "gmpxx.pc") CONFIG_FILES="$CONFIG_FILES gmpxx.pc:gmpxx.pc.in" ;; + +! *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +--- 32768,32774 ---- + "gmp.pc") CONFIG_FILES="$CONFIG_FILES gmp.pc:gmp.pc.in" ;; + "gmpxx.pc") CONFIG_FILES="$CONFIG_FILES gmpxx.pc:gmpxx.pc.in" ;; + +! *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + esac + done + +*************** +*** 29193,29202 **** + # We use the long form for the default assignment because of an extremely + # bizarre bug on SunOS 4.1.3. + if $ac_need_defaults; then +! test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +! test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +! test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links +! test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + fi + + # Have a temporary directory for convenience. Make it in the build tree +--- 32778,32787 ---- + # We use the long form for the default assignment because of an extremely + # bizarre bug on SunOS 4.1.3. + if $ac_need_defaults; then +! test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files +! test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers +! test ${CONFIG_LINKS+y} || CONFIG_LINKS=$config_links +! test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands + fi + + # Have a temporary directory for convenience. Make it in the build tree +*************** +*** 29204,29210 **** + # creating and moving files from /tmp can sometimes cause problems. + # Hook for its removal unless debugging. + # Note that there is a small window in which the directory will not be cleaned: +! # after its creation but before its name has been assigned to `$tmp'. + $debug || + { + tmp= ac_tmp= +--- 32789,32795 ---- + # creating and moving files from /tmp can sometimes cause problems. + # Hook for its removal unless debugging. + # Note that there is a small window in which the directory will not be cleaned: +! # after its creation but before its name has been assigned to '$tmp'. + $debug || + { + tmp= ac_tmp= +*************** +*** 29228,29234 **** + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +! # This happens for instance with `./config.status config.h'. + if test -n "$CONFIG_FILES"; then + + +--- 32813,32819 ---- + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +! # This happens for instance with './config.status config.h'. + if test -n "$CONFIG_FILES"; then + + +*************** +*** 29386,29398 **** + + # Set up the scripts for CONFIG_HEADERS section. + # No need to generate them if there are no CONFIG_HEADERS. +! # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then + cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +! # Transform confdefs.h into an awk script `defines.awk', embedded as + # here-document in config.status, that substitutes the proper values into + # config.h.in to produce config.h. + +--- 32971,32983 ---- + + # Set up the scripts for CONFIG_HEADERS section. + # No need to generate them if there are no CONFIG_HEADERS. +! # This happens for instance with './config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then + cat >"$ac_tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +! # Transform confdefs.h into an awk script 'defines.awk', embedded as + # here-document in config.status, that substitutes the proper values into + # config.h.in to produce config.h. + +*************** +*** 29502,29508 **** + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +! :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +--- 33087,33093 ---- + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +! :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +*************** +*** 29524,29556 **** + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, +! # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +! as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac +! case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + +! # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` +! $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +! { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +! $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) +! ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac +--- 33109,33141 ---- + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, +! # because $ac_f cannot contain ':'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +! as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + esac +! case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + +! # Let's still pretend it is 'configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` +! printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +! printf "%s\n" "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) +! ac_sed_conf_input=`printf "%s\n" "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac +*************** +*** 29567,29573 **** + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +--- 33152,33158 ---- + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +*************** +*** 29591,29599 **** + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +! ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +! ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +--- 33176,33184 ---- + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +! ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. +! ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +*************** +*** 29655,29662 **** + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +! $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' +--- 33240,33247 ---- + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +! printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' +*************** +*** 29669,29675 **** + esac + _ACEOF + +! # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +--- 33254,33260 ---- + esac + _ACEOF + +! # Neutralize VPATH when '$srcdir' = '.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +*************** +*** 29700,29708 **** + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined" >&5 +! $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" +--- 33285,33293 ---- + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + which seems to be undefined. Please make sure it is defined" >&5 +! printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' + which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" +*************** +*** 29718,29737 **** + # + if test x"$ac_file" != x-; then + { +! $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +! $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else +! $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +--- 33303,33322 ---- + # + if test x"$ac_file" != x-; then + { +! printf "%s\n" "/* $configure_input */" >&1 \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +! printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else +! printf "%s\n" "/* $configure_input */" >&1 \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +*************** +*** 29751,29757 **** + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +! $as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +--- 33336,33342 ---- + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +! printf "%s\n" X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +*************** +*** 29783,29790 **** + ac_source=$srcdir/$ac_source + fi + +! { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +! $as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + as_fn_error $? "$ac_source: file not found" "$LINENO" 5 +--- 33368,33375 ---- + ac_source=$srcdir/$ac_source + fi + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +! printf "%s\n" "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + as_fn_error $? "$ac_source: file not found" "$LINENO" 5 +*************** +*** 29802,29809 **** + as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; +! :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +! $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +--- 33387,33394 ---- + as_fn_error $? "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; +! :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +! printf "%s\n" "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +*************** +*** 29824,29842 **** + cat <<_LT_EOF >> "$cfgfile" + #! $SHELL + # Generated automatically by $as_me ($PACKAGE) $VERSION +- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + + # Provide generalized library-building support services. + # Written by Gordon Matzigkeit, 1996 + +! # Copyright (C) 2014 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # GNU Libtool is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +! # the Free Software Foundation; either version 2 of of the License, or + # (at your option) any later version. + # + # As a special exception to the GNU General Public License, if you +--- 33409,33426 ---- + cat <<_LT_EOF >> "$cfgfile" + #! $SHELL + # Generated automatically by $as_me ($PACKAGE) $VERSION + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + + # Provide generalized library-building support services. + # Written by Gordon Matzigkeit, 1996 + +! # Copyright (C) 2025 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # GNU Libtool is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +! # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # + # As a special exception to the GNU General Public License, if you +*************** +*** 29886,29891 **** +--- 33470,33481 ---- + # What type of objects to build. + pic_mode=$pic_mode + ++ # Whether to let the compiler frontend decide what standard libraries to link when building C++ shared libraries and modules. ++ enable_cxx_stdlib=$enable_cxx_stdlib ++ ++ # Flag used for specifying not to link standard libraries. ++ stdlibflag=$stdlibflag ++ + # Whether or not to optimize for fast installation. + fast_install=$enable_fast_install + +*************** +*** 29953,29958 **** +--- 33543,33551 ---- + # convert \$build files to toolchain format. + to_tool_file_cmd=$lt_cv_to_tool_file_cmd + ++ # A file(cmd) program that detects file types. ++ FILECMD=$lt_FILECMD ++ + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method + +*************** +*** 29971,29978 **** + # The archiver. + AR=$lt_AR + + # Flags to create an archive. +! AR_FLAGS=$lt_AR_FLAGS + + # How to feed a file listing to the archiver. + archiver_list_spec=$lt_archiver_list_spec +--- 33564,33574 ---- + # The archiver. + AR=$lt_AR + ++ # Flags to create an archive (by configure). ++ lt_ar_flags=$lt_ar_flags ++ + # Flags to create an archive. +! AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} + + # How to feed a file listing to the archiver. + archiver_list_spec=$lt_archiver_list_spec +*************** +*** 30214,30220 **** + + # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes + # DIR into the resulting binary and the resulting library dependency is +! # "absolute",i.e impossible to change by setting \$shlibpath_var if the + # library is relocated. + hardcode_direct_absolute=$hardcode_direct_absolute + +--- 33810,33816 ---- + + # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes + # DIR into the resulting binary and the resulting library dependency is +! # "absolute",i.e. impossible to change by setting \$shlibpath_var if the + # library is relocated. + hardcode_direct_absolute=$hardcode_direct_absolute + +*************** +*** 30361,30367 **** + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +! sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || +--- 33958,33964 ---- + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? +! $SED '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || +*************** +*** 30456,30462 **** + + # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes + # DIR into the resulting binary and the resulting library dependency is +! # "absolute",i.e impossible to change by setting \$shlibpath_var if the + # library is relocated. + hardcode_direct_absolute=$hardcode_direct_absolute_CXX + +--- 34053,34059 ---- + + # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes + # DIR into the resulting binary and the resulting library dependency is +! # "absolute",i.e. impossible to change by setting \$shlibpath_var if the + # library is relocated. + hardcode_direct_absolute=$hardcode_direct_absolute_CXX + +*************** +*** 30556,30567 **** + $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + + +! { $as_echo "$as_me:${as_lineno-$LINENO}: summary of build options: + + Version: ${PACKAGE_STRING} + Host type: ${host} +--- 34153,34164 ---- + $ac_cs_success || as_fn_exit 1 + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +! printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + + +! { printf "%s\n" "$as_me:${as_lineno-$LINENO}: summary of build options: + + Version: ${PACKAGE_STRING} + Host type: ${host} +*************** +*** 30571,30577 **** + Static libraries: ${enable_static} + Shared libraries: ${enable_shared} + " >&5 +! $as_echo "$as_me: summary of build options: + + Version: ${PACKAGE_STRING} + Host type: ${host} +--- 34168,34174 ---- + Static libraries: ${enable_static} + Shared libraries: ${enable_shared} + " >&5 +! printf "%s\n" "$as_me: summary of build options: + + Version: ${PACKAGE_STRING} + Host type: ${host} +Only in gmp-6.3.0: configure~ +diff -crB gmp-6.3.0-orig/configure.ac gmp-6.3.0/configure.ac +*** gmp-6.3.0-orig/configure.ac 2023-07-29 16:42:16.000000000 +0300 +--- gmp-6.3.0/configure.ac 2025-08-28 16:19:44.988777797 +0300 +*************** +*** 2989,2995 **** + # __gmp_replacement_vsnprintf which is not required on AIX since it has a + # vsnprintf. + # +! AC_CHECK_FUNCS(alarm attr_get clock cputime getpagesize getrusage gettimeofday getsysinfo localeconv memset mmap mprotect nl_langinfo obstack_vprintf popen processor_info pstat_getprocessor raise read_real_time sigaction sigaltstack sigstack syssgi strchr strerror strnlen strtol strtoul sysconf sysctl sysctlbyname times) + + # clock_gettime is in librt on *-*-osf5.1 and on glibc, so att -lrt to + # TUNE_LIBS if needed. On linux (tested on x86_32, 2.6.26), +--- 2989,2995 ---- + # __gmp_replacement_vsnprintf which is not required on AIX since it has a + # vsnprintf. + # +! AC_CHECK_FUNCS(alarm attr_get clock cputime getpagesize getrusage gettimeofday getsysinfo localeconv memset mmap mprotect nl_langinfo popen processor_info pstat_getprocessor raise read_real_time sigaction sigaltstack sigstack syssgi strchr strerror strnlen strtol strtoul sysconf sysctl sysctlbyname times) + + # clock_gettime is in librt on *-*-osf5.1 and on glibc, so att -lrt to + # TUNE_LIBS if needed. On linux (tested on x86_32, 2.6.26), +diff -crB gmp-6.3.0-orig/cxx/Makefile.in gmp-6.3.0/cxx/Makefile.in +*** gmp-6.3.0-orig/cxx/Makefile.in 2023-07-29 16:42:23.000000000 +0300 +--- gmp-6.3.0/cxx/Makefile.in 2025-08-28 16:19:50.882268235 +0300 +*************** +*** 1,7 **** +! # Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 1,7 ---- +! # Makefile.in generated by automake 1.18.1 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2025 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 98,103 **** +--- 98,105 ---- + test $$has_opt = yes + am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ++ am__rm_f = rm -f $(am__rm_f_notfound) ++ am__rm_rf = rm -rf $(am__rm_f_notfound) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +*************** +*** 151,157 **** + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__depfiles_maybe = + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ +--- 153,159 ---- + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__maybe_remake_depfiles = + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ +*************** +*** 194,201 **** + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +- ETAGS = etags +- CTAGS = ctags + am__DIST_COMMON = $(srcdir)/Makefile.in + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ABI = @ABI@ +--- 196,201 ---- +*************** +*** 217,222 **** +--- 217,224 ---- + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++ CSCOPE = @CSCOPE@ ++ CTAGS = @CTAGS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXFLAGS = @CXXFLAGS@ +*************** +*** 230,238 **** +--- 232,242 ---- + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ ETAGS = @ETAGS@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ + FGREP = @FGREP@ ++ FILECMD = @FILECMD@ + GMP_LDFLAGS = @GMP_LDFLAGS@ + GMP_LIMB_BITS = @GMP_LIMB_BITS@ + GMP_NAIL_BITS = @GMP_NAIL_BITS@ +*************** +*** 314,321 **** +--- 318,327 ---- + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__leading_dot = @am__leading_dot@ ++ am__rm_f_notfound = @am__rm_f_notfound@ + am__tar = @am__tar@ + am__untar = @am__untar@ ++ am__xargs_n = @am__xargs_n@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +*************** +*** 351,356 **** +--- 357,363 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++ runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +*************** +*** 386,393 **** + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +--- 393,400 ---- + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +*************** +*** 400,414 **** + $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: +! -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ +! test -z "$$locs" || { \ +! echo rm -f $${locs}; \ +! rm -f $${locs}; \ +! } + + libcxx.la: $(libcxx_la_OBJECTS) $(libcxx_la_DEPENDENCIES) $(EXTRA_libcxx_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libcxx_la_rpath) $(libcxx_la_OBJECTS) $(libcxx_la_LIBADD) $(LIBS) +--- 407,419 ---- + $(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: +! -$(am__rm_f) $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ +! echo rm -f $${locs}; \ +! $(am__rm_f) $${locs} + + libcxx.la: $(libcxx_la_OBJECTS) $(libcxx_la_DEPENDENCIES) $(EXTRA_libcxx_la_DEPENDENCIES) + $(AM_V_CXXLD)$(CXXLINK) $(am_libcxx_la_rpath) $(libcxx_la_OBJECTS) $(libcxx_la_LIBADD) $(LIBS) +*************** +*** 486,492 **** + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +--- 491,500 ---- + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(BUILT_SOURCES) +! $(MAKE) $(AM_MAKEFLAGS) distdir-am +! +! distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +*************** +*** 544,551 **** + clean-generic: + + distclean-generic: +! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +--- 552,559 ---- + clean-generic: + + distclean-generic: +! -$(am__rm_f) $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +*************** +*** 641,643 **** +--- 649,658 ---- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++ # Tell GNU make to disable its built-in pattern rules. ++ %:: %,v ++ %:: RCS/%,v ++ %:: RCS/% ++ %:: s.% ++ %:: SCCS/s.% +diff -crB gmp-6.3.0-orig/demos/calc/Makefile.in gmp-6.3.0/demos/calc/Makefile.in +*** gmp-6.3.0-orig/demos/calc/Makefile.in 2023-07-29 16:42:23.000000000 +0300 +--- gmp-6.3.0/demos/calc/Makefile.in 2025-08-28 16:19:50.901452648 +0300 +*************** +*** 1,7 **** +! # Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 1,7 ---- +! # Makefile.in generated by automake 1.18.1 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2025 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 97,102 **** +--- 97,104 ---- + test $$has_opt = yes + am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ++ am__rm_f = rm -f $(am__rm_f_notfound) ++ am__rm_rf = rm -rf $(am__rm_f_notfound) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +*************** +*** 151,157 **** + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__depfiles_maybe = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +--- 153,159 ---- + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__maybe_remake_depfiles = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +*************** +*** 213,220 **** + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +- ETAGS = etags +- CTAGS = ctags + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/calc-config-h.in \ + $(top_srcdir)/ylwrap README calc.c calc.h calclex.c + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +--- 215,220 ---- +*************** +*** 237,242 **** +--- 237,244 ---- + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++ CSCOPE = @CSCOPE@ ++ CTAGS = @CTAGS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXFLAGS = @CXXFLAGS@ +*************** +*** 250,258 **** +--- 252,262 ---- + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ ETAGS = @ETAGS@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ + FGREP = @FGREP@ ++ FILECMD = @FILECMD@ + GMP_LDFLAGS = @GMP_LDFLAGS@ + GMP_LIMB_BITS = @GMP_LIMB_BITS@ + GMP_NAIL_BITS = @GMP_NAIL_BITS@ +*************** +*** 334,341 **** +--- 338,347 ---- + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__leading_dot = @am__leading_dot@ ++ am__rm_f_notfound = @am__rm_f_notfound@ + am__tar = @am__tar@ + am__untar = @am__untar@ ++ am__xargs_n = @am__xargs_n@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +*************** +*** 371,376 **** +--- 377,383 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++ runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +*************** +*** 412,419 **** + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +--- 419,426 ---- + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +*************** +*** 513,519 **** + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +--- 520,529 ---- + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(BUILT_SOURCES) +! $(MAKE) $(AM_MAKEFLAGS) distdir-am +! +! distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +*************** +*** 550,556 **** + installdirs: + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +! install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am + +--- 560,567 ---- + installdirs: + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +! install-exec: $(BUILT_SOURCES) +! $(MAKE) $(AM_MAKEFLAGS) install-exec-am + install-data: install-data-am + uninstall: uninstall-am + +*************** +*** 571,589 **** + mostlyclean-generic: + + clean-generic: +! -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +! -rm -f calc.c +! -rm -f calc.h +! -rm -f calclex.c +! -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-am + + clean-am: clean-generic clean-libtool mostlyclean-am +--- 582,600 ---- + mostlyclean-generic: + + clean-generic: +! -$(am__rm_f) $(CLEANFILES) + + distclean-generic: +! -$(am__rm_f) $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +! -$(am__rm_f) $(BUILT_SOURCES) +! -$(am__rm_f) calc.c +! -$(am__rm_f) calc.h +! -$(am__rm_f) calclex.c + clean: clean-am + + clean-am: clean-generic clean-libtool mostlyclean-am +*************** +*** 652,658 **** + + uninstall-am: + +! .MAKE: all check install install-am install-strip + + .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ +--- 663,669 ---- + + uninstall-am: + +! .MAKE: all check install install-am install-exec install-strip + + .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ +*************** +*** 675,677 **** +--- 686,695 ---- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++ # Tell GNU make to disable its built-in pattern rules. ++ %:: %,v ++ %:: RCS/%,v ++ %:: RCS/% ++ %:: s.% ++ %:: SCCS/s.% +diff -crB gmp-6.3.0-orig/demos/expr/Makefile.in gmp-6.3.0/demos/expr/Makefile.in +*** gmp-6.3.0-orig/demos/expr/Makefile.in 2023-07-29 16:42:23.000000000 +0300 +--- gmp-6.3.0/demos/expr/Makefile.in 2025-08-28 16:19:50.910247528 +0300 +*************** +*** 1,7 **** +! # Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 1,7 ---- +! # Makefile.in generated by automake 1.18.1 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2025 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 97,102 **** +--- 97,104 ---- + test $$has_opt = yes + am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ++ am__rm_f = rm -f $(am__rm_f_notfound) ++ am__rm_rf = rm -rf $(am__rm_f_notfound) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +*************** +*** 132,137 **** +--- 134,140 ---- + am__v_AR_0 = @echo " AR " $@; + am__v_AR_1 = + libexpr_a_AR = $(AR) $(ARFLAGS) ++ libexpr_a_RANLIB = $(RANLIB) + libexpr_a_LIBADD = + am_libexpr_a_OBJECTS = expr.$(OBJEXT) exprv.$(OBJEXT) exprz.$(OBJEXT) \ + exprza.$(OBJEXT) exprq.$(OBJEXT) exprqa.$(OBJEXT) \ +*************** +*** 162,168 **** + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__depfiles_maybe = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +--- 165,171 ---- + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__maybe_remake_depfiles = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +*************** +*** 205,212 **** + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +- ETAGS = etags +- CTAGS = ctags + am__DIST_COMMON = $(srcdir)/Makefile.in README + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ABI = @ABI@ +--- 208,213 ---- +*************** +*** 228,233 **** +--- 229,236 ---- + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++ CSCOPE = @CSCOPE@ ++ CTAGS = @CTAGS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXFLAGS = @CXXFLAGS@ +*************** +*** 241,249 **** +--- 244,254 ---- + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ ETAGS = @ETAGS@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ + FGREP = @FGREP@ ++ FILECMD = @FILECMD@ + GMP_LDFLAGS = @GMP_LDFLAGS@ + GMP_LIMB_BITS = @GMP_LIMB_BITS@ + GMP_NAIL_BITS = @GMP_NAIL_BITS@ +*************** +*** 325,332 **** +--- 330,339 ---- + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__leading_dot = @am__leading_dot@ ++ am__rm_f_notfound = @am__rm_f_notfound@ + am__tar = @am__tar@ + am__untar = @am__untar@ ++ am__xargs_n = @am__xargs_n@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +*************** +*** 362,367 **** +--- 369,375 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++ runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +*************** +*** 406,413 **** + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +--- 414,421 ---- + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +*************** +*** 422,428 **** + libexpr.a: $(libexpr_a_OBJECTS) $(libexpr_a_DEPENDENCIES) $(EXTRA_libexpr_a_DEPENDENCIES) + $(AM_V_at)-rm -f libexpr.a + $(AM_V_AR)$(libexpr_a_AR) libexpr.a $(libexpr_a_OBJECTS) $(libexpr_a_LIBADD) +! $(AM_V_at)$(RANLIB) libexpr.a + + run-expr$(EXEEXT): $(run_expr_OBJECTS) $(run_expr_DEPENDENCIES) $(EXTRA_run_expr_DEPENDENCIES) + @rm -f run-expr$(EXEEXT) +--- 430,436 ---- + libexpr.a: $(libexpr_a_OBJECTS) $(libexpr_a_DEPENDENCIES) $(EXTRA_libexpr_a_DEPENDENCIES) + $(AM_V_at)-rm -f libexpr.a + $(AM_V_AR)$(libexpr_a_AR) libexpr.a $(libexpr_a_OBJECTS) $(libexpr_a_LIBADD) +! $(AM_V_at)$(libexpr_a_RANLIB) libexpr.a + + run-expr$(EXEEXT): $(run_expr_OBJECTS) $(run_expr_DEPENDENCIES) $(EXTRA_run_expr_DEPENDENCIES) + @rm -f run-expr$(EXEEXT) +*************** +*** 505,511 **** + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +--- 513,522 ---- + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(BUILT_SOURCES) +! $(MAKE) $(AM_MAKEFLAGS) distdir-am +! +! distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +*************** +*** 561,571 **** + mostlyclean-generic: + + clean-generic: +! -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +--- 572,582 ---- + mostlyclean-generic: + + clean-generic: +! -$(am__rm_f) $(CLEANFILES) + + distclean-generic: +! -$(am__rm_f) $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +*************** +*** 664,666 **** +--- 675,684 ---- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++ # Tell GNU make to disable its built-in pattern rules. ++ %:: %,v ++ %:: RCS/%,v ++ %:: RCS/% ++ %:: s.% ++ %:: SCCS/s.% +diff -crB gmp-6.3.0-orig/demos/Makefile.in gmp-6.3.0/demos/Makefile.in +*** gmp-6.3.0-orig/demos/Makefile.in 2023-07-29 16:42:23.000000000 +0300 +--- gmp-6.3.0/demos/Makefile.in 2025-08-28 16:19:50.891221848 +0300 +*************** +*** 1,7 **** +! # Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 1,7 ---- +! # Makefile.in generated by automake 1.18.1 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2025 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 97,102 **** +--- 97,104 ---- + test $$has_opt = yes + am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ++ am__rm_f = rm -f $(am__rm_f_notfound) ++ am__rm_rf = rm -rf $(am__rm_f_notfound) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +*************** +*** 165,171 **** + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__depfiles_maybe = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +--- 167,173 ---- + am__v_at_1 = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = +! am__maybe_remake_depfiles = + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +*************** +*** 206,212 **** + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) + AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ +! distdir + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +--- 208,214 ---- + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) + AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ +! distdir distdir-am + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +*************** +*** 224,231 **** + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +- ETAGS = etags +- CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/pexpr-config-h.in + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +--- 226,231 ---- +*************** +*** 273,278 **** +--- 273,280 ---- + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++ CSCOPE = @CSCOPE@ ++ CTAGS = @CTAGS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXFLAGS = @CXXFLAGS@ +*************** +*** 286,294 **** +--- 288,298 ---- + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ ETAGS = @ETAGS@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ + FGREP = @FGREP@ ++ FILECMD = @FILECMD@ + GMP_LDFLAGS = @GMP_LDFLAGS@ + GMP_LIMB_BITS = @GMP_LIMB_BITS@ + GMP_NAIL_BITS = @GMP_NAIL_BITS@ +*************** +*** 370,377 **** +--- 374,383 ---- + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__leading_dot = @am__leading_dot@ ++ am__rm_f_notfound = @am__rm_f_notfound@ + am__tar = @am__tar@ + am__untar = @am__untar@ ++ am__xargs_n = @am__xargs_n@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +*************** +*** 407,412 **** +--- 413,419 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++ runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +*************** +*** 443,450 **** + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +--- 450,457 ---- + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +*************** +*** 598,604 **** + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +--- 605,614 ---- + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +! distdir: $(BUILT_SOURCES) +! $(MAKE) $(AM_MAKEFLAGS) distdir-am +! +! distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +*************** +*** 680,690 **** + mostlyclean-generic: + + clean-generic: +! -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +--- 690,700 ---- + mostlyclean-generic: + + clean-generic: +! -$(am__rm_f) $(CLEANFILES) + + distclean-generic: +! -$(am__rm_f) $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +*************** +*** 783,785 **** +--- 793,802 ---- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++ # Tell GNU make to disable its built-in pattern rules. ++ %:: %,v ++ %:: RCS/%,v ++ %:: RCS/% ++ %:: s.% ++ %:: SCCS/s.% +diff -crB gmp-6.3.0-orig/doc/Makefile.in gmp-6.3.0/doc/Makefile.in +*** gmp-6.3.0-orig/doc/Makefile.in 2023-07-29 16:42:23.000000000 +0300 +--- gmp-6.3.0/doc/Makefile.in 2025-08-28 16:19:50.924392911 +0300 +*************** +*** 1,7 **** +! # Makefile.in generated by automake 1.15 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2014 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- 1,7 ---- +! # Makefile.in generated by automake 1.18.1 from Makefile.am. + # @configure_input@ + +! # Copyright (C) 1994-2025 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +*************** +*** 97,102 **** +--- 97,104 ---- + test $$has_opt = yes + am__make_dryrun = (target_option=n; $(am__make_running_with_option)) + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ++ am__rm_f = rm -f $(am__rm_f_notfound) ++ am__rm_rf = rm -rf $(am__rm_f_notfound) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +*************** +*** 140,146 **** + am__v_at_0 = @ + am__v_at_1 = + depcomp = +! am__depfiles_maybe = + SOURCES = + DIST_SOURCES = + AM_V_DVIPS = $(am__v_DVIPS_@AM_V@) +--- 142,148 ---- + am__v_at_0 = @ + am__v_at_1 = + depcomp = +! am__maybe_remake_depfiles = + SOURCES = + DIST_SOURCES = + AM_V_DVIPS = $(am__v_DVIPS_@AM_V@) +*************** +*** 211,220 **** + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__uninstall_files_from_dir = { \ +! test -z "$$files" \ +! || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ +! || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ +! $(am__cd) "$$dir" && rm -f $$files; }; \ + } + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + am__DIST_COMMON = $(gmp_TEXINFOS) $(srcdir)/Makefile.in mdate-sh \ +--- 213,221 ---- + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__uninstall_files_from_dir = { \ +! { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ +! || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ +! $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \ + } + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + am__DIST_COMMON = $(gmp_TEXINFOS) $(srcdir)/Makefile.in mdate-sh \ +*************** +*** 239,244 **** +--- 240,247 ---- + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++ CSCOPE = @CSCOPE@ ++ CTAGS = @CTAGS@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXFLAGS = @CXXFLAGS@ +*************** +*** 252,260 **** +--- 255,265 ---- + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ ++ ETAGS = @ETAGS@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ + FGREP = @FGREP@ ++ FILECMD = @FILECMD@ + GMP_LDFLAGS = @GMP_LDFLAGS@ + GMP_LIMB_BITS = @GMP_LIMB_BITS@ + GMP_NAIL_BITS = @GMP_NAIL_BITS@ +*************** +*** 336,343 **** +--- 341,350 ---- + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ + am__leading_dot = @am__leading_dot@ ++ am__rm_f_notfound = @am__rm_f_notfound@ + am__tar = @am__tar@ + am__untar = @am__untar@ ++ am__xargs_n = @am__xargs_n@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ +*************** +*** 373,378 **** +--- 380,386 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ ++ runstatedir = @runstatedir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +*************** +*** 405,412 **** + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +--- 413,420 ---- + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ +! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ +! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +*************** +*** 449,461 **** + .texi.dvi: + $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ +! $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ + $< + + .texi.pdf: + $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ +! $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ + $< + + .texi.html: +--- 457,469 ---- + .texi.dvi: + $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ +! $(TEXI2DVI) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ + $< + + .texi.pdf: + $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ +! $(TEXI2PDF) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ + $< + + .texi.html: +*************** +*** 572,582 **** + done + + mostlyclean-aminfo: +! -rm -rf gmp.t2d gmp.t2p + + clean-aminfo: +! -test -z "gmp.dvi gmp.pdf gmp.ps gmp.html" \ +! || rm -rf gmp.dvi gmp.pdf gmp.ps gmp.html + + maintainer-clean-aminfo: + @list='$(INFO_DEPS)'; for i in $$list; do \ +--- 580,589 ---- + done + + mostlyclean-aminfo: +! -$(am__rm_rf) gmp.t2d gmp.t2p + + clean-aminfo: +! -$(am__rm_rf) gmp.dvi gmp.pdf gmp.ps gmp.html + + maintainer-clean-aminfo: + @list='$(INFO_DEPS)'; for i in $$list; do \ +*************** +*** 591,597 **** + cscope cscopelist: + + +! distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +--- 598,607 ---- + cscope cscopelist: + + +! distdir: $(BUILT_SOURCES) +! $(MAKE) $(AM_MAKEFLAGS) distdir-am +! +! distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +*************** +*** 655,662 **** + clean-generic: + + distclean-generic: +! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +--- 665,672 ---- + clean-generic: + + distclean-generic: +! -$(am__rm_f) $(CONFIG_CLEAN_FILES) +! -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +*************** +*** 845,847 **** +--- 855,864 ---- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: ++ ++ # Tell GNU make to disable its built-in pattern rules. ++ %:: %,v ++ %:: RCS/%,v ++ %:: RCS/% ++ %:: s.% ++ %:: SCCS/s.% +diff -crB gmp-6.3.0-orig/doc/mdate-sh gmp-6.3.0/doc/mdate-sh +*** gmp-6.3.0-orig/doc/mdate-sh 2015-09-05 22:09:34.000000000 +0300 +--- gmp-6.3.0/doc/mdate-sh 2025-08-28 16:19:50.917722675 +0300 +*************** +*** 1,9 **** + #!/bin/sh +! # Get modification time of a file or directory and pretty-print it. + +! scriptversion=2010-08-21.06; # UTC + +! # Copyright (C) 1995-2014 Free Software Foundation, Inc. + # written by Ulrich Drepper , June 1995 + # + # This program is free software; you can redistribute it and/or modify +--- 1,10 ---- + #!/bin/sh +! # Get modification time of a file or directory, or value of +! # $SOURCE_DATE_EPOCH, and pretty-print it, formatted like 1 January 2000. + +! scriptversion=2025-06-25.21; # UTC + +! # Copyright (C) 1995-2025 Free Software Foundation, Inc. + # written by Ulrich Drepper , June 1995 + # + # This program is free software; you can redistribute it and/or modify +*************** +*** 17,23 **** + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +! # along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +--- 18,24 ---- + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +! # along with this program. If not, see . + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +*************** +*** 50,70 **** + 1 January 1970 + + Report bugs to . + EOF + exit $? + ;; + -v | --v*) +! echo "mdate-sh $scriptversion" + exit $? + ;; + esac + + error () + { + echo "$0: $1" >&2 + exit 1 + } + + + # Prevent date giving response in another language. + LANG=C +--- 51,96 ---- + 1 January 1970 + + Report bugs to . ++ GNU Automake home page: . ++ General help using GNU software: . + EOF + exit $? + ;; + -v | --v*) +! echo "mdate-sh (GNU Automake) $scriptversion" + exit $? + ;; + esac + ++ # Warn if more than one file given. ++ if test $# -ne 1; then ++ echo "$0: warning: multiple files given, using first: $*" >&2 ++ fi ++ + error () + { + echo "$0: $1" >&2 + exit 1 + } + ++ # set $month ("January") and $nummonth (1) given arg MON ("Jan"). ++ mon_to_month () ++ { ++ case $1 in ++ Jan) month=January; nummonth=1;; ++ Feb) month=February; nummonth=2;; ++ Mar) month=March; nummonth=3;; ++ Apr) month=April; nummonth=4;; ++ May) month=May; nummonth=5;; ++ Jun) month=June; nummonth=6;; ++ Jul) month=July; nummonth=7;; ++ Aug) month=August; nummonth=8;; ++ Sep) month=September; nummonth=9;; ++ Oct) month=October; nummonth=10;; ++ Nov) month=November; nummonth=11;; ++ Dec) month=December; nummonth=12;; ++ esac ++ } + + # Prevent date giving response in another language. + LANG=C +*************** +*** 74,79 **** +--- 100,110 ---- + LC_TIME=C + export LC_TIME + ++ # Use UTC to get reproducible result. ++ TZ=UTC0 ++ export TZ ++ ++ # + # GNU ls changes its time format in response to the TIME_STYLE + # variable. Since we cannot assume 'unset' works, revert this + # variable to its documented default. +*************** +*** 119,138 **** + shift + # Add another shift to the command. + command="$command shift;" +! case $1 in +! Jan) month=January; nummonth=1;; +! Feb) month=February; nummonth=2;; +! Mar) month=March; nummonth=3;; +! Apr) month=April; nummonth=4;; +! May) month=May; nummonth=5;; +! Jun) month=June; nummonth=6;; +! Jul) month=July; nummonth=7;; +! Aug) month=August; nummonth=8;; +! Sep) month=September; nummonth=9;; +! Oct) month=October; nummonth=10;; +! Nov) month=November; nummonth=11;; +! Dec) month=December; nummonth=12;; +! esac + done + + test -n "$month" || error "failed parsing '$ls_command /' output" +--- 150,156 ---- + shift + # Add another shift to the command. + command="$command shift;" +! mon_to_month $1 + done + + test -n "$month" || error "failed parsing '$ls_command /' output" +*************** +*** 146,152 **** + # Because of the dummy argument above, month is in $2. + # + # On a POSIX system, we should have +- # + # $# = 5 + # $1 = file size + # $2 = month +--- 164,169 ---- +*************** +*** 155,161 **** + # $5 = filename + # + # On Darwin 7.7.0 and 7.6.0, we have +- # + # $# = 4 + # $1 = day + # $2 = month +--- 172,177 ---- +*************** +*** 163,182 **** + # $4 = filename + + # Get the month. +! case $2 in +! Jan) month=January; nummonth=1;; +! Feb) month=February; nummonth=2;; +! Mar) month=March; nummonth=3;; +! Apr) month=April; nummonth=4;; +! May) month=May; nummonth=5;; +! Jun) month=June; nummonth=6;; +! Jul) month=July; nummonth=7;; +! Aug) month=August; nummonth=8;; +! Sep) month=September; nummonth=9;; +! Oct) month=October; nummonth=10;; +! Nov) month=November; nummonth=11;; +! Dec) month=December; nummonth=12;; +! esac + + case $3 in + ???*) day=$1;; +--- 179,185 ---- + # $4 = filename + + # Get the month. +! mon_to_month $2 + + case $3 in + ???*) day=$1;; +*************** +*** 201,209 **** + Nov) nummonthtod=11;; + Dec) nummonthtod=12;; + esac +! # For the first six month of the year the time notation can also + # be used for files modified in the last year. +! if (expr $nummonth \> $nummonthtod) > /dev/null; + then + year=`expr $year - 1` + fi;; +--- 204,212 ---- + Nov) nummonthtod=11;; + Dec) nummonthtod=12;; + esac +! # For the first six months of the year the time notation can also + # be used for files modified in the last year. +! if (expr $nummonth \> $nummonthtod) >/dev/null; + then + year=`expr $year - 1` + fi;; +*************** +*** 216,224 **** + # Local Variables: + # mode: shell-script + # sh-indentation: 2 +! # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" +! # time-stamp-format: "%:y-%02m-%02d.%02H" +! # time-stamp-time-zone: "UTC" + # time-stamp-end: "; # UTC" + # End: +--- 219,227 ---- + # Local Variables: + # mode: shell-script + # sh-indentation: 2 +! # eval: (add-hook 'before-save-hook 'time-stamp nil t) + # time-stamp-start: "scriptversion=" +! # time-stamp-format: "%Y-%02m-%02d.%02H" +! # time-stamp-time-zone: "UTC0" + # time-stamp-end: "; # UTC" + # End: +diff -crB gmp-6.3.0-orig/doc/texinfo.tex gmp-6.3.0/doc/texinfo.tex +*** gmp-6.3.0-orig/doc/texinfo.tex 2015-09-05 22:09:34.000000000 +0300 +--- gmp-6.3.0/doc/texinfo.tex 2025-08-28 16:19:50.918778195 +0300 +*************** +*** 1,13 **** + % texinfo.tex -- TeX macros to handle Texinfo files. +! % + % Load plain if necessary, i.e., if running under initex. + \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi + % +! \def\texinfoversion{2013-02-01.11} + % +! % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, +! % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +! % 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + % + % This texinfo.tex file is free software: you can redistribute it and/or + % modify it under the terms of the GNU General Public License as +--- 1,11 ---- + % texinfo.tex -- TeX macros to handle Texinfo files. +! % + % Load plain if necessary, i.e., if running under initex. + \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi + % +! \def\texinfoversion{2025-06-18.21} + % +! % Copyright 1985, 1986, 1988, 1990-2025 Free Software Foundation, Inc. + % + % This texinfo.tex file is free software: you can redistribute it and/or + % modify it under the terms of the GNU General Public License as +*************** +*** 20,26 **** + % General Public License for more details. + % + % You should have received a copy of the GNU General Public License +! % along with this program. If not, see . + % + % As a special exception, when this file is read by TeX when processing + % a Texinfo source document, you may use the result without +--- 18,24 ---- + % General Public License for more details. + % + % You should have received a copy of the GNU General Public License +! % along with this program. If not, see . + % + % As a special exception, when this file is read by TeX when processing + % a Texinfo source document, you may use the result without +*************** +*** 29,41 **** + % + % Please try the latest version of texinfo.tex before submitting bug + % reports; you can get the latest version from: +! % http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +! % http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +! % http://www.gnu.org/software/texinfo/ (the Texinfo home page) + % The texinfo.tex in any given distribution could well be out + % of date, so if that's what you're using, please check. + % +! % Send bug reports to bug-texinfo@gnu.org. Please include including a + % complete document in each bug report with which we can reproduce the + % problem. Patches are, of course, greatly appreciated. + % +--- 27,39 ---- + % + % Please try the latest version of texinfo.tex before submitting bug + % reports; you can get the latest version from: +! % https://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +! % https://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +! % https://www.gnu.org/software/texinfo/ (the Texinfo home page) + % The texinfo.tex in any given distribution could well be out + % of date, so if that's what you're using, please check. + % +! % Send bug reports to bug-texinfo@gnu.org. Please include a + % complete document in each bug report with which we can reproduce the + % problem. Patches are, of course, greatly appreciated. + % +*************** +*** 55,70 **** + % extent. You can get the existing language-specific files from the + % full Texinfo distribution. + % +! % The GNU Texinfo home page is http://www.gnu.org/software/texinfo. + + + \message{Loading texinfo [version \texinfoversion]:} + +! % If in a .fmt file, print the version number +! % and turn on active characters that we couldn't do earlier because +! % they might have appeared in the input file name. +! \everyjob{\message{[Texinfo version \texinfoversion]}% +! \catcode`+=\active \catcode`\_=\active} + + \chardef\other=12 + +--- 53,66 ---- + % extent. You can get the existing language-specific files from the + % full Texinfo distribution. + % +! % The GNU Texinfo home page is https://www.gnu.org/software/texinfo. + + + \message{Loading texinfo [version \texinfoversion]:} + +! % LaTeX's \typeout. This ensures that the messages it is used for +! % are identical in format to the corresponding ones from latex/pdflatex. +! \def\typeout{\immediate\write17}% + + \chardef\other=12 + +*************** +*** 96,102 **** +--- 92,100 ---- + \let\ptexraggedright=\raggedright + \let\ptexrbrace=\} + \let\ptexslash=\/ ++ \let\ptexsp=\sp + \let\ptexstar=\* ++ \let\ptexsup=\sup + \let\ptext=\t + \let\ptextop=\top + {\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode +*************** +*** 155,176 **** + \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi + \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi + +! % Since the category of space is not known, we have to be careful. +! \chardef\spacecat = 10 +! \def\spaceisspace{\catcode`\ =\spacecat} +! +! % sometimes characters are active, so we need control sequences. +! \chardef\ampChar = `\& +! \chardef\colonChar = `\: +! \chardef\commaChar = `\, + \chardef\dashChar = `\- +- \chardef\dotChar = `\. +- \chardef\exclamChar= `\! +- \chardef\hashChar = `\# +- \chardef\lquoteChar= `\` +- \chardef\questChar = `\? +- \chardef\rquoteChar= `\' +- \chardef\semiChar = `\; + \chardef\slashChar = `\/ + \chardef\underChar = `\_ + +--- 153,166 ---- + \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi + \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi + +! % Give the space character the catcode for a space. +! \def\spaceisspace{\catcode`\ =10\relax} +! +! % Used to ignore an active newline that may appear immediately after +! % a macro name. +! {\catcode13=\active \gdef\ignoreactivenewline{\let^^M\empty}} +! + \chardef\dashChar = `\- + \chardef\slashChar = `\/ + \chardef\underChar = `\_ + +*************** +*** 193,209 **** + wide-spread wrap-around + } + +- % Margin to add to right of even pages, to left of odd pages. +- \newdimen\bindingoffset +- \newdimen\normaloffset +- \newdimen\pagewidth \newdimen\pageheight +- +- % For a final copy, take out the rectangles +- % that mark overfull boxes (in case you have decided +- % that the text looks ok even though it passes the margin). +- % +- \def\finalout{\overfullrule=0pt } +- + % Sometimes it is convenient to have everything in the transcript file + % and nothing on the terminal. We don't just call \tracingall here, + % since that produces some useless output on the terminal. We also make +--- 183,188 ---- +*************** +*** 234,240 **** + % @errormsg{MSG}. Do the index-like expansions on MSG, but if things + % aren't perfect, it's not the end of the world, being an error message, + % after all. +! % + \def\errormsg{\begingroup \indexnofonts \doerrormsg} + \def\doerrormsg#1{\errmessage{#1}} + +--- 213,219 ---- + % @errormsg{MSG}. Do the index-like expansions on MSG, but if things + % aren't perfect, it's not the end of the world, being an error message, + % after all. +! % + \def\errormsg{\begingroup \indexnofonts \doerrormsg} + \def\doerrormsg#1{\errmessage{#1}} + +*************** +*** 248,265 **** + \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount + \removelastskip\penalty-200\bigskip\fi\fi} + +! % Do @cropmarks to get crop marks. +! % +! \newif\ifcropmarks +! \let\cropmarks = \cropmarkstrue + % +! % Dimensions to add cropmarks at corners. +! % Added by P. A. MacKay, 12 Nov. 1986 + % +! \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines +! \newdimen\cornerlong \cornerlong=1pc +! \newdimen\cornerthick \cornerthick=.3pt +! \newdimen\topandbottommargin \topandbottommargin=.75in + + % Output a mark which sets \thischapter, \thissection and \thiscolor. + % We dump everything together because we only have one kind of mark. +--- 227,240 ---- + \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount + \removelastskip\penalty-200\bigskip\fi\fi} + +! % Output routine + % +! +! % For a final copy, take out the rectangles +! % that mark overfull boxes (in case you have decided +! % that the text looks ok even though it passes the margin). + % +! \def\finalout{\overfullrule=0pt } + + % Output a mark which sets \thischapter, \thissection and \thiscolor. + % We dump everything together because we only have one kind of mark. +*************** +*** 270,368 **** + % + % Another complication is to let the user choose whether \thischapter + % (\thissection) refers to the chapter (section) in effect at the top +! % of a page, or that at the bottom of a page. The solution is +! % described on page 260 of The TeXbook. It involves outputting two +! % marks for the sectioning macros, one before the section break, and +! % one after. I won't pretend I can describe this better than DEK... + \def\domark{% +! \toks0=\expandafter{\lastchapterdefs}% +! \toks2=\expandafter{\lastsectiondefs}% + \toks4=\expandafter{\prevchapterdefs}% + \toks6=\expandafter{\prevsectiondefs}% +! \toks8=\expandafter{\lastcolordefs}% + \mark{% +! \the\toks0 \the\toks2 +! \noexpand\or \the\toks4 \the\toks6 +! \noexpand\else \the\toks8 + }% + } + % \topmark doesn't work for the very first chapter (after the title + % page or the contents), so we use \firstmark there -- this gets us + % the mark with the chapter defs, unless the user sneaks in, e.g., +! % @setcolor (or @url, or @link, etc.) between @contents and the very +! % first @chapter. + \def\gettopheadingmarks{% +! \ifcase0\topmark\fi + \ifx\thischapter\empty \ifcase0\firstmark\fi \fi + } + \def\getbottomheadingmarks{\ifcase1\botmark\fi} +! \def\getcolormarks{\ifcase2\topmark\fi} + + % Avoid "undefined control sequence" errors. +! \def\lastchapterdefs{} +! \def\lastsectiondefs{} + \def\prevchapterdefs{} + \def\prevsectiondefs{} +! \def\lastcolordefs{} + + % Main output routine. + \chardef\PAGE = 255 +! \output = {\onepageout{\pagecontents\PAGE}} + + \newbox\headlinebox + \newbox\footlinebox + +! % \onepageout takes a vbox as an argument. Note that \pagecontents +! % does insertions, but you have to call it yourself. + \def\onepageout#1{% +! \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi + % + \ifodd\pageno \advance\hoffset by \bindingoffset + \else \advance\hoffset by -\bindingoffset\fi + % +! % Do this outside of the \shipout so @code etc. will be expanded in +! % the headline as they should be, not taken literally (outputting ''code). + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi +! \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% + \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi +! \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% + % + {% + % Have to do this stuff outside the \shipout because we want it to + % take effect in \write's, yet the group defined by the \vbox ends + % before the \shipout runs. + % +! \indexdummies % don't expand commands in the output. +! \normalturnoffactive % \ in index entries must not stay \, e.g., if +! % the page break happens to be in the middle of an example. +! % We don't want .vr (or whatever) entries like this: +! % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} +! % "\acronym" won't work when it's read back in; +! % it needs to be +! % {\code {{\tt \backslashcurfont }acronym} + \shipout\vbox{% + % Do this early so pdf references go to the beginning of the page. + \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi + % +- \ifcropmarks \vbox to \outervsize\bgroup +- \hsize = \outerhsize +- \vskip-\topandbottommargin +- \vtop to0pt{% +- \line{\ewtop\hfil\ewtop}% +- \nointerlineskip +- \line{% +- \vbox{\moveleft\cornerthick\nstop}% +- \hfill +- \vbox{\moveright\cornerthick\nstop}% +- }% +- \vss}% +- \vskip\topandbottommargin +- \line\bgroup +- \hfil % center the page within the outer (page) hsize. +- \ifodd\pageno\hskip\bindingoffset\fi +- \vbox\bgroup +- \fi +- % + \unvbox\headlinebox + \pagebody{#1}% + \ifdim\ht\footlinebox > 0pt +--- 245,358 ---- + % + % Another complication is to let the user choose whether \thischapter + % (\thissection) refers to the chapter (section) in effect at the top +! % of a page, or that at the bottom of a page. +! +! % \domark is called twice inside \chapmacro, to add one +! % mark before the section break, and one after. +! % In the second call \prevchapterdefs is the same as \currentchapterdefs, +! % and \prevsectiondefs is the same as \currentsectiondefs. +! % Then if the page is not broken at the mark, some of the previous +! % section appears on the page, and we can get the name of this section +! % from \firstmark for @everyheadingmarks top. +! % @everyheadingmarks bottom uses \botmark. +! % +! % See page 260 of The TeXbook. + \def\domark{% +! \toks0=\expandafter{\currentchapterdefs}% +! \toks2=\expandafter{\currentsectiondefs}% + \toks4=\expandafter{\prevchapterdefs}% + \toks6=\expandafter{\prevsectiondefs}% +! \toks8=\expandafter{\currentcolordefs}% + \mark{% +! \the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top +! \noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom +! \noexpand\else \the\toks8 % 2: color marks + }% + } ++ ++ % \gettopheadingmarks, \getbottomheadingmarks, ++ % \getcolormarks - extract needed part of mark. ++ % + % \topmark doesn't work for the very first chapter (after the title + % page or the contents), so we use \firstmark there -- this gets us + % the mark with the chapter defs, unless the user sneaks in, e.g., +! % @setcolor (or @url etc.) between @contents and the very first @chapter. + \def\gettopheadingmarks{% +! \ifcase0\the\savedtopmark\fi + \ifx\thischapter\empty \ifcase0\firstmark\fi \fi + } + \def\getbottomheadingmarks{\ifcase1\botmark\fi} +! \def\getcolormarks{\ifcase2\the\savedtopmark\fi} + + % Avoid "undefined control sequence" errors. +! \def\currentchapterdefs{} +! \def\currentsectiondefs{} + \def\prevchapterdefs{} + \def\prevsectiondefs{} +! \def\currentcolordefs{} +! +! % Margin to add to right of even pages, to left of odd pages. +! \newdimen\bindingoffset +! \newdimen\normaloffset +! \newdimen\txipagewidth \newdimen\txipageheight + + % Main output routine. ++ % + \chardef\PAGE = 255 +! \newtoks\defaultoutput +! \defaultoutput = {\savetopmark\onepageout{\pagecontents\PAGE}} +! \output=\expandafter{\the\defaultoutput} + + \newbox\headlinebox + \newbox\footlinebox + +! % When outputting the double column layout for indices, an output routine +! % is run several times, hiding the original value of \topmark. Hence, save +! % \topmark at the beginning. +! % +! \newtoks\savedtopmark +! \newif\iftopmarksaved +! \topmarksavedtrue +! \def\savetopmark{% +! \iftopmarksaved\else +! \global\savedtopmark=\expandafter{\topmark}% +! \global\topmarksavedtrue +! \fi +! } +! +! % \onepageout takes a vbox as an argument. +! % \shipout a vbox for a single page, adding an optional header, footer +! % and footnote. This also causes index entries for this page to be written +! % to the auxiliary files. +! % + \def\onepageout#1{% +! \hoffset=\normaloffset + % + \ifodd\pageno \advance\hoffset by \bindingoffset + \else \advance\hoffset by -\bindingoffset\fi + % +! \checkchapterpage +! % +! % Make the heading and footing. \makeheadline and \makefootline +! % use the contents of \headline and \footline. +! \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi +! \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% + \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi +! \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}% + % + {% ++ % Set context for writing to auxiliary files like index files. + % Have to do this stuff outside the \shipout because we want it to + % take effect in \write's, yet the group defined by the \vbox ends + % before the \shipout runs. + % +! \atdummies % don't expand commands in the output. +! \turnoffactive + \shipout\vbox{% + % Do this early so pdf references go to the beginning of the page. + \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi + % + \unvbox\headlinebox + \pagebody{#1}% + \ifdim\ht\footlinebox > 0pt +*************** +*** 373,403 **** + \unvbox\footlinebox + \fi + % +! \ifcropmarks +! \egroup % end of \vbox\bgroup +! \hfil\egroup % end of (centering) \line\bgroup +! \vskip\topandbottommargin plus1fill minus1fill +! \boxmaxdepth = \cornerthick +! \vbox to0pt{\vss +! \line{% +! \vbox{\moveleft\cornerthick\nsbot}% +! \hfill +! \vbox{\moveright\cornerthick\nsbot}% +! }% +! \nointerlineskip +! \line{\ewbot\hfil\ewbot}% +! }% +! \egroup % \vbox from first cropmarks clause +! \fi +! }% end of \shipout\vbox +! }% end of group with \indexdummies + \advancepageno + \ifnum\outputpenalty>-20000 \else\dosupereject\fi + } + + \newinsert\margin \dimen\margin=\maxdimen + +! \def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} + {\catcode`\@ =11 + \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi + % marginal hacks, juha@viisa.uucp (Juha Takala) +--- 363,379 ---- + \unvbox\footlinebox + \fi + % +! }% +! }% +! \global\topmarksavedfalse + \advancepageno + \ifnum\outputpenalty>-20000 \else\dosupereject\fi + } + + \newinsert\margin \dimen\margin=\maxdimen + +! % Main part of page, including any footnotes +! \def\pagebody#1{\vbox to\txipageheight{\boxmaxdepth=\maxdepth #1}} + {\catcode`\@ =11 + \gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi + % marginal hacks, juha@viisa.uucp (Juha Takala) +*************** +*** 408,427 **** + \ifr@ggedbottom \kern-\dimen@ \vfil \fi} + } + +! % Here are the rules for the cropmarks. Note that they are +! % offset so that the space between them is truly \outerhsize or \outervsize +! % (P. A. MacKay, 12 November, 1986) +! % +! \def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} +! \def\nstop{\vbox +! {\hrule height\cornerthick depth\cornerlong width\cornerthick}} +! \def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} +! \def\nsbot{\vbox +! {\hrule height\cornerlong depth\cornerthick width\cornerthick}} + + % Parse an argument, then pass it to #1. The argument is the rest of + % the input line (except we remove a trailing comment). #1 should be a + % macro which expects an ordinary undelimited TeX argument. + % + \def\parsearg{\parseargusing{}} + \def\parseargusing#1#2{% +--- 384,412 ---- + \ifr@ggedbottom \kern-\dimen@ \vfil \fi} + } + +! % Check if we are on the first page of a chapter. Used for printing headings. +! \newif\ifchapterpage +! \def\checkchapterpage{% +! % Get the chapter that was current at the end of the last page +! \ifcase1\the\savedtopmark\fi +! \let\prevchaptername\thischaptername +! % +! \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi +! \let\curchaptername\thischaptername +! % +! \ifx\curchaptername\prevchaptername +! \chapterpagefalse +! \else +! \chapterpagetrue +! \fi +! } +! +! % Argument parsing + + % Parse an argument, then pass it to #1. The argument is the rest of + % the input line (except we remove a trailing comment). #1 should be a + % macro which expects an ordinary undelimited TeX argument. ++ % For example, \def\foo{\parsearg\fooxxx}. + % + \def\parsearg{\parseargusing{}} + \def\parseargusing#1#2{% +*************** +*** 440,490 **** + }% + } + +! % First remove any @comment, then any @c comment. + \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} +! \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} +! +! % Each occurrence of `\^^M' or `\^^M' is replaced by a single space. +! % +! % \argremovec might leave us with trailing space, e.g., + % @end itemize @c foo +! % This space token undergoes the same procedure and is eventually removed +! % by \finishparsearg. +! % +! \def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} +! \def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} +! \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% +! \def\temp{#3}% +! \ifx\temp\empty +! % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: +! \let\temp\finishparsearg +! \else +! \let\temp\argcheckspaces +! \fi +! % Put the space token in: +! \temp#1 #3\ArgTerm +! } + + % If a _delimited_ argument is enclosed in braces, they get stripped; so + % to get _exactly_ the rest of the line, we had to prevent such situation. +! % We prepended an \empty token at the very beginning and we expand it now, +! % just before passing the control to \argtorun. +! % (Similarly, we have to think about #3 of \argcheckspacesY above: it is +! % either the null string, or it ends with \^^M---thus there is no danger +! % that a pair of braces would be stripped. +! % +! % But first, we have to remove the trailing space token. +! % +! \def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} + + % \parseargdef\foo{...} + % is roughly equivalent to + % \def\foo{\parsearg\Xfoo} + % \def\Xfoo#1{...} +- % +- % Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my +- % favourite TeX trick. --kasal, 16nov03 +- + \def\parseargdef#1{% + \expandafter \doparseargdef \csname\string#1\endcsname #1% + } +--- 425,454 ---- + }% + } + +! % First remove any @comment, then any @c comment. Pass the result on to +! % \argremovespace. + \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} +! \def\argremovec#1\c#2\ArgTerm{\argremovespace#1$ $\ArgTerm} +! % \argremovec might leave us with trailing space, though; e.g., + % @end itemize @c foo +! % Note that the argument cannot contain the TeX $, as its catcode is +! % changed to \other when Texinfo source is read. +! \def\argremovespace#1 $#2\ArgTerm{\finishparsearg#1$\ArgTerm} + + % If a _delimited_ argument is enclosed in braces, they get stripped; so + % to get _exactly_ the rest of the line, we had to prevent such situation. +! % We prepended an \empty token at the very beginning and we expand it +! % just before passing the control to \next. +! % (But first, we have to remove the remaining $ or two.) +! \def\finishparsearg#1$#2\ArgTerm{\expandafter\argtorun\expandafter{#1}} +! + ++ % \parseargdef - define a command taking an argument on the line ++ % + % \parseargdef\foo{...} + % is roughly equivalent to + % \def\foo{\parsearg\Xfoo} + % \def\Xfoo#1{...} + \def\parseargdef#1{% + \expandafter \doparseargdef \csname\string#1\endcsname #1% + } +*************** +*** 538,544 **** + + % ... but they get defined via ``\envdef\foo{...}'': + \long\def\envdef#1#2{\def#1{\startenvironment#1#2}} +! \def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} + + % Check whether we're in the right environment: + \def\checkenv#1{% +--- 502,508 ---- + + % ... but they get defined via ``\envdef\foo{...}'': + \long\def\envdef#1#2{\def#1{\startenvironment#1#2}} +! \long\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} + + % Check whether we're in the right environment: + \def\checkenv#1{% +*************** +*** 563,571 **** + \fi + } + +! % @end foo executes the definition of \Efoo. +! % But first, it executes a specialized version of \checkenv +! % + \parseargdef\end{% + \if 1\csname iscond.#1\endcsname + \else +--- 527,534 ---- + \fi + } + +! +! % @end foo calls \checkenv and executes the definition of \Efoo. + \parseargdef\end{% + \if 1\csname iscond.#1\endcsname + \else +*************** +*** 600,605 **** +--- 563,571 ---- + % @/ allows a line break. + \let\/=\allowbreak + ++ % @- allows explicit insertion of hyphenation points ++ \def\-{\discretionary{\normaldash}{}{}}% ++ + % @. is an end-of-sentence period. + \def\.{.\spacefactor=\endofsentencespacefactor\space} + +*************** +*** 609,629 **** + % @? is an end-of-sentence query. + \def\?{?\spacefactor=\endofsentencespacefactor\space} + +- % @frenchspacing on|off says whether to put extra space after punctuation. +- % +- \def\onword{on} +- \def\offword{off} +- % +- \parseargdef\frenchspacing{% +- \def\temp{#1}% +- \ifx\temp\onword \plainfrenchspacing +- \else\ifx\temp\offword \plainnonfrenchspacing +- \else +- \errhelp = \EMsimple +- \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% +- \fi\fi +- } +- + % @w prevents a word break. Without the \leavevmode, @w at the + % beginning of a paragraph, when TeX is still in vertical mode, would + % produce a whole line of output instead of starting the paragraph. +--- 575,580 ---- +*************** +*** 674,694 **** + \endgraf % Not \par, as it may have been set to \lisppar. + \global\dimen1 = \prevdepth + \egroup % End the \vtop. + % \dimen0 is the vertical size of the group's box. + \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox + % \dimen2 is how much space is left on the page (more or less). +! \dimen2 = \pageheight \advance\dimen2 by -\pagetotal + % if the group doesn't fit on the current page, and it's a big big + % group, force a page break. + \ifdim \dimen0 > \dimen2 +! \ifdim \pagetotal < \vfilllimit\pageheight + \page + \fi + \fi + \box\groupbox +- \prevdepth = \dimen1 +- \checkinserts + } + % + % TeX puts in an \escapechar (i.e., `@') at the beginning of the help + % message, so this ends up printing `@group can only ...'. +--- 625,650 ---- + \endgraf % Not \par, as it may have been set to \lisppar. + \global\dimen1 = \prevdepth + \egroup % End the \vtop. ++ \addgroupbox ++ \prevdepth = \dimen1 ++ \checkinserts ++ } ++ ++ \def\addgroupbox{ + % \dimen0 is the vertical size of the group's box. + \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox + % \dimen2 is how much space is left on the page (more or less). +! \dimen2 = \txipageheight \advance\dimen2 by -\pagetotal + % if the group doesn't fit on the current page, and it's a big big + % group, force a page break. + \ifdim \dimen0 > \dimen2 +! \ifdim \pagetotal < \vfilllimit\txipageheight + \page + \fi + \fi + \box\groupbox + } ++ + % + % TeX puts in an \escapechar (i.e., `@') at the beginning of the help + % message, so this ends up printing `@group can only ...'. +*************** +*** 712,743 **** + \dimen2 = \ht\strutbox + \advance\dimen2 by \dp\strutbox + \ifdim\dimen0 > \dimen2 +! % +! % Do a \strut just to make the height of this box be normal, so the +! % normal leading is inserted relative to the preceding line. +! % And a page break here is fine. +! \vtop to #1\mil{\strut\vfil}% +! % +! % TeX does not even consider page breaks if a penalty added to the +! % main vertical list is 10000 or more. But in order to see if the +! % empty box we just added fits on the page, we must make it consider +! % page breaks. On the other hand, we don't want to actually break the +! % page after the empty box. So we use a penalty of 9999. +! % +! % There is an extremely small chance that TeX will actually break the +! % page at this \penalty, if there are no other feasible breakpoints in +! % sight. (If the user is using lots of big @group commands, which +! % almost-but-not-quite fill up a page, TeX will have a hard time doing +! % good page breaking, for example.) However, I could not construct an +! % example where a page broke at this \penalty; if it happens in a real +! % document, then we can reconsider our strategy. + \penalty9999 +! % +! % Back up by the size of the box, whether we did a page break or not. +! \kern -#1\mil +! % +! % Do not allow a page break right after this kern. +! \nobreak + \fi + } + +--- 668,689 ---- + \dimen2 = \ht\strutbox + \advance\dimen2 by \dp\strutbox + \ifdim\dimen0 > \dimen2 +! % This is similar to the 'needspace' module in LaTeX. +! % The first penalty allows a break if the end of the page is +! % not too far away. Following penalties and skips are discarded. +! % Otherwise, require at least \dimen0 of vertical space. +! % +! % (We used to use a \vtop to reserve space, but this had spacing issues +! % when followed by a section heading, as it was not a "discardable item". +! % This also has the benefit of providing glue before the page break if +! % there isn't enough space.) +! \vskip0pt plus \dimen0 +! \penalty-100 +! \vskip0pt plus -\dimen0 +! \vskip \dimen0 + \penalty9999 +! \vskip -\dimen0 +! \penalty0\relax % this hides the above glue from \safewhatsit and \dobreak + \fi + } + +*************** +*** 812,847 **** + \temp + } + +- % @| inserts a changebar to the left of the current line. It should +- % surround any changed text. This approach does *not* work if the +- % change spans more than two lines of output. To handle that, we would +- % have adopt a much more difficult approach (putting marks into the main +- % vertical list for the beginning and end of each change). This command +- % is not documented, not supported, and doesn't work. +- % +- \def\|{% +- % \vadjust can only be used in horizontal mode. +- \leavevmode +- % +- % Append this vertical mode material after the current line in the output. +- \vadjust{% +- % We want to insert a rule with the height and depth of the current +- % leading; that is exactly what \strutbox is supposed to record. +- \vskip-\baselineskip +- % +- % \vadjust-items are inserted at the left edge of the type. So +- % the \llap here moves out into the left-hand margin. +- \llap{% +- % +- % For a thicker or thinner bar, change the `1pt'. +- \vrule height\baselineskip width1pt +- % +- % This is the space between the bar and the text. +- \hskip 12pt +- }% +- }% +- } +- + % @include FILE -- \input text of FILE. + % + \def\include{\parseargusing\filenamecatcodes\includezzz} +--- 758,763 ---- +*************** +*** 930,942 **** + % @comment ...line which is ignored... + % @c is the same as @comment + % @ignore ... @end ignore is another way to write a comment +! % +! \def\comment{\begingroup \catcode`\^^M=\other% + \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% +! \commentxxx} +! {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} + % +! \let\c=\comment + + % @paragraphindent NCHARS + % We'll use ems for NCHARS, close enough. +--- 846,859 ---- + % @comment ...line which is ignored... + % @c is the same as @comment + % @ignore ... @end ignore is another way to write a comment +! +! +! \def\c{\begingroup \catcode`\^^M=\active% + \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% +! \cxxx} +! {\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}} + % +! \let\comment\c + + % @paragraphindent NCHARS + % We'll use ems for NCHARS, close enough. +*************** +*** 1007,1079 **** + % paragraph. + % + \gdef\dosuppressfirstparagraphindent{% +! \gdef\indent{% +! \restorefirstparagraphindent +! \indent +! }% +! \gdef\noindent{% +! \restorefirstparagraphindent +! \noindent +! }% +! \global\everypar = {% +! \kern -\parindent +! \restorefirstparagraphindent +! }% + } +! + \gdef\restorefirstparagraphindent{% +! \global \let \indent = \ptexindent +! \global \let \noindent = \ptexnoindent +! \global \everypar = {}% + } + + + % @refill is a no-op. + \let\refill=\relax + +! % If working on a large document in chapters, it is convenient to +! % be able to disable indexing, cross-referencing, and contents, for test runs. +! % This is done with @novalidate (before @setfilename). +! % +! \newif\iflinks \linkstrue % by default we want the aux files. +! \let\novalidate = \linksfalse +! +! % @setfilename is done at the beginning of every texinfo file. +! % So open here the files we need to have open while reading the input. +! % This makes it possible to make a .fmt file for texinfo. +! \def\setfilename{% +! \fixbackslash % Turn off hack to swallow `\input texinfo'. +! \iflinks +! \tryauxfile +! % Open the new aux file. TeX will close it automatically at exit. +! \immediate\openout\auxfile=\jobname.aux +! \fi % \openindices needs to do some work in any case. +! \openindices +! \let\setfilename=\comment % Ignore extra @setfilename cmds. +! % +! % If texinfo.cnf is present on the system, read it. +! % Useful for site-wide @afourpaper, etc. +! \openin 1 texinfo.cnf +! \ifeof 1 \else \input texinfo.cnf \fi +! \closein 1 +! % +! \comment % Ignore the actual filename. +! } +! +! % Called from \setfilename. +! % +! \def\openindices{% +! \newindex{cp}% +! \newcodeindex{fn}% +! \newcodeindex{vr}% +! \newcodeindex{tp}% +! \newcodeindex{ky}% +! \newcodeindex{pg}% +! } + + % @bye. +! \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} +! + + \message{pdf,} + % adobe `portable' document format +--- 924,966 ---- + % paragraph. + % + \gdef\dosuppressfirstparagraphindent{% +! \gdef\indent {\restorefirstparagraphindent \indent}% +! \gdef\noindent{\restorefirstparagraphindent \noindent}% +! \global\everypar = {\kern -\parindent \restorefirstparagraphindent}% + } +! % + \gdef\restorefirstparagraphindent{% +! \global\let\indent = \ptexindent +! \global\let\noindent = \ptexnoindent +! \global\everypar = {}% +! } +! +! % leave vertical mode without cancelling any first paragraph indent +! \gdef\imageindent{% +! \toks0=\everypar +! \everypar={}% +! \ptexnoindent +! \global\everypar=\toks0 + } + + + % @refill is a no-op. + \let\refill=\relax + +! % @setfilename INFO-FILENAME - ignored +! \let\setfilename=\comment + + % @bye. +! \outer\def\bye{% +! \chappager\pagelabels +! % possibly set in \printindex +! \ifx\byeerror\relax\else\errmessage{\byeerror}\fi +! \tracingstats=1\ptexend} +! +! % set in \donoderef below, but we need to define this here so that +! % conditionals balance inside the large \ifpdf ... \fi blocks below. +! \newif\ifnodeseen +! \nodeseenfalse + + \message{pdf,} + % adobe `portable' document format +*************** +*** 1087,1092 **** +--- 974,980 ---- + \newtoks\toksC + \newtoks\toksD + \newbox\boxA ++ \newbox\boxB + \newcount\countA + \newif\ifpdf + \newif\ifpdfmakepagedest +*************** +*** 1104,1114 **** + \fi + \fi + + % PDF uses PostScript string constants for the names of xref targets, + % for display in the outlines, and in other places. Thus, we have to + % double any backslashes. Otherwise, a name like "\node" will be + % interpreted as a newline (\n), followed by o, d, e. Not good. +! % + % See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and + % related messages. The final outcome is that it is up to the TeX user + % to double the backslashes and otherwise make the string valid, so +--- 992,1158 ---- + \fi + \fi + ++ \newif\ifxetex ++ \ifx\XeTeXrevision\thisisundefined\else ++ \xetextrue ++ \fi ++ ++ \newif\ifluatex ++ \ifx\luatexversion\thisisundefined\else ++ \luatextrue ++ \ifnum\luatexversion>84 ++ \pdftrue ++ \fi ++ \fi ++ ++ \newif\ifpdforxetex ++ \ifpdf ++ \pdforxetextrue ++ \fi ++ \ifxetex ++ \pdforxetextrue ++ \fi ++ ++ ++ ++ % Whether to use non-ASCII bytes in internal link targets. Presently this ++ % is almost always on. ++ \newif\iftxiuseunicodedestname ++ \txiuseunicodedestnametrue ++ ++ % ++ % For LuaTeX ++ % ++ ++ \ifluatex ++ % Use Unicode destination names ++ \txiuseunicodedestnametrue ++ % Escape PDF strings with converting UTF-16 from UTF-8 ++ \begingroup ++ \catcode`\%=12 ++ \directlua{ ++ function UTF16oct(str) ++ tex.sprint(string.char(0x5c) .. '376' .. string.char(0x5c) .. '377') ++ for c in string.utfvalues(str) do ++ if c < 0x10000 then ++ tex.sprint( ++ string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. ++ string.char(0x5c) .. string.char(0x25) .. '03o', ++ math.floor(c / 256), math.floor(c % 256))) ++ else ++ c = c - 0x10000 ++ local c_hi = c / 1024 + 0xd800 ++ local c_lo = c % 1024 + 0xdc00 ++ tex.sprint( ++ string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. ++ string.char(0x5c) .. string.char(0x25) .. '03o' .. ++ string.char(0x5c) .. string.char(0x25) .. '03o' .. ++ string.char(0x5c) .. string.char(0x25) .. '03o', ++ math.floor(c_hi / 256), math.floor(c_hi % 256), ++ math.floor(c_lo / 256), math.floor(c_lo % 256))) ++ end ++ end ++ end ++ } ++ \endgroup ++ \def\pdfescapestrutfsixteen#1{\directlua{UTF16oct('\luaescapestring{#1}')}} ++ % Escape PDF strings without converting ++ \begingroup ++ \directlua{ ++ function PDFescstr(str) ++ for c in string.bytes(str) do ++ if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then ++ tex.sprint(-2, ++ string.format(string.char(0x5c) .. string.char(0x25) .. '03o', ++ c)) ++ else ++ tex.sprint(-2, string.char(c)) ++ end ++ end ++ end ++ } ++ % The -2 in the arguments here gives all the input to TeX catcode 12 ++ % (other) or 10 (space), preventing undefined control sequence errors. See ++ % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html ++ % ++ \endgroup ++ \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}} ++ \ifpdf ++ % For LuaTeX >= 0.85 ++ \def\pdfdest{\pdfextension dest} ++ \let\pdfoutput\outputmode ++ \def\pdfliteral{\pdfextension literal} ++ \def\pdfcatalog{\pdfextension catalog} ++ \def\pdftexversion{\numexpr\pdffeedback version\relax} ++ \let\pdfximage\saveimageresource ++ \let\pdfrefximage\useimageresource ++ \let\pdflastximage\lastsavedimageresourceindex ++ \def\pdfendlink{\pdfextension endlink\relax} ++ \def\pdfoutline{\pdfextension outline} ++ \def\pdfstartlink{\pdfextension startlink} ++ \def\pdffontattr{\pdfextension fontattr} ++ \def\pdfobj{\pdfextension obj} ++ \def\pdflastobj{\numexpr\pdffeedback lastobj\relax} ++ \let\pdfpagewidth\pagewidth ++ \let\pdfpageheight\pageheight ++ \edef\pdfhorigin{\pdfvariable horigin} ++ \edef\pdfvorigin{\pdfvariable vorigin} ++ \fi ++ \fi ++ ++ ++ % Output page labels information. ++ % See PDF reference v.1.7 p.594, section 8.3.1. ++ % Page label ranges must be increasing. ++ \ifpdf ++ \def\pagelabels{% ++ \def\title{0 << /P (T-) /S /D >>}% ++ % ++ % support @contents at very end of document ++ \ifnum\contentsendcount=\pagecount ++ \ifnum\arabiccount<\romancount ++ \pdfcatalog{/PageLabels << /Nums ++ [\title ++ \the\arabiccount << /S /D >> ++ \the\romancount << /S /r >> ++ ] >> }\relax ++ \fi ++ % no contents in document ++ \else\ifnum\contentsendcount=0 ++ \pdfcatalog{/PageLabels << /Nums ++ [\title ++ \the\arabiccount << /S /D >> ++ ] >> }\relax ++ \else ++ \pdfcatalog{/PageLabels << /Nums ++ [\title ++ \the\romancount << /S /r >> ++ \the\contentsendcount << /S /D >> ++ ] >> }\relax ++ \fi\fi ++ } ++ \else ++ \let\pagelabels\relax ++ \fi ++ ++ \newcount\pagecount \pagecount=0 ++ \newcount\romancount \romancount=0 ++ \newcount\arabiccount \arabiccount=0 ++ \newcount\contentsendcount \contentsendcount=0 ++ ++ \ifpdf ++ \let\ptxadvancepageno\advancepageno ++ \def\advancepageno{% ++ \ptxadvancepageno\global\advance\pagecount by 1 ++ } ++ \fi ++ ++ + % PDF uses PostScript string constants for the names of xref targets, + % for display in the outlines, and in other places. Thus, we have to + % double any backslashes. Otherwise, a name like "\node" will be + % interpreted as a newline (\n), followed by o, d, e. Not good. +! % + % See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and + % related messages. The final outcome is that it is up to the TeX user + % to double the backslashes and otherwise make the string valid, so +*************** +*** 1121,1184 **** + \ifx\pdfescapestring\thisisundefined + % No primitive available; should we give a warning or log? + % Many times it won't matter. + \else + % The expandable \pdfescapestring primitive escapes parentheses, + % backslashes, and other special chars. + \xdef#1{\pdfescapestring{#1}}% + \fi + } + + \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images + with PDF output, and none of those formats could be found. (.eps cannot + be supported due to the design of the PDF format; use regular TeX (DVI + output) for that.)} + + \ifpdf + % +! % Color manipulation macros based on pdfcolor.tex, +! % except using rgb instead of cmyk; the latter is said to render as a +! % very dark gray on-screen and a very dark halftone in print, instead +! % of actual black. +! \def\rgbDarkRed{0.50 0.09 0.12} +! \def\rgbBlack{0 0 0} +! % +! % k sets the color for filling (usual text, etc.); +! % K sets the color for stroking (thin rules, e.g., normal _'s). +! \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} + % +! % Set color, and create a mark which defines \thiscolor accordingly, +! % so that \makeheadline knows which color to restore. +! \def\setcolor#1{% +! \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% +! \domark +! \pdfsetcolor{#1}% +! } + % +! \def\maincolor{\rgbBlack} +! \pdfsetcolor{\maincolor} +! \edef\thiscolor{\maincolor} +! \def\lastcolordefs{} + % +! \def\makefootline{% +! \baselineskip24pt +! \line{\pdfsetcolor{\maincolor}\the\footline}% +! } + % +! \def\makeheadline{% +! \vbox to 0pt{% +! \vskip-22.5pt +! \line{% +! \vbox to8.5pt{}% +! % Extract \thiscolor definition from the marks. +! \getcolormarks +! % Typeset the headline with \maincolor, then restore the color. +! \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% +! }% +! \vss +! }% +! \nointerlineskip +! } + % + % + \pdfcatalog{/PageMode /UseOutlines} + % +--- 1165,1275 ---- + \ifx\pdfescapestring\thisisundefined + % No primitive available; should we give a warning or log? + % Many times it won't matter. ++ \xdef#1{#1}% + \else + % The expandable \pdfescapestring primitive escapes parentheses, + % backslashes, and other special chars. + \xdef#1{\pdfescapestring{#1}}% + \fi + } ++ \def\txiescapepdfutfsixteen#1{% ++ \ifx\pdfescapestrutfsixteen\thisisundefined ++ % No UTF-16 converting macro available. ++ \txiescapepdf{#1}% ++ \else ++ \xdef#1{\pdfescapestrutfsixteen{#1}}% ++ \fi ++ } + + \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images + with PDF output, and none of those formats could be found. (.eps cannot + be supported due to the design of the PDF format; use regular TeX (DVI + output) for that.)} + ++ % definitions for pdftex or luatex with pdf output + \ifpdf ++ % Strings in PDF outlines can either be ASCII, or encoded in UTF-16BE ++ % with BOM. Unfortunately there is no simple way with pdftex to output ++ % UTF-16, so we have to do some quite convoluted expansion games if we ++ % find the string contains a non-ASCII codepoint if we want these to ++ % display correctly. We generated the UTF-16 sequences in ++ % \DeclareUnicodeCharacter and we access them here. ++ % ++ \def\defpdfoutlinetextunicode#1{% ++ \def\pdfoutlinetext{#1}% ++ % ++ % Make UTF-8 sequences expand to UTF-16 definitions. ++ \passthroughcharsfalse \utfbytespdftrue ++ \utfviiidefinedwarningfalse ++ % ++ % Completely expand, eliminating any control sequences such as \code, ++ % leaving only possibly \utfbytes. ++ \let\utfbytes\relax ++ \pdfaccentliterals ++ \xdef\pdfoutlinetextchecked{#1}% ++ \checkutfbytes ++ }% ++ % Check if \utfbytes occurs in expansion. ++ \def\checkutfbytes{% ++ \expandafter\checkutfbytesz\pdfoutlinetextchecked\utfbytes\finish ++ }% ++ \def\checkutfbytesz#1\utfbytes#2\finish{% ++ \def\after{#2}% ++ \ifx\after\empty ++ % No further action needed. Output ASCII string as-is, as converting ++ % to UTF-16 is somewhat slow (and uses more space). ++ \global\let\pdfoutlinetext\pdfoutlinetextchecked ++ \else ++ \passthroughcharstrue % pass UTF-8 sequences unaltered ++ \xdef\pdfoutlinetext{\pdfoutlinetext}% ++ \expandafter\expandutfsixteen\expandafter{\pdfoutlinetext}\pdfoutlinetext ++ \fi ++ }% + % +! \catcode2=1 % begin-group character +! \catcode3=2 % end-group character + % +! % argument should be pure UTF-8 with no control sequences. convert to +! % UTF-16BE by inserting null bytes before bytes < 128 and expanding +! % UTF-8 multibyte sequences to saved UTF-16BE sequences. +! \def\expandutfsixteen#1#2{% +! \bgroup \asciitounicode +! \passthroughcharsfalse +! \let\utfbytes\asis +! % +! % for Byte Order Mark (BOM) +! \catcode"FE=12 +! \catcode"FF=12 +! % +! % we want to treat { and } in #1 as any other ASCII bytes. however, +! % we need grouping characters for \scantokens and definitions/assignments, +! % so define alternative grouping characters using control characters +! % that are unlikely to occur. +! % this does not affect 0x02 or 0x03 bytes arising from expansion as +! % these are tokens with different catcodes. +! \catcode"02=1 % begin-group character +! \catcode"03=2 % end-group character +! % +! \expandafter\xdef\expandafter#2\scantokens{% +! ^^02^^fe^^ff#1^^03}% +! % NB we need \scantokens to provide both the open and close group tokens +! % for \xdef otherwise there is an e-TeX error "File ended while +! % scanning definition of..." +! % NB \scantokens is a e-TeX command which is assumed to be provided by +! % pdfTeX. +! % +! \egroup +! }% + % +! \catcode2=12 \catcode3=12 % defaults + % +! % Color support + % +! % rg sets the color for filling (usual text, etc.); +! % RG sets the color for stroking (thin rules, e.g., normal _'s). +! \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} + % ++ % PDF outline support + % + \pdfcatalog{/PageMode /UseOutlines} + % +*************** +*** 1234,1258 **** + \pdfrefximage \pdflastximage + \fi} + % +! \def\pdfmkdest#1{{% + % We have to set dummies so commands such as @code, and characters + % such as \, aren't expanded when present in a section title. + \indexnofonts +- \turnoffactive + \makevalueexpandable + \def\pdfdestname{#1}% + \txiescapepdf\pdfdestname +- \safewhatsit{\pdfdest name{\pdfdestname} xyz}% + }} + % +! % used to mark target names; must be expandable. +! \def\pdfmkpgn#1{#1} + % +! % by default, use a color that is dark enough to print on paper as +! % nearly black, but still distinguishable for online viewing. +! \def\urlcolor{\rgbDarkRed} +! \def\linkcolor{\rgbDarkRed} +! \def\endlink{\setcolor{\maincolor}\pdfendlink} + % + % Adding outlines to PDF; macros for calculating structure of outlines + % come from Petr Olsak +--- 1325,1397 ---- + \pdfrefximage \pdflastximage + \fi} + % +! \def\setpdfdestname#1{{% + % We have to set dummies so commands such as @code, and characters + % such as \, aren't expanded when present in a section title. + \indexnofonts + \makevalueexpandable ++ \turnoffactive ++ \iftxiuseunicodedestname ++ \ifx \declaredencoding \latone ++ % Pass through Latin-1 characters. ++ % LuaTeX with byte wise I/O converts Latin-1 characters to Unicode. ++ \else ++ \ifx \declaredencoding \utfeight ++ % Pass through Unicode characters. ++ \else ++ % Use ASCII approximations in destination names. ++ \passthroughcharsfalse ++ \fi ++ \fi ++ \else ++ % Use ASCII approximations in destination names. ++ \passthroughcharsfalse ++ \fi + \def\pdfdestname{#1}% + \txiescapepdf\pdfdestname + }} + % +! \def\setpdfoutlinetext#1{{% +! \indexnofonts +! \makevalueexpandable +! \turnoffactive +! \ifx \declaredencoding \latone +! % The PDF format can use an extended form of Latin-1 in bookmark +! % strings. See Appendix D of the PDF Reference, Sixth Edition, for +! % the "PDFDocEncoding". +! \passthroughcharstrue +! % Pass through Latin-1 characters. +! % LuaTeX: Convert to Unicode +! % pdfTeX: Use Latin-1 as PDFDocEncoding +! \def\pdfoutlinetext{#1}% +! \else +! \ifx \declaredencoding \utfeight +! \ifluatex +! % For LuaTeX with UTF-8. +! % Pass through Unicode characters for title texts. +! \passthroughcharstrue +! \pdfaccentliterals +! \xdef\pdfoutlinetext{#1}% +! \else +! % For pdfTeX with UTF-8. +! \defpdfoutlinetextunicode{#1}% +! \fi +! \else +! % For non-Latin-1 or non-UTF-8 encodings. +! % Use ASCII approximations. +! \passthroughcharsfalse +! \def\pdfoutlinetext{#1}% +! \fi +! \fi +! % LuaTeX: Convert to UTF-16 +! % pdfTeX: Use Latin-1 as PDFDocEncoding +! \txiescapepdfutfsixteen\pdfoutlinetext +! }} + % +! \def\pdfmkdest#1{% +! \setpdfdestname{#1}% +! \safewhatsit{\pdfdest name{\pdfdestname} xyz}% +! } + % + % Adding outlines to PDF; macros for calculating structure of outlines + % come from Petr Olsak +*************** +*** 1273,1290 **** + % page number. We could generate a destination for the section + % text in the case where a section has no node, but it doesn't + % seem worth the trouble, since most documents are normally structured. +! \edef\pdfoutlinedest{#3}% +! \ifx\pdfoutlinedest\empty +! \def\pdfoutlinedest{#4}% +! \else +! \txiescapepdf\pdfoutlinedest + \fi + % +! % Also escape PDF chars in the display string. +! \edef\pdfoutlinetext{#1}% +! \txiescapepdf\pdfoutlinetext +! % +! \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% + } + % + \def\pdfmakeoutlines{% +--- 1412,1424 ---- + % page number. We could generate a destination for the section + % text in the case where a section has no node, but it doesn't + % seem worth the trouble, since most documents are normally structured. +! \setpdfoutlinetext{#1} +! \setpdfdestname{#3} +! \ifx\pdfdestname\empty +! \def\pdfdestname{#4}% + \fi + % +! \pdfoutline goto name{\pdfdestname}#2{\pdfoutlinetext}% + } + % + \def\pdfmakeoutlines{% +*************** +*** 1295,1309 **** +--- 1429,1446 ---- + \def\thischapnum{##2}% + \def\thissecnum{0}% + \def\thissubsecnum{0}% ++ \def\indexlastsec{chap\thischapnum}% + }% + \def\numsecentry##1##2##3##4{% + \advancenumber{chap\thischapnum}% + \def\thissecnum{##2}% + \def\thissubsecnum{0}% ++ \def\indexlastsec{sec\thissecnum}% + }% + \def\numsubsecentry##1##2##3##4{% + \advancenumber{sec\thissecnum}% + \def\thissubsecnum{##2}% ++ \def\indexlastsec{subsec\thissecnum}% + }% + \def\numsubsubsecentry##1##2##3##4{% + \advancenumber{subsec\thissubsecnum}% +*************** +*** 1311,1317 **** +--- 1448,1460 ---- + \def\thischapnum{0}% + \def\thissecnum{0}% + \def\thissubsecnum{0}% ++ \let\indexlastsec\empty + % ++ % Index initials are subsidiary to whatever sectioning command just ++ % occurred, usually @appendix or @chapter but occasionally a lower level. ++ \def\idxinitialentry##1##2##3##4{% ++ \expandafter\advancenumber\expandafter{\indexlastsec}% ++ }% + % use \def rather than \let here because we redefine \chapentry et + % al. a second time, below. + \def\appentry{\numchapentry}% +*************** +*** 1322,1327 **** +--- 1465,1471 ---- + \def\unnsecentry{\numsecentry}% + \def\unnsubsecentry{\numsubsecentry}% + \def\unnsubsubsecentry{\numsubsubsecentry}% ++ % + \readdatafile{toc}% + % + % Read toc second time, this time actually producing the outlines. +*************** +*** 1329,1335 **** +--- 1473,1485 ---- + % subentries, which we calculated on our first read of the .toc above. + % + % We use the node names as the destinations. ++ % ++ % Currently we prefix the section name with the section number ++ % for chapter and appendix headings only in order to avoid too much ++ % horizontal space being required in the PDF viewer. + \def\numchapentry##1##2##3##4{% ++ \dopdfoutline{##2 ##1}{count-\expnumber{chap##2}}{##3}{##4}}% ++ \def\unnchapentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% + \def\numsecentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% +*************** +*** 1337,1364 **** + \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% + \def\numsubsubsecentry##1##2##3##4{% count is always zero + \dopdfoutline{##1}{}{##3}{##4}}% + % +! % PDF outlines are displayed using system fonts, instead of +! % document fonts. Therefore we cannot use special characters, +! % since the encoding is unknown. For example, the eogonek from +! % Latin 2 (0xea) gets translated to a | character. Info from +! % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. +! % +! % TODO this right, we have to translate 8-bit characters to +! % their "best" equivalent, based on the @documentencoding. Too +! % much work for too little return. Just use the ASCII equivalents +! % we use for the index sort strings. +! % +! \indexnofonts + \setupdatafile + % We can have normal brace characters in the PDF outlines, unlike + % Texinfo index files. So set that up. + \def\{{\lbracecharliteral}% + \def\}{\rbracecharliteral}% + \catcode`\\=\active \otherbackslash +! \input \tocreadfilename + \endgroup + } + {\catcode`[=1 \catcode`]=2 + \catcode`{=\other \catcode`}=\other + \gdef\lbracecharliteral[{]% +--- 1487,1509 ---- + \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% + \def\numsubsubsecentry##1##2##3##4{% count is always zero + \dopdfoutline{##1}{}{##3}{##4}}% ++ \def\idxinitialentry##1##2##3##4{% ++ \dopdfoutline{##1}{}{idx.##1.##2}{##4}}% + % +! \ifnodeseen\else \dopdfoutlinecontents \fi % for @contents at beginning + \setupdatafile + % We can have normal brace characters in the PDF outlines, unlike + % Texinfo index files. So set that up. + \def\{{\lbracecharliteral}% + \def\}{\rbracecharliteral}% + \catcode`\\=\active \otherbackslash +! \input \tocreadfilename\relax +! \ifnodeseen \dopdfoutlinecontents \fi % for @contents at end + \endgroup + } ++ \def\dopdfoutlinecontents{% ++ \expandafter\dopdfoutline\expandafter{\putwordTOC}{}{txi.CONTENTS}{}% ++ } + {\catcode`[=1 \catcode`]=2 + \catcode`{=\other \catcode`}=\other + \gdef\lbracecharliteral[{]% +*************** +*** 1384,1389 **** +--- 1529,1836 ---- + \else + \let \startlink \pdfstartlink + \fi ++ \def\pdfmakeurl#1{% ++ \startlink attr{/Border [0 0 0]}% ++ user{/Subtype /Link /A << /S /URI /URI (#1) >>}% ++ }% ++ \def\endlink{\setcolor{\maincolor}\pdfendlink} ++ % ++ \def\pdflink#1{\pdflinkpage{#1}{#1}}% ++ \def\pdflinkpage#1#2{% ++ \startlink attr{/Border [0 0 0]} goto name{#1} ++ \setcolor{\linkcolor}#2\endlink} ++ \else ++ % non-pdf mode ++ \let\pdfmkdest = \gobble ++ \let\pdfurl = \gobble ++ \let\endlink = \relax ++ \let\setcolor = \gobble ++ \let\pdfsetcolor = \gobble ++ \let\pdfmakeoutlines = \relax ++ \fi ++ ++ % ++ % For XeTeX ++ % ++ \ifxetex ++ % ++ % XeTeX version check ++ % ++ \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99996}>-1 ++ % TeX Live 2016 contains XeTeX 0.99996 and xdvipdfmx 20160307. ++ % It can use the `dvipdfmx:config' special (from TeX Live SVN r40941). ++ % For avoiding PDF destination name replacement, we use this special ++ % instead of xdvipdfmx's command line option `-C 0x0010'. ++ \special{dvipdfmx:config C 0x0010} ++ % XeTeX 0.99995+ comes with xdvipdfmx 20160307+. ++ % It can handle Unicode destination names for PDF. ++ \txiuseunicodedestnametrue ++ \else ++ % XeTeX < 0.99996 (TeX Live < 2016) cannot use the ++ % `dvipdfmx:config' special. ++ % So for avoiding PDF destination name replacement, ++ % xdvipdfmx's command line option `-C 0x0010' is necessary. ++ % ++ % XeTeX < 0.99995 can not handle Unicode destination names for PDF ++ % because xdvipdfmx 20150315 has a UTF-16 conversion issue. ++ % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). ++ \txiuseunicodedestnamefalse ++ \fi ++ % ++ % Color support ++ \def\pdfsetcolor#1{\special{pdf:scolor [#1]}} ++ % ++ % PDF outline support ++ % ++ % Emulate pdfTeX primitive ++ \def\pdfdest name#1 xyz{% ++ \special{pdf:dest (#1) [@thispage /XYZ @xpos @ypos null]}% ++ } ++ % ++ \def\setpdfdestname#1{{% ++ % We have to set dummies so commands such as @code, and characters ++ % such as \, aren't expanded when present in a section title. ++ \indexnofonts ++ \makevalueexpandable ++ \turnoffactive ++ \iftxiuseunicodedestname ++ % Pass through Unicode characters. ++ \else ++ % Use ASCII approximations in destination names. ++ \passthroughcharsfalse ++ \fi ++ \def\pdfdestname{#1}% ++ \txiescapepdf\pdfdestname ++ }} ++ % ++ \def\setpdfoutlinetext#1{{% ++ \turnoffactive ++ % Always use Unicode characters in title texts. ++ \def\pdfoutlinetext{#1}% ++ % For XeTeX, xdvipdfmx converts to UTF-16. ++ % So we do not convert. ++ \txiescapepdf\pdfoutlinetext ++ }} ++ % ++ \def\pdfmkdest#1{% ++ \setpdfdestname{#1}% ++ \safewhatsit{\pdfdest name{\pdfdestname} xyz}% ++ } ++ % ++ \def\dopdfoutline#1#2#3#4{% ++ \setpdfoutlinetext{#1} ++ \setpdfdestname{#3} ++ \ifx\pdfdestname\empty ++ \def\pdfdestname{#4}% ++ \fi ++ % ++ \special{pdf:out [-] #2 << /Title (\pdfoutlinetext) /A ++ << /S /GoTo /D (\pdfdestname) >> >> }% ++ } ++ % ++ \def\pdfmakeoutlines{% ++ \begingroup ++ % For XeTeX, counts of subentries are not necessary. ++ % Therefore, we read toc only once. ++ % ++ % We use node names as destinations. ++ % ++ % Currently we prefix the section name with the section number ++ % for chapter and appendix headings only in order to avoid too much ++ % horizontal space being required in the PDF viewer. ++ \def\partentry##1##2##3##4{}% ignore parts in the outlines ++ \def\numchapentry##1##2##3##4{% ++ \dopdfoutline{##2 ##1}{1}{##3}{##4}% ++ \def\indexseclevel{2}}% ++ \def\numsecentry##1##2##3##4{% ++ \dopdfoutline{##1}{2}{##3}{##4}% ++ \def\indexseclevel{3}}% ++ \def\numsubsecentry##1##2##3##4{% ++ \dopdfoutline{##1}{3}{##3}{##4}% ++ \def\indexseclevel{4}}% ++ \def\numsubsubsecentry##1##2##3##4{% ++ \dopdfoutline{##1}{4}{##3}{##4}% ++ \def\indexseclevel{5}}% ++ % ++ \def\idxinitialentry##1##2##3##4{% ++ \dopdfoutline{##1}{\indexseclevel}{idx.##1.##2}{##4}}% ++ % ++ \let\appentry\numchapentry% ++ \let\appsecentry\numsecentry% ++ \let\appsubsecentry\numsubsecentry% ++ \let\appsubsubsecentry\numsubsubsecentry% ++ \def\unnchapentry##1##2##3##4{% ++ \dopdfoutline{##1}{1}{##3}{##4}}% ++ \let\unnsecentry\numsecentry% ++ \let\unnsubsecentry\numsubsecentry% ++ \let\unnsubsubsecentry\numsubsubsecentry% ++ % ++ % For XeTeX, xdvipdfmx converts strings to UTF-16. ++ % Therefore, the encoding and the language may not be considered. ++ % ++ \indexnofonts ++ \pdfaccentliterals ++ \ifnodeseen\else \dopdfoutlinecontents \fi % for @contents at beginning ++ % ++ \setupdatafile ++ % We can have normal brace characters in the PDF outlines, unlike ++ % Texinfo index files. So set that up. ++ \def\{{\lbracecharliteral}% ++ \def\}{\rbracecharliteral}% ++ \catcode`\\=\active \otherbackslash ++ \xetexpreauxfile ++ \input \tocreadfilename\relax ++ \xetexpostauxfile ++ \ifnodeseen \dopdfoutlinecontents \fi % for @contents at end ++ \endgroup ++ } ++ \def\dopdfoutlinecontents{% ++ \expandafter\dopdfoutline\expandafter ++ {\putwordTOC}{1}{txi.CONTENTS}{txi.CONTENTS}% ++ } ++ {\catcode`[=1 \catcode`]=2 ++ \catcode`{=\other \catcode`}=\other ++ \gdef\lbracecharliteral[{]% ++ \gdef\rbracecharliteral[}]% ++ ] ++ ++ \special{pdf:docview << /PageMode /UseOutlines >> } ++ % ``\special{pdf:tounicode ...}'' is not necessary ++ % because xdvipdfmx converts strings from UTF-8 to UTF-16 without it. ++ % However, due to a UTF-16 conversion issue of xdvipdfmx 20150315, ++ % ``\special{pdf:dest ...}'' cannot handle non-ASCII strings. ++ % It is fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). ++ % ++ \def\skipspaces#1{\def\PP{#1}\def\D{|}% ++ \ifx\PP\D\let\nextsp\relax ++ \else\let\nextsp\skipspaces ++ \addtokens{\filename}{\PP}% ++ \advance\filenamelength by 1 ++ \fi ++ \nextsp} ++ \def\getfilename#1{% ++ \filenamelength=0 ++ % If we don't expand the argument now, \skipspaces will get ++ % snagged on things like "@value{foo}". ++ \edef\temp{#1}% ++ \expandafter\skipspaces\temp|\relax ++ } ++ \def\pdfmakeurl#1{% ++ \special{pdf:bann << /Border [0 0 0] ++ /Subtype /Link /A << /S /URI /URI (#1) >> >>}% ++ } ++ \def\endlink{\setcolor{\maincolor}\special{pdf:eann}} ++ \def\pdflink#1{\pdflinkpage{#1}{#1}}% ++ \def\pdflinkpage#1#2{% ++ \special{pdf:bann << /Border [0 0 0] ++ /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}% ++ \setcolor{\linkcolor}#2\endlink} ++ % ++ % ++ % @image support ++ % ++ % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). ++ \def\doxeteximage#1#2#3{% ++ \def\xeteximagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% ++ \def\xeteximageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% ++ % ++ % XeTeX (and the PDF format) supports .pdf, .png, .jpg (among ++ % others). Let's try in that order, PDF first since if ++ % someone has a scalable image, presumably better to use that than a ++ % bitmap. ++ \let\xeteximgext=\empty ++ \begingroup ++ \openin 1 #1.pdf \ifeof 1 ++ \openin 1 #1.PDF \ifeof 1 ++ \openin 1 #1.png \ifeof 1 ++ \openin 1 #1.jpg \ifeof 1 ++ \openin 1 #1.jpeg \ifeof 1 ++ \openin 1 #1.JPG \ifeof 1 ++ \errmessage{Could not find image file #1 for XeTeX}% ++ \else \gdef\xeteximgext{JPG}% ++ \fi ++ \else \gdef\xeteximgext{jpeg}% ++ \fi ++ \else \gdef\xeteximgext{jpg}% ++ \fi ++ \else \gdef\xeteximgext{png}% ++ \fi ++ \else \gdef\xeteximgext{PDF}% ++ \fi ++ \else \gdef\xeteximgext{pdf}% ++ \fi ++ \closein 1 ++ \endgroup ++ % ++ % Putting an \hbox around the image can prevent an over-long line ++ % after the image. ++ \hbox\bgroup ++ \def\xetexpdfext{pdf}% ++ \ifx\xeteximgext\xetexpdfext ++ \XeTeXpdffile "#1".\xeteximgext "" ++ \else ++ \def\xetexpdfext{PDF}% ++ \ifx\xeteximgext\xetexpdfext ++ \XeTeXpdffile "#1".\xeteximgext "" ++ \else ++ \XeTeXpicfile "#1".\xeteximgext "" ++ \fi ++ \fi ++ \ifdim \wd0 >0pt width \xeteximagewidth \fi ++ \ifdim \wd2 >0pt height \xeteximageheight \fi \relax ++ \egroup ++ } ++ \fi ++ ++ % common definitions and code for pdftex, luatex and xetex ++ \ifpdforxetex ++ % The dark red here is dark enough to print on paper as ++ % nearly black, but still distinguishable for online viewing. We use ++ % black by default, though. ++ \def\rgbDarkRed{0.50 0.09 0.12} ++ \def\rgbBlack{0 0 0} ++ % ++ % Set color, and create a mark which defines \thiscolor accordingly, ++ % so that \makeheadline knows which color to restore. ++ \def\curcolor{0 0 0}% ++ \def\setcolor#1{% ++ \ifx#1\curcolor\else ++ \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% ++ \domark ++ \pdfsetcolor{#1}% ++ \xdef\curcolor{#1}% ++ \fi ++ } ++ % ++ \let\maincolor\rgbBlack ++ \pdfsetcolor{\maincolor} ++ \edef\thiscolor{\maincolor} ++ \def\currentcolordefs{} ++ % ++ \def\makefootline{% ++ \baselineskip24pt ++ \line{\pdfsetcolor{\maincolor}\the\footline}% ++ } ++ % ++ \def\makeheadline{% ++ \vbox to 0pt{% ++ \vskip-22.5pt ++ \line{% ++ \vbox to8.5pt{}% ++ % Extract \thiscolor definition from the marks. ++ \getcolormarks ++ % Typeset the headline with \maincolor, then restore the color. ++ \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% ++ }% ++ \vss ++ }% ++ \nointerlineskip ++ } ++ % ++ % by default, use black for everything. ++ \def\urlcolor{\rgbBlack} ++ \let\linkcolor\rgbBlack ++ % + % make a live url in pdf output. + \def\pdfurl#1{% + \begingroup +*************** +*** 1401,1409 **** + \def\var##1{##1}% + % + \leavevmode\setcolor{\urlcolor}% +! \startlink attr{/Border [0 0 0]}% +! user{/Subtype /Link /A << /S /URI /URI (#1) >>}% + \endgroup} + \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} + \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} + \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} +--- 1848,1859 ---- + \def\var##1{##1}% + % + \leavevmode\setcolor{\urlcolor}% +! \pdfmakeurl{#1}% + \endgroup} ++ % ++ % \pdfgettoks - Surround page numbers in #1 with @pdflink. #1 may ++ % be a simple number, or a list of numbers in the case of an index ++ % entry. + \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} + \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} + \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} +*************** +*** 1425,1479 **** + \next} + \def\makelink{\addtokens{\toksB}% + {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} +- \def\pdflink#1{% +- \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} +- \setcolor{\linkcolor}#1\endlink} + \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} +! \else +! % non-pdf mode +! \let\pdfmkdest = \gobble +! \let\pdfurl = \gobble +! \let\endlink = \relax +! \let\setcolor = \gobble +! \let\pdfsetcolor = \gobble +! \let\pdfmakeoutlines = \relax +! \fi % \ifx\pdfoutput +! +! +! \message{fonts,} + +! % Change the current font style to #1, remembering it in \curfontstyle. +! % For now, we do not accumulate font styles: @b{@i{foo}} prints foo in +! % italics, not bold italics. +! % +! \def\setfontstyle#1{% +! \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. +! \csname ten#1\endcsname % change the current font +! } + +- % Select #1 fonts with the current style. + % +! \def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} +! +! \def\rm{\fam=0 \setfontstyle{rm}} +! \def\it{\fam=\itfam \setfontstyle{it}} +! \def\sl{\fam=\slfam \setfontstyle{sl}} +! \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} +! \def\tt{\fam=\ttfam \setfontstyle{tt}} +! +! % Unfortunately, we have to override this for titles and the like, since +! % in those cases "rm" is bold. Sigh. +! \def\rmisbold{\rm\def\curfontstyle{bf}} +! +! % Texinfo sort of supports the sans serif font style, which plain TeX does not. +! % So we set up a \sf. +! \newfam\sffam +! \def\sf{\fam=\sffam \setfontstyle{sf}} +! \let\li = \sf % Sometimes we call it \li, not \sf. +! +! % We don't need math for this font style. +! \def\ttsl{\setfontstyle{ttsl}} +! + + % Set the baselineskip to #1, and the lineskip and strut size + % correspondingly. There is no deep meaning behind these magic numbers +--- 1875,1948 ---- + \next} + \def\makelink{\addtokens{\toksB}% + {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} + \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} +! \fi + +! \ifpdforxetex +! % for pdftex. +! {\catcode`^^cc=13 +! \gdef\pdfaccentliteralsutfviii{% +! % For PDF outline only. Unicode combining accents follow the +! % character they modify. Note we need at least the first byte +! % of the UTF-8 sequences to have an active catcode to allow the +! % definitions to do their magic. +! \def\"##1{##1^^cc^^88}% U+0308 +! \def\'##1{##1^^cc^^81}% U+0301 +! \def\,##1{##1^^cc^^a7}% U+0327 +! \def\=##1{##1^^cc^^85}% U+0305 +! \def\^##1{##1^^cc^^82}% U+0302 +! \def\`##1{##1^^cc^^80}% U+0300 +! \def\~##1{##1^^cc^^83}% U+0303 +! \def\dotaccent##1{##1^^cc^^87}% U+0307 +! \def\H##1{##1^^cc^^8b}% U+030B +! \def\ogonek##1{##1^^cc^^a8}% U+0328 +! \def\ringaccent##1{##1^^cc^^8a}% U+030A +! \def\u##1{##1^^cc^^8c}% U+0306 +! \def\ubaraccent##1{##1^^cc^^b1}% U+0331 +! \def\udotaccent##1{##1^^cc^^a3}% U+0323 +! \def\v##1{##1^^cc^^8c}% U+030C +! % this definition of @tieaccent will only work with exactly two characters +! % in argument as we need to insert the combining character between them. +! \def\tieaccent##1{\tieaccentz##1}% +! \def\tieaccentz##1##2{##1^^cd^^a1##2} % U+0361 +! }}% +! % +! % for xetex and luatex, which both support extended ^^^^ escapes and +! % process the Unicode codepoint as a single token. +! \gdef\pdfaccentliteralsnative{% +! \def\"##1{##1^^^^0308}% +! \def\'##1{##1^^^^0301}% +! \def\,##1{##1^^^^0327}% +! \def\=##1{##1^^^^0305}% +! \def\^##1{##1^^^^0302}% +! \def\`##1{##1^^^^0300}% +! \def\~##1{##1^^^^0303}% +! \def\dotaccent##1{##1^^^^0307}% +! \def\H##1{##1^^^^030b}% +! \def\ogonek##1{##1^^^^0328}% +! \def\ringaccent##1{##1^^^^030a}% +! \def\u##1{##1^^^^0306}% +! \def\ubaraccent##1{##1^^^^0331}% +! \def\udotaccent##1{##1^^^^0323}% +! \def\v##1{##1^^^^030c}% +! \def\tieaccent##1{\tieaccentz##1}% +! \def\tieaccentz##1##2{##1^^^^0361##2} % U+0361 +! }% +! % +! % use the appropriate definition +! \ifluatex +! \let\pdfaccentliterals\pdfaccentliteralsnative +! \else +! \ifxetex +! \let\pdfaccentliterals\pdfaccentliteralsnative +! \else +! \let\pdfaccentliterals\pdfaccentliteralsutfviii +! \fi +! \fi +! \fi + + % +! \message{fonts,} + + % Set the baselineskip to #1, and the lineskip and strut size + % correspondingly. There is no deep meaning behind these magic numbers +*************** +*** 1757,1762 **** +--- 2226,2236 ---- + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% + \fi\fi ++ % ++ % This is what gets called when #5 of \setfont is empty. ++ \let\cmap\gobble ++ % ++ % (end of cmaps) + + + % Set the font macro #1 to the font named \fontprefix#2. +*************** +*** 1772,1782 **** + \def\setfont#1#2#3#4#5{% + \font#1=\fontprefix#2#3 scaled #4 + \csname cmap#5\endcsname#1% + } +- % This is what gets called when #5 of \setfont is empty. +- \let\cmap\gobble +- % +- % (end of cmaps) + + % Use cm as the default font prefix. + % To specify the font prefix, you must define \fontprefix +--- 2246,2255 ---- + \def\setfont#1#2#3#4#5{% + \font#1=\fontprefix#2#3 scaled #4 + \csname cmap#5\endcsname#1% ++ \ifx#2\ttshape\hyphenchar#1=-1 \fi ++ \ifx#2\ttbshape\hyphenchar#1=-1 \fi ++ \ifx#2\ttslshape\hyphenchar#1=-1 \fi + } + + % Use cm as the default font prefix. + % To specify the font prefix, you must define \fontprefix +*************** +*** 1822,1829 **** + % A few fonts for @defun names and args. + \setfont\defbf\bfshape{10}{\magstep1}{OT1} + \setfont\deftt\ttshape{10}{\magstep1}{OT1TT} + \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} +! \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} + + % Fonts for indices, footnotes, small examples (9pt). + \def\smallnominalsize{9pt} +--- 2295,2304 ---- + % A few fonts for @defun names and args. + \setfont\defbf\bfshape{10}{\magstep1}{OT1} + \setfont\deftt\ttshape{10}{\magstep1}{OT1TT} ++ \setfont\defsl\slshape{10}{\magstep1}{OT1} + \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} +! \def\df{\let\ttfont=\deftt \let\bffont = \defbf +! \let\ttslfont=\defttsl \let\slfont=\defsl \bf} + + % Fonts for indices, footnotes, small examples (9pt). + \def\smallnominalsize{9pt} +*************** +*** 1853,1858 **** +--- 2328,2347 ---- + \font\smallersy=cmsy8 + \def\smallerecsize{0800} + ++ % Fonts for math mode superscripts (7pt). ++ \def\sevennominalsize{7pt} ++ \setfont\sevenrm\rmshape{7}{1000}{OT1} ++ \setfont\seventt\ttshape{10}{700}{OT1TT} ++ \setfont\sevenbf\bfshape{10}{700}{OT1} ++ \setfont\sevenit\itshape{7}{1000}{OT1IT} ++ \setfont\sevensl\slshape{10}{700}{OT1} ++ \setfont\sevensf\sfshape{10}{700}{OT1} ++ \setfont\sevensc\scshape{10}{700}{OT1} ++ \setfont\seventtsl\ttslshape{10}{700}{OT1TT} ++ \font\seveni=cmmi7 ++ \font\sevensy=cmsy7 ++ \def\sevenecsize{0700} ++ + % Fonts for title page (20.4pt): + \def\titlenominalsize{20pt} + \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} +*************** +*** 1884,1889 **** +--- 2373,2379 ---- + % Section fonts (14.4pt). + \def\secnominalsize{14pt} + \setfont\secrm\rmbshape{12}{\magstep1}{OT1} ++ \setfont\secrmnotbold\rmshape{12}{\magstep1}{OT1} + \setfont\secit\itbshape{10}{\magstep2}{OT1IT} + \setfont\secsl\slbshape{10}{\magstep2}{OT1} + \setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} +*************** +*** 1909,1915 **** + \font\ssecsy=cmsy10 scaled 1315 + \def\ssececsize{1200} + +! % Reduced fonts for @acro in text (10pt). + \def\reducednominalsize{10pt} + \setfont\reducedrm\rmshape{10}{1000}{OT1} + \setfont\reducedtt\ttshape{10}{1000}{OT1TT} +--- 2399,2405 ---- + \font\ssecsy=cmsy10 scaled 1315 + \def\ssececsize{1200} + +! % Reduced fonts for @acronym in text (10pt). + \def\reducednominalsize{10pt} + \setfont\reducedrm\rmshape{10}{1000}{OT1} + \setfont\reducedtt\ttshape{10}{1000}{OT1TT} +*************** +*** 1953,1960 **** + % A few fonts for @defun names and args. + \setfont\defbf\bfshape{10}{\magstephalf}{OT1} + \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} + \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} +! \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} + + % Fonts for indices, footnotes, small examples (9pt). + \def\smallnominalsize{9pt} +--- 2443,2452 ---- + % A few fonts for @defun names and args. + \setfont\defbf\bfshape{10}{\magstephalf}{OT1} + \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} ++ \setfont\defsl\slshape{10}{\magstephalf}{OT1} + \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} +! \def\df{\let\ttfont=\deftt \let\bffont = \defbf +! \let\slfont=\defsl \let\ttslfont=\defttsl \bf} + + % Fonts for indices, footnotes, small examples (9pt). + \def\smallnominalsize{9pt} +*************** +*** 1984,1989 **** +--- 2476,2495 ---- + \font\smallersy=cmsy8 + \def\smallerecsize{0800} + ++ % Fonts for math mode superscripts (7pt). ++ \def\sevennominalsize{7pt} ++ \setfont\sevenrm\rmshape{7}{1000}{OT1} ++ \setfont\seventt\ttshape{10}{700}{OT1TT} ++ \setfont\sevenbf\bfshape{10}{700}{OT1} ++ \setfont\sevenit\itshape{7}{1000}{OT1IT} ++ \setfont\sevensl\slshape{10}{700}{OT1} ++ \setfont\sevensf\sfshape{10}{700}{OT1} ++ \setfont\sevensc\scshape{10}{700}{OT1} ++ \setfont\seventtsl\ttslshape{10}{700}{OT1TT} ++ \font\seveni=cmmi7 ++ \font\sevensy=cmsy7 ++ \def\sevenecsize{0700} ++ + % Fonts for title page (20.4pt): + \def\titlenominalsize{20pt} + \setfont\titlerm\rmbshape{12}{\magstep3}{OT1} +*************** +*** 2040,2046 **** + \font\ssecsy=cmsy10 + \def\ssececsize{1000} + +! % Reduced fonts for @acro in text (9pt). + \def\reducednominalsize{9pt} + \setfont\reducedrm\rmshape{9}{1000}{OT1} + \setfont\reducedtt\ttshape{9}{1000}{OT1TT} +--- 2546,2552 ---- + \font\ssecsy=cmsy10 + \def\ssececsize{1000} + +! % Reduced fonts for @acronym in text (9pt). + \def\reducednominalsize{9pt} + \setfont\reducedrm\rmshape{9}{1000}{OT1} + \setfont\reducedtt\ttshape{9}{1000}{OT1TT} +*************** +*** 2060,2065 **** +--- 2566,2577 ---- + \rm + } % end of 10pt text font size definitions, \definetextfontsizex + ++ % Fonts for short table of contents. ++ \setfont\shortcontrm\rmshape{12}{1000}{OT1} ++ \setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 ++ \setfont\shortcontsl\slshape{12}{1000}{OT1} ++ \setfont\shortconttt\ttshape{12}{1000}{OT1TT} ++ + + % We provide the user-level command + % @fonttextsize 10 +*************** +*** 2086,2187 **** + \endgroup + } + + + % In order for the font changes to affect most math symbols and letters, +! % we have to define the \textfont of the standard families. Since +! % texinfo doesn't allow for producing subscripts and superscripts except +! % in the main text, we don't bother to reset \scriptfont and +! % \scriptscriptfont (which would also require loading a lot more fonts). + % + \def\resetmathfonts{% +! \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy +! \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf +! \textfont\ttfam=\tentt \textfont\sffam=\tensf + } + +! % The font-changing commands redefine the meanings of \tenSTYLE, instead +! % of just \STYLE. We do this because \STYLE needs to also set the +! % current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire +! % \tenSTYLE to set the current font. +! % + % Each font-changing command also sets the names \lsize (one size lower) +! % and \lllsize (three sizes lower). These relative commands are used in +! % the LaTeX logo and acronyms. + % +! % This all needs generalizing, badly. + % +! \def\textfonts{% +! \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl +! \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc +! \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy +! \let\tenttsl=\textttsl +! \def\curfontsize{text}% +! \def\lsize{reduced}\def\lllsize{smaller}% +! \resetmathfonts \setleading{\textleading}} +! \def\titlefonts{% +! \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl +! \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc +! \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy +! \let\tenttsl=\titlettsl +! \def\curfontsize{title}% +! \def\lsize{chap}\def\lllsize{subsec}% +! \resetmathfonts \setleading{27pt}} +! \def\titlefont#1{{\titlefonts\rmisbold #1}} +! \def\chapfonts{% +! \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl +! \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc +! \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy +! \let\tenttsl=\chapttsl +! \def\curfontsize{chap}% +! \def\lsize{sec}\def\lllsize{text}% +! \resetmathfonts \setleading{19pt}} +! \def\secfonts{% +! \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl +! \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc +! \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy +! \let\tenttsl=\secttsl +! \def\curfontsize{sec}% +! \def\lsize{subsec}\def\lllsize{reduced}% +! \resetmathfonts \setleading{16pt}} +! \def\subsecfonts{% +! \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl +! \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc +! \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy +! \let\tenttsl=\ssecttsl +! \def\curfontsize{ssec}% +! \def\lsize{text}\def\lllsize{small}% +! \resetmathfonts \setleading{15pt}} +! \let\subsubsecfonts = \subsecfonts +! \def\reducedfonts{% +! \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl +! \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc +! \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy +! \let\tenttsl=\reducedttsl +! \def\curfontsize{reduced}% +! \def\lsize{small}\def\lllsize{smaller}% +! \resetmathfonts \setleading{10.5pt}} +! \def\smallfonts{% +! \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl +! \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc +! \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy +! \let\tenttsl=\smallttsl +! \def\curfontsize{small}% +! \def\lsize{smaller}\def\lllsize{smaller}% +! \resetmathfonts \setleading{10.5pt}} +! \def\smallerfonts{% +! \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl +! \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc +! \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy +! \let\tenttsl=\smallerttsl +! \def\curfontsize{smaller}% +! \def\lsize{smaller}\def\lllsize{smaller}% +! \resetmathfonts \setleading{9.5pt}} + +! % Fonts for short table of contents. +! \setfont\shortcontrm\rmshape{12}{1000}{OT1} +! \setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 +! \setfont\shortcontsl\slshape{12}{1000}{OT1} +! \setfont\shortconttt\ttshape{12}{1000}{OT1TT} + + % Define these just so they can be easily changed for other fonts. + \def\angleleft{$\langle$} +--- 2598,2723 ---- + \endgroup + } + ++ % ++ % Change the current font style to #1, remembering it in \curfontstyle. ++ % For now, we do not accumulate font styles: @b{@i{foo}} prints foo in ++ % italics, not bold italics. ++ % ++ \def\setfontstyle#1{% ++ \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. ++ \csname #1font\endcsname % change the current font ++ } ++ ++ \def\rm{\fam=0 \setfontstyle{rm}} ++ \def\it{\fam=\itfam \setfontstyle{it}} ++ \def\sl{\fam=\slfam \setfontstyle{sl}} ++ \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} ++ \def\tt{\fam=\ttfam \setfontstyle{tt}} ++ ++ % Texinfo sort of supports the sans serif font style, which plain TeX does not. ++ % So we set up a \sf. ++ \newfam\sffam ++ \def\sf{\fam=\sffam \setfontstyle{sf}} ++ ++ % We don't need math for this font style. ++ \def\ttsl{\setfontstyle{ttsl}} ++ + + % In order for the font changes to affect most math symbols and letters, +! % we have to define the \textfont of the standard families. +! % We don't bother to reset \scriptscriptfont; awaiting user need. + % + \def\resetmathfonts{% +! \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont +! \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont +! \textfont\ttfam=\ttfont \textfont\sffam=\sffont +! % +! % Fonts for superscript. Note that the 7pt fonts are used regardless +! % of the current font size. +! \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy +! \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl +! \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt +! \scriptfont\sffam=\sevensf + } + +! +! +! % \defineassignfonts{SIZE} - +! % Define sequence \assignfontsSIZE, which switches between font sizes +! % by redefining the meanings of \STYLEfont. (Just \STYLE additionally sets +! % the current \fam for math mode.) +! % +! \def\defineassignfonts#1{% +! \expandafter\edef\csname assignfonts#1\endcsname{% +! \let\noexpand\rmfont\csname #1rm\endcsname +! \let\noexpand\itfont\csname #1it\endcsname +! \let\noexpand\slfont\csname #1sl\endcsname +! \let\noexpand\bffont\csname #1bf\endcsname +! \let\noexpand\ttfont\csname #1tt\endcsname +! \let\noexpand\smallcaps\csname #1sc\endcsname +! \let\noexpand\sffont \csname #1sf\endcsname +! \let\noexpand\ifont \csname #1i\endcsname +! \let\noexpand\syfont \csname #1sy\endcsname +! \let\noexpand\ttslfont\csname #1ttsl\endcsname +! } +! } +! +! \def\assignfonts#1{% +! \csname assignfonts#1\endcsname +! } +! +! \newif\ifrmisbold +! +! % Select smaller font size with the current style. Used to change font size +! % in, e.g., the LaTeX logo and acronyms. If we are using bold fonts for +! % normal roman text, also use bold fonts for roman text in the smaller size. +! \def\switchtolllsize{% +! \expandafter\assignfonts\expandafter{\lllsize}% +! \ifrmisbold +! \let\rmfont\bffont +! \fi +! \csname\curfontstyle\endcsname +! }% +! +! \def\switchtolsize{% +! \expandafter\assignfonts\expandafter{\lsize}% +! \ifrmisbold +! \let\rmfont\bffont +! \fi +! \csname\curfontstyle\endcsname +! }% +! +! % Define the font-changing commands (all called \...fonts). + % Each font-changing command also sets the names \lsize (one size lower) +! % and \lllsize (three sizes lower). These relative commands are used +! % in, e.g., the LaTeX logo and acronyms. + % +! % Note: The fonts used for \ifont are for "math italics" (\itfont is for +! % italics in regular text). \syfont is also used in math mode only. + % +! \def\definefontsetatsize#1#2#3#4#5{% +! \defineassignfonts{#1}% +! \expandafter\def\csname #1fonts\endcsname{% +! \def\curfontsize{#1}% +! \def\lsize{#2}\def\lllsize{#3}% +! \csname rmisbold#5\endcsname +! \csname assignfonts#1\endcsname +! \resetmathfonts +! \setleading{#4}% +! }} + +! \definefontsetatsize{text} {reduced}{smaller}{\textleading}{false} +! \definefontsetatsize{title} {chap} {subsec} {27pt} {true} +! \definefontsetatsize{chap} {sec} {text} {19pt} {true} +! \definefontsetatsize{sec} {subsec} {reduced}{17pt} {true} +! \definefontsetatsize{ssec} {text} {small} {15pt} {true} +! \definefontsetatsize{reduced}{small} {smaller}{10.5pt}{false} +! \definefontsetatsize{small} {smaller}{smaller}{10.5pt}{false} +! \definefontsetatsize{smaller}{smaller}{smaller}{9.5pt} {false} +! +! \def\titlefont#1{{\titlefonts\rm #1}} +! \let\subsecfonts = \ssecfonts +! \let\subsubsecfonts = \ssecfonts + + % Define these just so they can be easily changed for other fonts. + \def\angleleft{$\langle$} +*************** +*** 2207,2328 **** + \definetextfontsizexi + + +- \message{markup,} +- + % Check if we are currently using a typewriter font. Since all the + % Computer Modern typewriter fonts have zero interword stretch (and + % shrink), and it is reasonable to expect all typewriter fonts to have +! % this property, we can check that font parameter. +! % +! \def\ifmonospace{\ifdim\fontdimen3\font=0pt } + +! % Markup style infrastructure. \defmarkupstylesetup\INITMACRO will +! % define and register \INITMACRO to be called on markup style changes. +! % \INITMACRO can check \currentmarkupstyle for the innermost +! % style and the set of \ifmarkupSTYLE switches for all styles +! % currently in effect. +! \newif\ifmarkupvar +! \newif\ifmarkupsamp +! \newif\ifmarkupkey +! %\newif\ifmarkupfile % @file == @samp. +! %\newif\ifmarkupoption % @option == @samp. +! \newif\ifmarkupcode +! \newif\ifmarkupkbd +! %\newif\ifmarkupenv % @env == @code. +! %\newif\ifmarkupcommand % @command == @code. +! \newif\ifmarkuptex % @tex (and part of @math, for now). +! \newif\ifmarkupexample +! \newif\ifmarkupverb +! \newif\ifmarkupverbatim +! +! \let\currentmarkupstyle\empty +! +! \def\setupmarkupstyle#1{% +! \csname markup#1true\endcsname +! \def\currentmarkupstyle{#1}% +! \markupstylesetup +! } +! +! \let\markupstylesetup\empty +! +! \def\defmarkupstylesetup#1{% +! \expandafter\def\expandafter\markupstylesetup +! \expandafter{\markupstylesetup #1}% +! \def#1% +! } +! +! % Markup style setup for left and right quotes. +! \defmarkupstylesetup\markupsetuplq{% +! \expandafter\let\expandafter \temp +! \csname markupsetuplq\currentmarkupstyle\endcsname +! \ifx\temp\relax \markupsetuplqdefault \else \temp \fi +! } +! +! \defmarkupstylesetup\markupsetuprq{% +! \expandafter\let\expandafter \temp +! \csname markupsetuprq\currentmarkupstyle\endcsname +! \ifx\temp\relax \markupsetuprqdefault \else \temp \fi + } + + { + \catcode`\'=\active + \catcode`\`=\active + +! \gdef\markupsetuplqdefault{\let`\lq} +! \gdef\markupsetuprqdefault{\let'\rq} +! +! \gdef\markupsetcodequoteleft{\let`\codequoteleft} +! \gdef\markupsetcodequoteright{\let'\codequoteright} + } + +! \let\markupsetuplqcode \markupsetcodequoteleft +! \let\markupsetuprqcode \markupsetcodequoteright +! % +! \let\markupsetuplqexample \markupsetcodequoteleft +! \let\markupsetuprqexample \markupsetcodequoteright +! % +! \let\markupsetuplqkbd \markupsetcodequoteleft +! \let\markupsetuprqkbd \markupsetcodequoteright +! % +! \let\markupsetuplqsamp \markupsetcodequoteleft +! \let\markupsetuprqsamp \markupsetcodequoteright +! % +! \let\markupsetuplqverb \markupsetcodequoteleft +! \let\markupsetuprqverb \markupsetcodequoteright +! % +! \let\markupsetuplqverbatim \markupsetcodequoteleft +! \let\markupsetuprqverbatim \markupsetcodequoteright +! +! % Allow an option to not use regular directed right quote/apostrophe +! % (char 0x27), but instead the undirected quote from cmtt (char 0x0d). +! % The undirected quote is ugly, so don't make it the default, but it +! % works for pasting with more pdf viewers (at least evince), the +! % lilypond developers report. xpdf does work with the regular 0x27. + % + \def\codequoteright{% +! \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax +! \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax +! '% +! \else \char'15 \fi +! \else \char'15 \fi + } +! % +! % and a similar option for the left quote char vs. a grave accent. +! % Modern fonts display ASCII 0x60 as a grave accent, so some people like +! % the code environments to do likewise. + % + \def\codequoteleft{% +! \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax +! \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax +! % [Knuth] pp. 380,381,391 +! % \relax disables Spanish ligatures ?` and !` of \tt font. +! \relax`% +! \else \char'22 \fi +! \else \char'22 \fi + } + + % Commands to set the quote options. +! % + \parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword +--- 2743,2806 ---- + \definetextfontsizexi + + + % Check if we are currently using a typewriter font. Since all the + % Computer Modern typewriter fonts have zero interword stretch (and + % shrink), and it is reasonable to expect all typewriter fonts to have +! % this property, we can check that font parameter. #1 is what to +! % print if we are indeed using \tt; #2 is what to print otherwise. +! \def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} + +! % Same as above, but check for italic font. Actually this also catches +! % non-italic slanted fonts since it is impossible to distinguish them from +! % italic fonts. But since this is only used by $ and it uses \sl anyway +! % this is not a problem. +! \def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} +! +! +! % Check if internal flag is clear, i.e. has not been @set. +! \def\ifflagclear#1#2#3{% +! \expandafter\ifx\csname SET#1\endcsname\relax +! #2\else#3\fi + } + + { + \catcode`\'=\active + \catcode`\`=\active + +! \gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright} +! \gdef\setregularquotes{\let`\lq \let'\rq} + } ++ \setregularquotes + +! % output for ' in @code +! % in tt font hex 0D (undirected) or 27 (curly right quote) + % + \def\codequoteright{% +! \ifusingtt +! {\ifflagclear{txicodequoteundirected}% +! {\ifflagclear{codequoteundirected}% +! {'}% +! {\char"0D }}% +! {\char"0D }}% +! {'}% + } +! +! % output for ` in @code +! % in tt font hex 12 (grave accent) or 60 (curly left quote) +! % \relax disables Spanish ligatures ?` and !` of \tt font. + % + \def\codequoteleft{% +! \ifusingtt +! {\ifflagclear{txicodequotebacktick}% +! {\ifflagclear{codequotebacktick}% +! {\relax`}% +! {\char"12 }}% +! {\char"12 }}% +! {\relax`}% + } + + % Commands to set the quote options. +! % + \parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword +*************** +*** 2336,2342 **** + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi + } +! % + \parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword +--- 2814,2820 ---- + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi + } +! + \parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword +*************** +*** 2351,2356 **** +--- 2829,2839 ---- + \fi\fi + } + ++ % Turn them on by default ++ \let\SETtxicodequoteundirected = t ++ \let\SETtxicodequotebacktick = t ++ ++ + % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. + \def\noligaturesquoteleft{\relax\lq} + +*************** +*** 2363,2424 **** + % If we are in a monospaced environment, however, 1) always use \ttsl, + % and 2) do not add an italic correction. + \def\dosmartslant#1#2{% +! \ifusingtt + {{\ttsl #2}\let\next=\relax}% +! {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% + \next + } + \def\smartslanted{\dosmartslant\sl} + \def\smartitalic{\dosmartslant\it} + +! % Output an italic correction unless \next (presumed to be the following +! % character) is such as not to need one. +! \def\smartitaliccorrection{% + \ifx\next,% + \else\ifx\next-% + \else\ifx\next.% + \else\ptexslash +! \fi\fi\fi + \aftersmartic + } + +! % Unconditional use \ttsl, and no ic. @var is set to this for defuns. +! \def\ttslanted#1{{\ttsl #1}} +! +! % @cite is like \smartslanted except unconditionally use \sl. We never want +! % ttsl for book titles, do we? +! \def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} + + \def\aftersmartic{} + \def\var#1{% + \let\saveaftersmartic = \aftersmartic + \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% +! \smartslanted{#1}% + } + + \let\i=\smartitalic + \let\slanted=\smartslanted + \let\dfn=\smartslanted + \let\emph=\smartitalic + +! % Explicit font changes: @r, @sc, undocumented @ii. +! \def\r#1{{\rm #1}} % roman font + \def\sc#1{{\smallcaps#1}} % smallcaps font + \def\ii#1{{\it #1}} % italic font + + % @b, explicit bold. Also @strong. +! \def\b#1{{\bf #1}} + \let\strong=\b + + % @sansserif, explicit sans. + \def\sansserif#1{{\sf #1}} + +! % We can't just use \exhyphenpenalty, because that only has effect at +! % the end of a paragraph. Restore normal hyphenation at the end of the +! % group within which \nohyphenation is presumably called. +! % +! \def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} +! \def\restorehyphenation{\hyphenchar\font = `- } + + % Set sfcode to normal for the chars that usually have another value. + % Can't use plain's \frenchspacing because it uses the `\x notation, and +--- 2846,2919 ---- + % If we are in a monospaced environment, however, 1) always use \ttsl, + % and 2) do not add an italic correction. + \def\dosmartslant#1#2{% +! \ifusingtt + {{\ttsl #2}\let\next=\relax}% +! {\def\next{{#1#2}\smartitaliccorrection}}% + \next + } + \def\smartslanted{\dosmartslant\sl} + \def\smartitalic{\dosmartslant\it} + +! % Output an italic correction unless the following character is such as +! % not to need one. +! \def\smartitaliccorrection{\futurelet\next\smartitaliccorrectionx} +! \def\smartitaliccorrectionx{% + \ifx\next,% + \else\ifx\next-% + \else\ifx\next.% ++ \else\ifx\next\.% ++ \else\ifx\next\comma% + \else\ptexslash +! \fi\fi\fi\fi\fi + \aftersmartic + } + +! % @cite unconditionally uses \sl with \smartitaliccorrection. +! \def\cite#1{{\sl #1}\smartitaliccorrection} + ++ % By default, use ttsl font for @var when used in code context. ++ % To unconditionally use \sl for @var, @clear txicodevaristt. This ++ % gives consistency for parameter names whether they are in @def, ++ % @table @code or a regular paragraph. + \def\aftersmartic{} + \def\var#1{% + \let\saveaftersmartic = \aftersmartic + \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% +! % The \null is to reset \spacefactor. +! % +! \ifflagclear{txicodevaristt}% +! {\def\varnext{{{\sl #1}}\smartitaliccorrection}}% +! {\def\varnext{\smartslanted{#1}}}% +! \varnext + } + ++ \def\SETtxicodevaristt{}% @set txicodevaristt ++ + \let\i=\smartitalic + \let\slanted=\smartslanted + \let\dfn=\smartslanted + \let\emph=\smartitalic + +! % @r for roman font, used for code comment +! \def\r#1{{% +! \usenormaldash % get --, --- ligatures even if in @code +! \defcharsdefault % in case on def line +! \rm #1}} +! {\catcode`-=\active \gdef\usenormaldash{\let-\normaldash}} +! +! % @sc, undocumented @ii. + \def\sc#1{{\smallcaps#1}} % smallcaps font + \def\ii#1{{\it #1}} % italic font + + % @b, explicit bold. Also @strong. +! \def\b#1{{\bf \defcharsdefault #1}} + \let\strong=\b + + % @sansserif, explicit sans. + \def\sansserif#1{{\sf #1}} + +! \newif\iffrenchspacing +! \frenchspacingfalse + + % Set sfcode to normal for the chars that usually have another value. + % Can't use plain's \frenchspacing because it uses the `\x notation, and +*************** +*** 2426,2451 **** + % + \catcode`@=11 + \def\plainfrenchspacing{% +! \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m +! \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m +! \def\endofsentencespacefactor{1000}% for @. and friends + } + \def\plainnonfrenchspacing{% +! \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 +! \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 +! \def\endofsentencespacefactor{3000}% for @. and friends + } + \catcode`@=\other + \def\endofsentencespacefactor{3000}% default + + % @t, explicit typewriter. + \def\t#1{% +! {\tt \rawbackslash \plainfrenchspacing #1}% + \null + } + + % @samp. +! \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} + + % @indicateurl is \samp, that is, with quotes. + \let\indicateurl=\samp +--- 2921,2970 ---- + % + \catcode`@=11 + \def\plainfrenchspacing{% +! \iffrenchspacing\else +! \frenchspacingtrue +! \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m +! \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m +! \def\endofsentencespacefactor{1000}% for @. and friends +! \fi + } + \def\plainnonfrenchspacing{% +! \iffrenchspacing +! \frenchspacingfalse +! \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 +! \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 +! \def\endofsentencespacefactor{3000}% for @. and friends +! \fi + } + \catcode`@=\other + \def\endofsentencespacefactor{3000}% default + ++ % @frenchspacing on|off says whether to put extra space after punctuation. ++ % ++ \def\onword{on} ++ \def\offword{off} ++ % ++ \let\frenchspacingsetting\plainnonfrenchspacing % used in output routine ++ \parseargdef\frenchspacing{% ++ \def\temp{#1}% ++ \ifx\temp\onword \let\frenchspacingsetting\plainfrenchspacing ++ \else\ifx\temp\offword \let\frenchspacingsetting\plainnonfrenchspacing ++ \else ++ \errhelp = \EMsimple ++ \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% ++ \fi\fi ++ \frenchspacingsetting ++ } ++ ++ + % @t, explicit typewriter. + \def\t#1{% +! {\tt \defcharsdefault \plainfrenchspacing #1}% + \null + } + + % @samp. +! \def\samp#1{{\setcodequotes\lq\tclose{#1}\rq\null}} + + % @indicateurl is \samp, that is, with quotes. + \let\indicateurl=\samp +*************** +*** 2461,2512 **** + % Switch to typewriter. + \tt + % +! % But `\ ' produces the large typewriter interword space. + \def\ {{\spaceskip = 0pt{} }}% + % +- % Turn off hyphenation. +- \nohyphenation +- % +- \rawbackslash + \plainfrenchspacing + #1% + }% + \null % reset spacefactor to 1000 + } + +! % We *must* turn on hyphenation at `-' and `_' in @code. + % Otherwise, it is too hard to avoid overfull hboxes + % in the Emacs manual, the Library manual, etc. + % +! % Unfortunately, TeX uses one parameter (\hyphenchar) to control +! % both hyphenation at - and hyphenation within words. +! % We must therefore turn them both off (\tclose does that) +! % and arrange explicitly to hyphenate at a dash. +! % -- rms. + { + \catcode`\-=\active \catcode`\_=\active + \catcode`\'=\active \catcode`\`=\active + \global\let'=\rq \global\let`=\lq % default definitions + % + \global\def\code{\begingroup +! \setupmarkupstyle{code}% +! % The following should really be moved into \setupmarkupstyle handlers. + \catcode\dashChar=\active \catcode\underChar=\active + \ifallowcodebreaks + \let-\codedash + \let_\codeunder + \else +! \let-\normaldash + \let_\realunder + \fi + \codex + } + } +- +- \def\codex #1{\tclose{#1}\endgroup} +- + \def\normaldash{-} +! \def\codedash{-\discretionary{}{}{}} + \def\codeunder{% + % this is all so @math{@code{var_name}+1} can work. In math mode, _ + % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) +--- 2980,3057 ---- + % Switch to typewriter. + \tt + % +! % `\ ' produces the large typewriter interword space. + \def\ {{\spaceskip = 0pt{} }}% + % + \plainfrenchspacing + #1% + }% + \null % reset spacefactor to 1000 + } + +! % This is for LuaTeX: It is not sufficient to disable hyphenation at +! % explicit dashes by setting `\hyphenchar` to -1. +! \def\dashnobreak{% +! \normaldash +! \penalty 10000 } +! +! % We must turn on hyphenation at `-' and `_' in @code. + % Otherwise, it is too hard to avoid overfull hboxes + % in the Emacs manual, the Library manual, etc. ++ % We explicitly allow hyphenation at these characters ++ % using \discretionary. + % +! % Hyphenation at - and hyphenation within words was turned off +! % by default for the tt fonts using the \hyphenchar parameter of TeX. + { + \catcode`\-=\active \catcode`\_=\active + \catcode`\'=\active \catcode`\`=\active + \global\let'=\rq \global\let`=\lq % default definitions + % + \global\def\code{\begingroup +! \setcodequotes + \catcode\dashChar=\active \catcode\underChar=\active + \ifallowcodebreaks + \let-\codedash + \let_\codeunder + \else +! \let-\dashnobreak + \let_\realunder + \fi + \codex + } ++ % ++ \gdef\codedash{\futurelet\next\codedashfinish} ++ \gdef\codedashfinish{% ++ \normaldash % always output the dash character itself. ++ % ++ % Now, output a discretionary to allow a line break, unless ++ % (a) the next character is a -, or ++ % (b) the preceding character is a -, or ++ % (c) we are at the start of the string. ++ % In both cases (b) and (c), \codedashnobreak should be set to \codedash. ++ % ++ % E.g., given --posix, we do not want to allow a break after either -. ++ % Given --foo-bar, we do want to allow a break between the - and the b. ++ \ifx\next\codedash \else ++ \ifx\codedashnobreak\codedash ++ \else \discretionary{}{}{}\fi ++ \fi ++ % we need the space after the = for the case when \next itself is a ++ % space token; it would get swallowed otherwise. As in @code{- a}. ++ \global\let\codedashnobreak= \next ++ } + } + \def\normaldash{-} +! % +! \def\codex #1{\tclose{% +! % Given -foo (with a single dash), we do not want to allow a break +! % after the -. \codedashnobreak is set to the first character in +! % @code. +! \futurelet\codedashnobreak\relax +! #1% +! }\endgroup} +! + \def\codeunder{% + % this is all so @math{@code{var_name}+1} can work. In math mode, _ + % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) +*************** +*** 2548,2584 **** + \let\file=\code + \let\option=\code + +! % @uref (abbreviation for `urlref') takes an optional (comma-separated) +! % second argument specifying the text to display and an optional third +! % arg as text to display instead of (rather than in addition to) the url +! % itself. First (mandatory) arg is the url. +! % (This \urefnobreak definition isn't used now, leaving it for a while +! % for comparison.) +! \def\urefnobreak#1{\dourefnobreak #1,,,\finish} +! \def\dourefnobreak#1,#2,#3,#4\finish{\begingroup +! \unsepspaces +! \pdfurl{#1}% +! \setbox0 = \hbox{\ignorespaces #3}% +! \ifdim\wd0 > 0pt +! \unhbox0 % third arg given, show only that +! \else +! \setbox0 = \hbox{\ignorespaces #2}% +! \ifdim\wd0 > 0pt +! \ifpdf +! \unhbox0 % PDF: 2nd arg given, show only it +! \else +! \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url +! \fi +! \else +! \code{#1}% only url given, so show it +! \fi +! \fi +! \endlink +! \endgroup} +! +! % This \urefbreak definition is the active one. +! \def\urefbreak{\begingroup \urefcatcodes \dourefbreak} + \let\uref=\urefbreak + \def\dourefbreak#1{\urefbreakfinish #1,,,\finish} + \def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example + \unsepspaces +--- 3093,3121 ---- + \let\file=\code + \let\option=\code + +! % @uref (abbreviation for `urlref') aka @url takes an optional +! % (comma-separated) second argument specifying the text to display and +! % an optional third arg as text to display instead of (rather than in +! % addition to) the url itself. First (mandatory) arg is the url. +! +! % TeX-only option to allow changing PDF output to show only the second +! % arg (if given), and not the url (which is then just the link target). +! \newif\ifurefurlonlylink +! +! % The default \pretolerance setting stops the penalty inserted in +! % \urefallowbreak being a discouragement to line breaking. Set it to +! % a negative value for this paragraph only. Hopefully this does not +! % conflict with redefinitions of \par done elsewhere. +! \def\nopretolerance{% +! \pretolerance=-1 +! \def\par{\endgraf\pretolerance=100 \let\par\endgraf}% +! } +! +! % The main macro is \urefbreak, which allows breaking at expected +! % places within the url. +! \def\urefbreak{\nopretolerance \begingroup \urefcatcodes \dourefbreak} + \let\uref=\urefbreak ++ % + \def\dourefbreak#1{\urefbreakfinish #1,,,\finish} + \def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example + \unsepspaces +*************** +*** 2587,2598 **** + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else +! \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf +! \unhbox0 % PDF: 2nd arg given, show only it + \else +! \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \urefcode{#1}% only url given, so show it +--- 3124,3155 ---- + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else +! \setbox0 = \hbox{\ignorespaces #2}% look for second arg + \ifdim\wd0 > 0pt + \ifpdf +! % For pdfTeX and LuaTeX +! \ifurefurlonlylink +! % PDF plus option to not display url, show just arg +! \unhbox0 +! \else +! % PDF, normally display both arg and url for consistency, +! % visibility, if the pdf is eventually used to print, etc. +! \unhbox0\ (\urefcode{#1})% +! \fi + \else +! \ifxetex +! % For XeTeX +! \ifurefurlonlylink +! % PDF plus option to not display url, show just arg +! \unhbox0 +! \else +! % PDF, normally display both arg and url for consistency, +! % visibility, if the pdf is eventually used to print, etc. +! \unhbox0\ (\urefcode{#1})% +! \fi +! \else +! \unhbox0\ (\urefcode{#1})% DVI, always show arg and url +! \fi + \fi + \else + \urefcode{#1}% only url given, so show it +*************** +*** 2603,2617 **** + + % Allow line breaks around only a few characters (only). + \def\urefcatcodes{% +! \catcode\ampChar=\active \catcode\dotChar=\active +! \catcode\hashChar=\active \catcode\questChar=\active +! \catcode\slashChar=\active + } + { + \urefcatcodes + % + \global\def\urefcode{\begingroup +! \setupmarkupstyle{code}% + \urefcatcodes + \let&\urefcodeamp + \let.\urefcodedot +--- 3160,3174 ---- + + % Allow line breaks around only a few characters (only). + \def\urefcatcodes{% +! \catcode`\&=\active \catcode`\.=\active +! \catcode`\#=\active \catcode`\?=\active +! \catcode`\/=\active + } + { + \urefcatcodes + % + \global\def\urefcode{\begingroup +! \setcodequotes + \urefcatcodes + \let&\urefcodeamp + \let.\urefcodedot +*************** +*** 2629,2667 **** + \global\def/{\normalslash} + } + +! % we put a little stretch before and after the breakable chars, to help +! % line breaking of long url's. The unequal skips make look better in +! % cmtt at least, especially for dots. +! \def\urefprestretch{\urefprebreak \hskip0pt plus.13em } +! \def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } +! % +! \def\urefcodeamp{\urefprestretch \&\urefpoststretch} +! \def\urefcodedot{\urefprestretch .\urefpoststretch} +! \def\urefcodehash{\urefprestretch \#\urefpoststretch} +! \def\urefcodequest{\urefprestretch ?\urefpoststretch} + \def\urefcodeslash{\futurelet\next\urefcodeslashfinish} + { + \catcode`\/=\active + \global\def\urefcodeslashfinish{% +! \urefprestretch \slashChar + % Allow line break only after the final / in a sequence of + % slashes, to avoid line break between the slashes in http://. +! \ifx\next/\else \urefpoststretch \fi + } + } + +! % One more complication: by default we'll break after the special +! % characters, but some people like to break before the special chars, so +! % allow that. Also allow no breaking at all, for manual control. +! % + \parseargdef\urefbreakstyle{% + \def\txiarg{#1}% + \ifx\txiarg\wordnone + \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordbefore +! \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordafter +! \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} + \else + \errhelp = \EMsimple + \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% +--- 3186,3218 ---- + \global\def/{\normalslash} + } + +! \def\urefcodeamp{\urefprebreak \&\urefpostbreak} +! \def\urefcodedot{\urefprebreak .\urefpostbreak} +! \def\urefcodehash{\urefprebreak \#\urefpostbreak} +! \def\urefcodequest{\urefprebreak ?\urefpostbreak} + \def\urefcodeslash{\futurelet\next\urefcodeslashfinish} + { + \catcode`\/=\active + \global\def\urefcodeslashfinish{% +! \urefprebreak \slashChar + % Allow line break only after the final / in a sequence of + % slashes, to avoid line break between the slashes in http://. +! \ifx\next/\else \urefpostbreak \fi + } + } + +! % By default we'll break after the special characters, but some people like to +! % break before the special chars, so allow that. Also allow no breaking at +! % all, for manual control. +! % + \parseargdef\urefbreakstyle{% + \def\txiarg{#1}% + \ifx\txiarg\wordnone + \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordbefore +! \def\urefprebreak{\urefallowbreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordafter +! \def\urefprebreak{\nobreak}\def\urefpostbreak{\urefallowbreak} + \else + \errhelp = \EMsimple + \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% +*************** +*** 2671,2676 **** +--- 3222,3241 ---- + \def\wordbefore{before} + \def\wordnone{none} + ++ % Allow a ragged right output to aid breaking long URL's. There can ++ % be a break at the \allowbreak with no extra glue (if the existing stretch in ++ % the line is sufficient), a break at the \penalty with extra glue added ++ % at the end of the line, or no break at all here. ++ % Changing the value of the penalty and/or the amount of stretch affects how ++ % preferable one choice is over the other. ++ % Check test cases in doc/texinfo-tex-test.texi before making any changes. ++ \def\urefallowbreak{% ++ \penalty0\relax ++ \hskip 0pt plus 3 em\relax ++ \penalty1000\relax ++ \hskip 0pt plus -3 em\relax ++ } ++ + \urefbreakstyle after + + % @url synonym for @uref, since that's how everyone uses it. +*************** +*** 2681,2687 **** + % So now @email is just like @uref, unless we are pdf. + % + %\def\email#1{\angleleft{\tt #1}\angleright} +! \ifpdf + \def\email#1{\doemail#1,,\finish} + \def\doemail#1,#2,#3\finish{\begingroup + \unsepspaces +--- 3246,3252 ---- + % So now @email is just like @uref, unless we are pdf. + % + %\def\email#1{\angleleft{\tt #1}\angleright} +! \ifpdforxetex + \def\email#1{\doemail#1,,\finish} + \def\doemail#1,#2,#3\finish{\begingroup + \unsepspaces +*************** +*** 2717,2732 **** + % Default is `distinct'. + \kbdinputstyle distinct + +! % @kbd is like @code, except that if the argument is just one @key command, +! % then @kbd has no effect. +! \def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} +! +! \def\xkey{\key} +! \def\kbdsub#1#2#3\par{% +! \def\one{#1}\def\three{#3}\def\threex{??}% +! \ifx\one\xkey\ifx\threex\three \key{#2}% +! \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +! \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi + } + + % definition of @key that produces a lozenge. Doesn't adjust to text size. +--- 3282,3289 ---- + % Default is `distinct'. + \kbdinputstyle distinct + +! \def\kbd#1{% +! \tclose{\kbdfont\setcodequotes#1}% + } + + % definition of @key that produces a lozenge. Doesn't adjust to text size. +*************** +*** 2739,2752 **** + % \kern-0.4pt\hrule}% + % \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +! % definition of @key with no lozenge. If the current font is already +! % monospace, don't change it; that way, we respect @kbdinputstyle. But +! % if it isn't monospace, then use \tt. +! % +! \def\key#1{{\setupmarkupstyle{key}% +! \nohyphenation +! \ifmonospace\else\tt\fi +! #1}\null} + + % @clicksequence{File @click{} Open ...} + \def\clicksequence#1{\begingroup #1\endgroup} +--- 3296,3304 ---- + % \kern-0.4pt\hrule}% + % \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +! % definition of @key with no lozenge. +! % +! \def\key#1{{\setregularquotes \tt #1}\null} + + % @clicksequence{File @click{} Open ...} + \def\clicksequence#1{\begingroup #1\endgroup} +*************** +*** 2760,2777 **** + % + \def\dmn#1{\thinspace #1} + +- % @l was never documented to mean ``switch to the Lisp font'', +- % and it is not used as such in any manual I can find. We need it for +- % Polish suppressed-l. --karl, 22sep96. +- %\def\l#1{{\li #1}\null} +- + % @acronym for "FBI", "NATO", and the like. + % We print this one point size smaller, since it's intended for + % all-uppercase. + % + \def\acronym#1{\doacronym #1,,\finish} + \def\doacronym#1,#2,#3\finish{% +! {\selectfonts\lsize #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% +--- 3312,3324 ---- + % + \def\dmn#1{\thinspace #1} + + % @acronym for "FBI", "NATO", and the like. + % We print this one point size smaller, since it's intended for + % all-uppercase. + % + \def\acronym#1{\doacronym #1,,\finish} + \def\doacronym#1,#2,#3\finish{% +! {\switchtolsize #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% +*************** +*** 2817,2837 **** + \def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} + % + \def\math{% +! \tex +! \mathunderscore +! \let\\ = \mathbackslash +! \mathactive +! % make the texinfo accent commands work in math mode +! \let\"=\ddot +! \let\'=\acute +! \let\==\bar +! \let\^=\hat +! \let\`=\grave +! \let\u=\breve +! \let\v=\check +! \let\~=\tilde +! \let\dotaccent=\dot +! $\finishmath + } + \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. + +--- 3364,3387 ---- + \def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} + % + \def\math{% +! \ifmmode\else % only go into math if not in math mode already +! \tex +! \mathunderscore +! \let\\ = \mathbackslash +! \mathactive +! % make the texinfo accent commands work in math mode +! \let\"=\ddot +! \let\'=\acute +! \let\==\bar +! \let\^=\hat +! \let\`=\grave +! \let\u=\breve +! \let\v=\check +! \let\~=\tilde +! \let\dotaccent=\dot +! % have to provide another name for sup operator +! \let\mathopsup=\sup +! $\expandafter\finishmath\fi + } + \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. + +*************** +*** 2854,2866 **** + } + } + +! % ctrl is no longer a Texinfo command, but leave this definition for fun. +! \def\ctrl #1{{\tt \rawbackslash \hat}#1} + + % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. + % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, + % except specified as a normal braced arg, so no newlines to worry about. +! % + \def\outfmtnametex{tex} + % + \long\def\inlinefmt#1{\doinlinefmt #1,\finish} +--- 3404,3448 ---- + } + } + +! % for @sub and @sup, if in math mode, just do a normal sub/superscript. +! % If in text, use math to place as sub/superscript, but switch +! % into text mode, with smaller fonts. This is a different font than the +! % one used for real math sub/superscripts (8pt vs. 7pt), but let's not +! % fix it (significant additions to font machinery) until someone notices. +! % +! \def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi} +! \def\finishsub#1{$\sb{\hbox{\switchtolllsize #1}}$}% +! % +! \def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi} +! \def\finishsup#1{$\ptexsp{\hbox{\switchtolllsize #1}}$}% +! +! % provide this command from LaTeX as it is very common +! \def\frac#1#2{{{#1}\over{#2}}} +! +! % @displaymath. +! % \globaldefs is needed to recognize the end lines in \tex and +! % \end tex. Set \thisenv as @end displaymath is seen before @end tex. +! {\obeylines +! \globaldefs=1 +! \envdef\displaymath{% +! \tex% +! \def\thisenv{\displaymath}% +! \begingroup\let\end\displaymathend% +! $$% +! } +! +! \def\displaymathend{$$\endgroup\end}% +! +! \def\Edisplaymath{% +! \def\thisenv{\tex}% +! \end tex +! }} +! + + % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. + % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, + % except specified as a normal braced arg, so no newlines to worry about. +! % + \def\outfmtnametex{tex} + % + \long\def\inlinefmt#1{\doinlinefmt #1,\finish} +*************** +*** 2868,2873 **** +--- 3450,3464 ---- + \def\inlinefmtname{#1}% + \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi + } ++ % ++ % @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if ++ % FMTNAME is tex, else ELSE-TEXT. ++ \long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} ++ \long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{% ++ \def\inlinefmtname{#1}% ++ \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\fi ++ } ++ % + % For raw, must switch into @tex before parsing the argument, to avoid + % setting catcodes prematurely. Doing it this way means that, for + % example, @inlineraw{html, foo{bar} gets a parse error instead of being +*************** +*** 2875,2881 **** + % *right* brace they would have to use a command anyway, so they may as + % well use a command to get a left brace too. We could re-use the + % delimiter character idea from \verb, but it seems like overkill. +! % + \long\def\inlineraw{\tex \doinlineraw} + \long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} + \def\doinlinerawtwo#1,#2,\finish{% +--- 3466,3472 ---- + % *right* brace they would have to use a command anyway, so they may as + % well use a command to get a left brace too. We could re-use the + % delimiter character idea from \verb, but it seems like overkill. +! % + \long\def\inlineraw{\tex \doinlineraw} + \long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} + \def\doinlinerawtwo#1,#2,\finish{% +*************** +*** 2884,2889 **** +--- 3475,3497 ---- + \endgroup % close group opened by \tex. + } + ++ % @inlineifset{VAR, TEXT} expands TEXT if VAR is @set. ++ % ++ \long\def\inlineifset#1{\doinlineifset #1,\finish} ++ \long\def\doinlineifset#1,#2,\finish{% ++ \def\inlinevarname{#1}% ++ \expandafter\ifx\csname SET\inlinevarname\endcsname\relax ++ \else\ignorespaces#2\fi ++ } ++ ++ % @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set. ++ % ++ \long\def\inlineifclear#1{\doinlineifclear #1,\finish} ++ \long\def\doinlineifclear#1,#2,\finish{% ++ \def\inlinevarname{#1}% ++ \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi ++ } ++ + + \message{glyphs,} + % and logos. +*************** +*** 2893,2915 **** + \let\atchar=\@ + + % @{ @} @lbracechar{} @rbracechar{} all generate brace characters. +! % Unless we're in typewriter, use \ecfont because the CM text fonts do +! % not have braces, and we don't want to switch into math. +! \def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} +! \def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} +! \let\{=\mylbrace \let\lbracechar=\{ +! \let\}=\myrbrace \let\rbracechar=\} +! \begingroup +! % Definitions to produce \{ and \} commands for indices, +! % and @{ and @} for the aux/toc files. +! \catcode`\{ = \other \catcode`\} = \other +! \catcode`\[ = 1 \catcode`\] = 2 +! \catcode`\! = 0 \catcode`\\ = \other +! !gdef!lbracecmd[\{]% +! !gdef!rbracecmd[\}]% +! !gdef!lbraceatcmd[@{]% +! !gdef!rbraceatcmd[@}]% +! !endgroup + + % @comma{} to avoid , parsing problems. + \let\comma = , +--- 3501,3510 ---- + \let\atchar=\@ + + % @{ @} @lbracechar{} @rbracechar{} all generate brace characters. +! \def\lbracechar{{\ifusingtt{\char123}{\ensuremath\lbrace}}} +! \def\rbracechar{{\ifusingtt{\char125}{\ensuremath\rbrace}}} +! \let\{=\lbracechar +! \let\}=\rbracechar + + % @comma{} to avoid , parsing problems. + \let\comma = , +*************** +*** 2927,2934 **** + % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. + \def\questiondown{?`} + \def\exclamdown{!`} +! \def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} +! \def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} + + % Dotless i and dotless j, used for accents. + \def\imacro{i} +--- 3522,3529 ---- + % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. + \def\questiondown{?`} + \def\exclamdown{!`} +! \def\ordf{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{a}}} +! \def\ordm{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{o}}} + + % Dotless i and dotless j, used for accents. + \def\imacro{i} +*************** +*** 2957,2968 **** + {\setbox0=\hbox{T}% + \vbox to \ht0{\hbox{% + \ifx\textnominalsize\xwordpt +! % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. + % Revert to plain's \scriptsize, which is 7pt. + \count255=\the\fam $\fam\count255 \scriptstyle A$% + \else +! % For 11pt, we can use our lllsize. +! \selectfonts\lllsize A% + \fi + }% + \vss +--- 3552,3568 ---- + {\setbox0=\hbox{T}% + \vbox to \ht0{\hbox{% + \ifx\textnominalsize\xwordpt +! % for 10pt running text, lllsize (8pt) is too small for the A in LaTeX. + % Revert to plain's \scriptsize, which is 7pt. + \count255=\the\fam $\fam\count255 \scriptstyle A$% + \else +! \ifx\curfontsize\smallword +! % For footnotes and indices +! \count255=\the\fam $\fam\count255 \scriptstyle A$% +! \else +! % For 11pt, we can use our lllsize. +! \switchtolllsize A% +! \fi + \fi + }% + \vss +*************** +*** 2970,2981 **** + \kern-.15em + \TeX + } + +! % Some math mode symbols. +! \def\bullet{$\ptexbullet$} +! \def\geq{\ifmmode \ge\else $\ge$\fi} +! \def\leq{\ifmmode \le\else $\le$\fi} +! \def\minus{\ifmmode -\else $-$\fi} + + % @dots{} outputs an ellipsis using the current font. + % We do .5em per period so that it has the same spacing in the cm +--- 3570,3587 ---- + \kern-.15em + \TeX + } ++ \def\smallword{small} + +! % Some math mode symbols. Define \ensuremath to switch into math mode +! % unless we are already there. Expansion tricks may not be needed here, +! % but safer, and can't hurt. +! \def\ensuremath{\ifmmode \expandafter\asis \else\expandafter\ensuredmath \fi} +! \def\ensuredmath#1{$\relax#1$} +! % +! \def\bullet{\ensuremath\ptexbullet} +! \def\geq{\ensuremath\ge} +! \def\leq{\ensuremath\le} +! \def\minus{\ensuremath-} + + % @dots{} outputs an ellipsis using the current font. + % We do .5em per period so that it has the same spacing in the cm +*************** +*** 3023,3029 **** + % + \newbox\errorbox + % +! {\tentt \global\dimen0 = 3em}% Width of the box. + \dimen2 = .55pt % Thickness of rules + % The text. (`r' is open on the right, `e' somewhat less so on the left.) + \setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} +--- 3629,3635 ---- + % + \newbox\errorbox + % +! {\ttfont \global\dimen0 = 3em}% Width of the box. + \dimen2 = .55pt % Thickness of rules + % The text. (`r' is open on the right, `e' somewhat less so on the left.) + \setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} +*************** +*** 3043,3049 **** + + % @pounds{} is a sterling sign, which Knuth put in the CM italic font. + % +! \def\pounds{{\it\$}} + + % @euro{} comes from a separate font, depending on the current style. + % We use the free feym* fonts from the eurosym package by Henrik +--- 3649,3655 ---- + + % @pounds{} is a sterling sign, which Knuth put in the CM italic font. + % +! \def\pounds{{\ifusingtt{\ecfont\char"BF}{\it\$}}} + + % @euro{} comes from a separate font, depending on the current style. + % We use the free feym* fonts from the eurosym package by Henrik +*************** +*** 3112,3117 **** +--- 3718,3726 ---- + \def\quotedblbase{{\ecfont \char"12}} + \def\quotesinglbase{{\ecfont \char"0D}} + % ++ \def\L{{\ecfont \char"8A}} % L with stroke ++ \def\l{{\ecfont \char"AA}} % l with stroke ++ % + % This positioning is not perfect (see the ogonek LaTeX package), but + % we have the precomposed glyphs for the most common cases. We put the + % tests to use those glyphs in the single \ogonek macro so we have fewer +*************** +*** 3139,3180 **** + \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} + \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} + % +! % Use the ec* fonts (cm-super in outline format) for non-CM glyphs. +! \def\ecfont{% + % We can't distinguish serif/sans and italic/slanted, but this + % is used for crude hacks anyway (like adding French and German + % quotes to documents typeset with CM, where we lose kerning), so + % hopefully nobody will notice/care. + \edef\ecsize{\csname\curfontsize ecsize\endcsname}% + \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% +! \ifmonospace +! % typewriter: +! \font\thisecfont = ectt\ecsize \space at \nominalsize +! \else +! \ifx\curfontstyle\bfstylename +! % bold: +! \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize +! \else +! % regular: +! \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize +! \fi +! \fi + \thisecfont + } + + % @registeredsymbol - R in a circle. The font for the R should really + % be smaller yet, but lllsize is the best we can do for now. + % Adapted from the plain.tex definition of \copyright. + % + \def\registeredsymbol{% +! $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% + \hfil\crcr\Orb}}% + }$% + } + + % @textdegree - the normal degrees sign. + % +! \def\textdegree{$^\circ$} + + % Laurent Siebenmann reports \Orb undefined with: + % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 +--- 3748,3807 ---- + \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} + \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} + % +! % Use the European Computer Modern fonts (cm-super in outline format) +! % for non-CM glyphs. That is ec* for regular text and tc* for the text +! % companion symbols (LaTeX TS1 encoding). Both are part of the ec +! % package and follow the same conventions. +! % +! \def\ecfont{\etcfont{e}} +! \def\tcfont{\etcfont{t}} +! % +! \def\etcfont#1{% + % We can't distinguish serif/sans and italic/slanted, but this + % is used for crude hacks anyway (like adding French and German + % quotes to documents typeset with CM, where we lose kerning), so + % hopefully nobody will notice/care. + \edef\ecsize{\csname\curfontsize ecsize\endcsname}% + \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% +! \ifusingtt +! % typewriter: +! {\font\thisecfont = #1ctt\ecsize \space at \nominalsize}% +! % else +! {\ifx\curfontstyle\bfstylename +! \etcfontbold{#1}% +! \else +! \ifrmisbold +! \etcfontbold{#1}% +! \else +! % regular: +! \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space +! at \nominalsize +! \fi +! \fi}% + \thisecfont + } + ++ \def\etcfontbold#1{% ++ % bold: ++ \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize ++ } ++ + % @registeredsymbol - R in a circle. The font for the R should really + % be smaller yet, but lllsize is the best we can do for now. + % Adapted from the plain.tex definition of \copyright. + % + \def\registeredsymbol{% +! $^{{\ooalign{\hfil\raise.07ex\hbox{\switchtolllsize R}% + \hfil\crcr\Orb}}% + }$% + } + + % @textdegree - the normal degrees sign. + % +! \def\textdegree{% +! \ifmmode ^\circ +! \else {\tcfont \char 176}% +! \fi} + + % Laurent Siebenmann reports \Orb undefined with: + % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 +*************** +*** 3185,3195 **** + \fi + + % Quotes. +- \chardef\quotedblleft="5C +- \chardef\quotedblright=`\" + \chardef\quoteleft=`\` + \chardef\quoteright=`\' + + + \message{page headings,} + +--- 3812,3830 ---- + \fi + + % Quotes. + \chardef\quoteleft=`\` + \chardef\quoteright=`\' + ++ % only change font for tt for correct kerning and to avoid using ++ % \ecfont unless necessary. ++ \def\quotedblleft{% ++ \ifusingtt{{\ecfont\char"10}}{{\char"5C}}% ++ } ++ ++ \def\quotedblright{% ++ \ifusingtt{{\ecfont\char"11}}{{\char`\"}}% ++ } ++ + + \message{page headings,} + +*************** +*** 3200,3221 **** + \newif\ifseenauthor + \newif\iffinishedtitlepage + +! % Do an implicit @contents or @shortcontents after @end titlepage if the +! % user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. +! % +! \newif\ifsetcontentsaftertitlepage +! \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue +! \newif\ifsetshortcontentsaftertitlepage +! \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue + + \parseargdef\shorttitlepage{% +! \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% +! \endgroup\page\hbox{}\page} + + \envdef\titlepage{% + % Open one extra group, as we want to close it in the middle of \Etitlepage. + \begingroup + \parindent=0pt \textfonts + % Leave some space at the very top of the page. + \vglue\titlepagetopglue + % No rule at page bottom unless we print one at the top with @title. +--- 3835,3860 ---- + \newif\ifseenauthor + \newif\iffinishedtitlepage + +! % @setcontentsaftertitlepage used to do an implicit @contents or +! % @shortcontents after @end titlepage, but it is now obsolete. +! \def\setcontentsaftertitlepage{% +! \errmessage{@setcontentsaftertitlepage has been removed as a Texinfo +! command; move your @contents command if you want the contents +! after the title page.}}% +! \def\setshortcontentsaftertitlepage{% +! \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo +! command; move your @shortcontents and @contents commands if you +! want the contents after the title page.}}% + + \parseargdef\shorttitlepage{% +! {\headingsoff \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% +! \endgroup\page\hbox{}\page}\pageone} + + \envdef\titlepage{% + % Open one extra group, as we want to close it in the middle of \Etitlepage. + \begingroup + \parindent=0pt \textfonts ++ \headingsoff + % Leave some space at the very top of the page. + \vglue\titlepagetopglue + % No rule at page bottom unless we print one at the top with @title. +*************** +*** 3243,3267 **** + % If we use the new definition of \page, we always get a blank page + % after the title page, which we certainly don't want. + \oldpage + \endgroup + % +- % Need this before the \...aftertitlepage checks so that if they are +- % in effect the toc pages will come out with page numbers. +- \HEADINGSon +- % +- % If they want short, they certainly want long too. +- \ifsetshortcontentsaftertitlepage +- \shortcontents +- \contents +- \global\let\shortcontents = \relax +- \global\let\contents = \relax +- \fi +- % +- \ifsetcontentsaftertitlepage +- \contents +- \global\let\contents = \relax +- \global\let\shortcontents = \relax +- \fi + } + + \def\finishtitlepage{% +--- 3882,3890 ---- + % If we use the new definition of \page, we always get a blank page + % after the title page, which we certainly don't want. + \oldpage ++ \pageone + \endgroup + % + } + + \def\finishtitlepage{% +*************** +*** 3272,3283 **** + + % Settings used for typesetting titles: no hyphenation, no indentation, + % don't worry much about spacing, ragged right. This should be used +! % inside a \vbox, and fonts need to be set appropriately first. Because +! % it is always used for titles, nothing else, we call \rmisbold. \par +! % should be specified before the end of the \vbox, since a vbox is a group. +! % + \def\raggedtitlesettings{% +! \rmisbold + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 +--- 3895,3905 ---- + + % Settings used for typesetting titles: no hyphenation, no indentation, + % don't worry much about spacing, ragged right. This should be used +! % inside a \vbox, and fonts need to be set appropriately first. \par should +! % be specified before the end of the \vbox, since a vbox is a group. +! % + \def\raggedtitlesettings{% +! \rm + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 +*************** +*** 3286,3292 **** + + % Macros to be used within @titlepage: + +! \let\subtitlerm=\tenrm + \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} + + \parseargdef\title{% +--- 3908,3914 ---- + + % Macros to be used within @titlepage: + +! \let\subtitlerm=\rmfont + \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} + + \parseargdef\title{% +*************** +*** 3312,3318 **** + \else + \checkenv\titlepage + \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi +! {\secfonts\rmisbold \leftline{#1}}% + \fi + } + +--- 3934,3940 ---- + \else + \checkenv\titlepage + \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi +! {\secfonts\rm \leftline{#1}}% + \fi + } + +*************** +*** 3323,3336 **** + + \newtoks\evenheadline % headline on even pages + \newtoks\oddheadline % headline on odd pages + \newtoks\evenfootline % footline on even pages + \newtoks\oddfootline % footline on odd pages + +! % Now make TeX use those variables +! \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline +! \else \the\evenheadline \fi}} +! \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline +! \else \the\evenfootline \fi}\HEADINGShook} + \let\HEADINGShook=\relax + + % Commands to set those variables. +--- 3945,3966 ---- + + \newtoks\evenheadline % headline on even pages + \newtoks\oddheadline % headline on odd pages ++ \newtoks\evenchapheadline% headline on even pages with a new chapter ++ \newtoks\oddchapheadline % headline on odd pages with a new chapter + \newtoks\evenfootline % footline on even pages + \newtoks\oddfootline % footline on odd pages + +! % Now make \makeheadline and \makefootline in Plain TeX use those variables +! \headline={{\textfonts\rm\frenchspacingsetting +! \ifchapterpage +! \ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi +! \else +! \ifodd\pageno\the\oddheadline\else\the\evenheadline\fi +! \fi}} +! +! \footline={{\textfonts\rm\frenchspacingsetting +! \ifodd\pageno \the\oddfootline \else \the\evenfootline \fi}% +! \HEADINGShook} + \let\HEADINGShook=\relax + + % Commands to set those variables. +*************** +*** 3344,3355 **** + \def\evenheading{\parsearg\evenheadingxxx} + \def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} + \def\evenheadingyyy #1\|#2\|#3\|#4\finish{% +! \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + + \def\oddheading{\parsearg\oddheadingxxx} + \def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} + \def\oddheadingyyy #1\|#2\|#3\|#4\finish{% +! \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + + \parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% + +--- 3974,3987 ---- + \def\evenheading{\parsearg\evenheadingxxx} + \def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} + \def\evenheadingyyy #1\|#2\|#3\|#4\finish{% +! \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}} +! \global\evenchapheadline=\evenheadline} + + \def\oddheading{\parsearg\oddheadingxxx} + \def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} + \def\oddheadingyyy #1\|#2\|#3\|#4\finish{% +! \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}% +! \global\oddchapheadline=\oddheadline} + + \parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% + +*************** +*** 3365,3371 **** + % + % Leave some space for the footline. Hopefully ok to assume + % @evenfooting will not be used by itself. +! \global\advance\pageheight by -12pt + \global\advance\vsize by -12pt + } + +--- 3997,4003 ---- + % + % Leave some space for the footline. Hopefully ok to assume + % @evenfooting will not be used by itself. +! \global\advance\txipageheight by -12pt + \global\advance\vsize by -12pt + } + +*************** +*** 3382,3394 **** + % @everyheadingmarks + % @everyfootingmarks + + \def\evenheadingmarks{\headingmarks{even}{heading}} + \def\oddheadingmarks{\headingmarks{odd}{heading}} + \def\evenfootingmarks{\headingmarks{even}{footing}} + \def\oddfootingmarks{\headingmarks{odd}{footing}} +! \def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} + \headingmarks{odd}{heading}{#1} } +! \def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} + \headingmarks{odd}{footing}{#1} } + % #1 = even/odd, #2 = heading/footing, #3 = top/bottom. + \def\headingmarks#1#2#3 {% +--- 4014,4030 ---- + % @everyheadingmarks + % @everyfootingmarks + ++ % These define \getoddheadingmarks, \getevenheadingmarks, ++ % \getoddfootingmarks, and \getevenfootingmarks, each to one of ++ % \gettopheadingmarks, \getbottomheadingmarks. ++ % + \def\evenheadingmarks{\headingmarks{even}{heading}} + \def\oddheadingmarks{\headingmarks{odd}{heading}} + \def\evenfootingmarks{\headingmarks{even}{footing}} + \def\oddfootingmarks{\headingmarks{odd}{footing}} +! \parseargdef\everyheadingmarks{\headingmarks{even}{heading}{#1} + \headingmarks{odd}{heading}{#1} } +! \parseargdef\everyfootingmarks{\headingmarks{even}{footing}{#1} + \headingmarks{odd}{footing}{#1} } + % #1 = even/odd, #2 = heading/footing, #3 = top/bottom. + \def\headingmarks#1#2#3 {% +*************** +*** 3409,3467 **** + % By default, they are off at the start of a document, + % and turned `on' after @end titlepage. + +! \def\headings #1 {\csname HEADINGS#1\endcsname} + + \def\headingsoff{% non-global headings elimination +! \evenheadline={\hfil}\evenfootline={\hfil}% +! \oddheadline={\hfil}\oddfootline={\hfil}% + } + + \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting +- \HEADINGSoff % it's the default + +! % When we turn headings on, set the page number to 1. + % For double-sided printing, put current file name in lower left corner, + % chapter name on inside top of right hand pages, document + % title on inside top of left hand pages, and page numbers on outside top + % edge of all pages. + \def\HEADINGSdouble{% +- \global\pageno=1 + \global\evenfootline={\hfil} + \global\oddfootline={\hfil} + \global\evenheadline={\line{\folio\hfil\thistitle}} + \global\oddheadline={\line{\thischapter\hfil\folio}} + \global\let\contentsalignmacro = \chapoddpage + } +- \let\contentsalignmacro = \chappager + + % For single-sided printing, chapter title goes across top left of page, + % page number on top right. + \def\HEADINGSsingle{% +- \global\pageno=1 + \global\evenfootline={\hfil} + \global\oddfootline={\hfil} + \global\evenheadline={\line{\thischapter\hfil\folio}} + \global\oddheadline={\line{\thischapter\hfil\folio}} + \global\let\contentsalignmacro = \chappager + } +- \def\HEADINGSon{\HEADINGSdouble} +- +- \def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} +- \let\HEADINGSdoubleafter=\HEADINGSafter +- \def\HEADINGSdoublex{% +- \global\evenfootline={\hfil} +- \global\oddfootline={\hfil} +- \global\evenheadline={\line{\folio\hfil\thistitle}} +- \global\oddheadline={\line{\thischapter\hfil\folio}} +- \global\let\contentsalignmacro = \chapoddpage +- } + +! \def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} +! \def\HEADINGSsinglex{% + \global\evenfootline={\hfil} + \global\oddfootline={\hfil} + \global\evenheadline={\line{\thischapter\hfil\folio}} + \global\oddheadline={\line{\thischapter\hfil\folio}} + \global\let\contentsalignmacro = \chappager + } + +--- 4045,4106 ---- + % By default, they are off at the start of a document, + % and turned `on' after @end titlepage. + +! \parseargdef\headings{\csname HEADINGS#1\endcsname} + + \def\headingsoff{% non-global headings elimination +! \evenheadline={\hfil}\evenfootline={\hfil}\evenchapheadline={\hfil}% +! \oddheadline={\hfil}\oddfootline={\hfil}\oddchapheadline={\hfil}% + } + + \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting + +! % Set the page number to 1. +! \def\pageone{ +! \global\pageno=1 +! \global\arabiccount = \pagecount +! } +! +! \let\contentsalignmacro = \chappager +! +! % \def\HEADINGSon{\HEADINGSdouble} % defined by \CHAPPAGon +! + % For double-sided printing, put current file name in lower left corner, + % chapter name on inside top of right hand pages, document + % title on inside top of left hand pages, and page numbers on outside top + % edge of all pages. ++ \def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdouble} ++ \let\HEADINGSdoubleafter=\HEADINGSafter + \def\HEADINGSdouble{% + \global\evenfootline={\hfil} + \global\oddfootline={\hfil} + \global\evenheadline={\line{\folio\hfil\thistitle}} + \global\oddheadline={\line{\thischapter\hfil\folio}} ++ \global\evenchapheadline={\line{\folio\hfil\thistitle}} ++ \global\oddchapheadline={\line{\hfil\folio}} + \global\let\contentsalignmacro = \chapoddpage + } + + % For single-sided printing, chapter title goes across top left of page, + % page number on top right. ++ \def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsingle} + \def\HEADINGSsingle{% + \global\evenfootline={\hfil} + \global\oddfootline={\hfil} + \global\evenheadline={\line{\thischapter\hfil\folio}} + \global\oddheadline={\line{\thischapter\hfil\folio}} ++ \global\evenchapheadline={\line{\hfil\folio}} ++ \global\oddchapheadline={\line{\hfil\folio}} + \global\let\contentsalignmacro = \chappager + } + +! % for @setchapternewpage off +! \def\HEADINGSsinglechapoff{% + \global\evenfootline={\hfil} + \global\oddfootline={\hfil} + \global\evenheadline={\line{\thischapter\hfil\folio}} + \global\oddheadline={\line{\thischapter\hfil\folio}} ++ \global\evenchapheadline=\evenheadline ++ \global\oddchapheadline=\oddheadline + \global\let\contentsalignmacro = \chappager + } + +*************** +*** 3639,3645 **** + \parskip=\smallskipamount + \ifdim\parskip=0pt \parskip=2pt \fi + % +! % Try typesetting the item mark that if the document erroneously says + % something like @itemize @samp (intending @table), there's an error + % right away at the @itemize. It's not the best error message in the + % world, but it's better than leaving it to the @item. This means if +--- 4278,4284 ---- + \parskip=\smallskipamount + \ifdim\parskip=0pt \parskip=2pt \fi + % +! % Try typesetting the item mark so that if the document erroneously says + % something like @itemize @samp (intending @table), there's an error + % right away at the @itemize. It's not the best error message in the + % world, but it's better than leaving it to the @item. This means if +*************** +*** 3671,3677 **** + \noindent + \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% + % +! \vadjust{\penalty 1200}}% not good to break after first line of item. + \flushcr + } + +--- 4310,4321 ---- + \noindent + \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% + % +! \ifinner\else +! \vadjust{\penalty 1200}% not good to break after first line of item. +! \fi +! % We can be in inner vertical mode in a footnote, although an +! % @itemize looks awful there. +! }% + \flushcr + } + +*************** +*** 3765,3846 **** + \doitemize{#1.}\flushcr + } + +- % @alphaenumerate and @capsenumerate are abbreviations for giving an arg +- % to @enumerate. +- % +- \def\alphaenumerate{\enumerate{a}} +- \def\capsenumerate{\enumerate{A}} +- \def\Ealphaenumerate{\Eenumerate} +- \def\Ecapsenumerate{\Eenumerate} +- + + % @multitable macros +- % Amy Hendrickson, 8/18/94, 3/6/96 +- % +- % @multitable ... @end multitable will make as many columns as desired. +- % Contents of each column will wrap at width given in preamble. Width +- % can be specified either with sample text given in a template line, +- % or in percent of \hsize, the current width of text on page. +- +- % Table can continue over pages but will only break between lines. +- +- % To make preamble: +- % +- % Either define widths of columns in terms of percent of \hsize: +- % @multitable @columnfractions .25 .3 .45 +- % @item ... +- % +- % Numbers following @columnfractions are the percent of the total +- % current hsize to be used for each column. You may use as many +- % columns as desired. +- +- +- % Or use a template: +- % @multitable {Column 1 template} {Column 2 template} {Column 3 template} +- % @item ... +- % using the widest term desired in each column. +- +- % Each new table line starts with @item, each subsequent new column +- % starts with @tab. Empty columns may be produced by supplying @tab's +- % with nothing between them for as many times as empty columns are needed, +- % ie, @tab@tab@tab will produce two empty columns. +- +- % @item, @tab do not need to be on their own lines, but it will not hurt +- % if they are. +- +- % Sample multitable: +- +- % @multitable {Column 1 template} {Column 2 template} {Column 3 template} +- % @item first col stuff @tab second col stuff @tab third col +- % @item +- % first col stuff +- % @tab +- % second col stuff +- % @tab +- % third col +- % @item first col stuff @tab second col stuff +- % @tab Many paragraphs of text may be used in any column. +- % +- % They will wrap at the width determined by the template. +- % @item@tab@tab This will be in third column. +- % @end multitable +- +- % Default dimensions may be reset by user. +- % @multitableparskip is vertical space between paragraphs in table. +- % @multitableparindent is paragraph indent in table. +- % @multitablecolmargin is horizontal space to be left between columns. +- % @multitablelinespace is space to leave between table items, baseline +- % to baseline. +- % 0pt means it depends on current normal line spacing. +- % +- \newskip\multitableparskip +- \newskip\multitableparindent +- \newdimen\multitablecolspace +- \newskip\multitablelinespace +- \multitableparskip=0pt +- \multitableparindent=6pt +- \multitablecolspace=12pt +- \multitablelinespace=0pt + + % Macros used to set up halign preamble: + % +--- 4409,4416 ---- +*************** +*** 3888,3915 **** + \go + } + +! % multitable-only commands. +! % +! % @headitem starts a heading row, which we typeset in bold. +! % Assignments have to be global since we are inside the implicit group +! % of an alignment entry. \everycr resets \everytab so we don't have to + % undo it ourselves. + \def\headitemfont{\b}% for people to use in the template row; not changeable + \def\headitem{% +! \checkenv\multitable +! \crcr + \global\everytab={\bf}% can't use \headitemfont since the parsing differs + \the\everytab % for the first item + }% + % +! % A \tab used to include \hskip1sp. But then the space in a template +! % line is not enough. That is bad. So let's go back to just `&' until +! % we again encounter the problem the 1sp was intended to solve. +! % --karl, nathan@acm.org, 20apr99. + \def\tab{\checkenv\multitable &\the\everytab}% + +- % @multitable ... @end multitable definitions: +- % + \newtoks\everytab % insert after every tab. + % + \envdef\multitable{% +--- 4458,4480 ---- + \go + } + +! % @headitem starts a heading row, which we typeset in bold. Assignments +! % have to be global since we are inside the implicit group of an +! % alignment entry. \everycr below resets \everytab so we don't have to + % undo it ourselves. + \def\headitemfont{\b}% for people to use in the template row; not changeable + \def\headitem{% +! \crcr % must appear first +! \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings + \global\everytab={\bf}% can't use \headitemfont since the parsing differs + \the\everytab % for the first item + }% + % +! % default for tables with no headings. +! \let\headitemcrhook=\relax +! % + \def\tab{\checkenv\multitable &\the\everytab}% + + \newtoks\everytab % insert after every tab. + % + \envdef\multitable{% +*************** +*** 3924,3946 **** + % + \tolerance=9500 + \hbadness=9500 +! \setmultitablespacing +! \parskip=\multitableparskip +! \parindent=\multitableparindent + \overfullrule=0pt + \global\colcount=0 + % + \everycr = {% + \noalign{% +! \global\everytab={}% + \global\colcount=0 % Reset the column counter. +! % Check for saved footnotes, etc. + \checkinserts +! % Keeps underfull box messages off when table breaks over pages. +! %\filbreak +! % Maybe so, but it also creates really weird page breaks when the +! % table breaks over pages. Wouldn't \vfil be better? Wait until the +! % problem manifests itself, so it can be fixed for real --karl. + }% + }% + % +--- 4489,4510 ---- + % + \tolerance=9500 + \hbadness=9500 +! \parskip=0pt +! \parindent=6pt + \overfullrule=0pt + \global\colcount=0 + % + \everycr = {% + \noalign{% +! \global\everytab={}% Reset from possible headitem. + \global\colcount=0 % Reset the column counter. +! % +! % Check for saved footnotes, etc.: + \checkinserts +! % +! % Perhaps a \nobreak, then reset: +! \headitemcrhook +! \global\let\headitemcrhook=\relax + }% + }% + % +*************** +*** 3956,4002 **** + % continue for many paragraphs if desired. + \halign\bgroup &% + \global\advance\colcount by 1 +! \multistrut + \vtop{% +! % Use the current \colcount to find the correct column width: + \hsize=\expandafter\csname col\the\colcount\endcsname + % +! % In order to keep entries from bumping into each other +! % we will add a \leftskip of \multitablecolspace to all columns after +! % the first one. +! % +! % If a template has been used, we will add \multitablecolspace +! % to the width of each template entry. +! % +! % If the user has set preamble in terms of percent of \hsize we will +! % use that dimension as the width of the column, and the \leftskip +! % will keep entries from bumping into each other. Table will start at +! % left margin and final column will justify at right margin. +! % +! % Make sure we don't inherit \rightskip from the outer environment. +! \rightskip=0pt + \ifnum\colcount=1 +! % The first column will be indented with the surrounding text. +! \advance\hsize by\leftskip + \else +! \ifsetpercent \else +! % If user has not set preamble in terms of percent of \hsize +! % we will advance \hsize by \multitablecolspace. +! \advance\hsize by \multitablecolspace +! \fi +! % In either case we will make \leftskip=\multitablecolspace: +! \leftskip=\multitablecolspace + \fi +! % Ignoring space at the beginning and end avoids an occasional spurious +! % blank line, when TeX decides to break the line at the space before the +! % box from the multistrut, so the strut ends up on a line by itself. +! % For example: +! % @multitable @columnfractions .11 .89 +! % @item @code{#} +! % @tab Legal holiday which is valid in major parts of the whole country. +! % Is automatically provided with highlighting sequences respectively +! % marking characters. +! \noindent\ignorespaces##\unskip\multistrut + }\cr + } + \def\Emultitable{% +--- 4520,4543 ---- + % continue for many paragraphs if desired. + \halign\bgroup &% + \global\advance\colcount by 1 +! \strut + \vtop{% +! \advance\hsize by -1\leftskip +! % Find the correct column width + \hsize=\expandafter\csname col\the\colcount\endcsname + % +! \advance\rightskip by -1\rightskip % Zero leaving only any stretch + \ifnum\colcount=1 +! \advance\hsize by\leftskip % Add indent of surrounding text + \else +! % In order to keep entries from bumping into each other. +! \leftskip=12pt +! \ifsetpercent \else +! % If a template has been used +! \advance\hsize by \leftskip +! \fi + \fi +! \noindent\ignorespaces##\unskip\strut + }\cr + } + \def\Emultitable{% +*************** +*** 4005,4039 **** + \global\setpercentfalse + } + +- \def\setmultitablespacing{% +- \def\multistrut{\strut}% just use the standard line spacing +- % +- % Compute \multitablelinespace (if not defined by user) for use in +- % \multitableparskip calculation. We used define \multistrut based on +- % this, but (ironically) that caused the spacing to be off. +- % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. +- \ifdim\multitablelinespace=0pt +- \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip +- \global\advance\multitablelinespace by-\ht0 +- \fi +- % Test to see if parskip is larger than space between lines of +- % table. If not, do nothing. +- % If so, set to same dimension as multitablelinespace. +- \ifdim\multitableparskip>\multitablelinespace +- \global\multitableparskip=\multitablelinespace +- \global\advance\multitableparskip-7pt % to keep parskip somewhat smaller +- % than skip between lines in the table. +- \fi% +- \ifdim\multitableparskip=0pt +- \global\multitableparskip=\multitablelinespace +- \global\advance\multitableparskip-7pt % to keep parskip somewhat smaller +- % than skip between lines in the table. +- \fi} +- + + \message{conditionals,} + +! % @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, + % @ifnotxml always succeed. They currently do nothing; we don't + % attempt to check whether the conditionals are properly nested. But we + % have to remember that they are conditionals, so that @end doesn't +--- 4546,4555 ---- + \global\setpercentfalse + } + + + \message{conditionals,} + +! % @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotlatex, @ifnotplaintext, + % @ifnotxml always succeed. They currently do nothing; we don't + % attempt to check whether the conditionals are properly nested. But we + % have to remember that they are conditionals, so that @end doesn't +*************** +*** 4047,4052 **** +--- 4563,4569 ---- + \makecond{ifnotdocbook} + \makecond{ifnothtml} + \makecond{ifnotinfo} ++ \makecond{ifnotlatex} + \makecond{ifnotplaintext} + \makecond{ifnotxml} + +*************** +*** 4059,4068 **** +--- 4576,4587 ---- + \def\ifdocbook{\doignore{ifdocbook}} + \def\ifhtml{\doignore{ifhtml}} + \def\ifinfo{\doignore{ifinfo}} ++ \def\iflatex{\doignore{iflatex}} + \def\ifnottex{\doignore{ifnottex}} + \def\ifplaintext{\doignore{ifplaintext}} + \def\ifxml{\doignore{ifxml}} + \def\ignore{\doignore{ignore}} ++ \def\latex{\doignore{latex}} + \def\menu{\doignore{menu}} + \def\xml{\doignore{xml}} + +*************** +*** 4179,4185 **** + \def\value{\begingroup\makevalueexpandable\valuexxx} + \def\valuexxx#1{\expandablevalue{#1}\endgroup} + { +! \catcode`\- = \active \catcode`\_ = \active + % + \gdef\makevalueexpandable{% + \let\value = \expandablevalue +--- 4698,4704 ---- + \def\value{\begingroup\makevalueexpandable\valuexxx} + \def\valuexxx#1{\expandablevalue{#1}\endgroup} + { +! \catcode`\-=\active \catcode`\_=\active + % + \gdef\makevalueexpandable{% + \let\value = \expandablevalue +*************** +*** 4192,4205 **** + } + } + +- % We have this subroutine so that we can handle at least some @value's +- % properly in indexes (we call \makevalueexpandable in \indexdummies). +- % The command has to be fully expandable (if the variable is set), since +- % the result winds up in the index file. This means that if the +- % variable's value contains other Texinfo commands, it's almost certain +- % it will fail (although perhaps we could fix that with sufficient work +- % to do a one-level expansion on the result, instead of complete). +- % + \def\expandablevalue#1{% + \expandafter\ifx\csname SET#1\endcsname\relax + {[No value for ``#1'']}% +--- 4711,4716 ---- +*************** +*** 4209,4218 **** + \fi + } + + % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined + % with @set. + % +! % To get special treatment of `@end ifset,' call \makeond and the redefine. + % + \makecond{ifset} + \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} +--- 4720,4755 ---- + \fi + } + ++ % Like \expandablevalue, but completely expandable (the \message in the ++ % definition above operates at the execution level of TeX). Used when ++ % writing to auxiliary files, due to the expansion that \write does. ++ % If flag is undefined, pass through an unexpanded @value command: maybe it ++ % will be set by the time it is read back in. ++ % ++ % NB flag names containing - or _ may not work here. ++ \def\dummyvalue#1{% ++ \expandafter\ifx\csname SET#1\endcsname\relax ++ \string\value{#1}% ++ \else ++ \csname SET#1\endcsname ++ \fi ++ } ++ ++ % Used for @value's in index entries to form the sort key: expand the @value ++ % if possible, otherwise sort late. ++ \def\indexnofontsvalue#1{% ++ \expandafter\ifx\csname SET#1\endcsname\relax ++ ZZZZZZZ% ++ \else ++ \csname SET#1\endcsname ++ \fi ++ } ++ + % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined + % with @set. + % +! % To get the special treatment we need for `@end ifset,' we call +! % \makecond and then redefine. + % + \makecond{ifset} + \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} +*************** +*** 4243,4249 **** + % without the @) is in fact defined. We can only feasibly check at the + % TeX level, so something like `mathcode' is going to considered + % defined even though it is not a Texinfo command. +! % + \makecond{ifcommanddefined} + \def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} + % +--- 4780,4786 ---- + % without the @) is in fact defined. We can only feasibly check at the + % TeX level, so something like `mathcode' is going to considered + % defined even though it is not a Texinfo command. +! % + \makecond{ifcommanddefined} + \def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} + % +*************** +*** 4283,4301 **** + % except not \outer, so it can be used within macros and \if's. + \edef\newwrite{\makecsname{ptexnewwrite}} + +! % \newindex {foo} defines an index named foo. +! % It automatically defines \fooindex such that +! % \fooindex ...rest of line... puts an entry in the index foo. +! % It also defines \fooindfile to be the number of the output channel for +! % the file that accumulates this index. The file's extension is foo. +! % The name of an index should be no more than 2 characters long +! % for the sake of vms. + % + \def\newindex#1{% +! \iflinks +! \expandafter\newwrite \csname#1indfile\endcsname +! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file +! \fi + \expandafter\xdef\csname#1index\endcsname{% % Define @#1index + \noexpand\doindex{#1}} + } +--- 4820,4833 ---- + % except not \outer, so it can be used within macros and \if's. + \edef\newwrite{\makecsname{ptexnewwrite}} + +! % \newindex {IX} defines an index named IX. +! % It automatically defines \IXindex such that +! % \IXindex ...rest of line... puts an entry in the index IX. +! % It also defines \IXindfile to be the number of the output channel for +! % the file that accumulates this index. The file's extension is IX. + % + \def\newindex#1{% +! \expandafter\chardef\csname#1indfile\endcsname=0 + \expandafter\xdef\csname#1index\endcsname{% % Define @#1index + \noexpand\doindex{#1}} + } +*************** +*** 4309,4322 **** + \def\defcodeindex{\parsearg\newcodeindex} + % + \def\newcodeindex#1{% +! \iflinks +! \expandafter\newwrite \csname#1indfile\endcsname +! \openout \csname#1indfile\endcsname \jobname.#1 +! \fi + \expandafter\xdef\csname#1index\endcsname{% + \noexpand\docodeindex{#1}}% + } + + + % @synindex foo bar makes index foo feed into index bar. + % Do this instead of @defindex foo if you don't want it as a separate index. +--- 4841,4859 ---- + \def\defcodeindex{\parsearg\newcodeindex} + % + \def\newcodeindex#1{% +! \expandafter\chardef\csname#1indfile\endcsname=0 + \expandafter\xdef\csname#1index\endcsname{% + \noexpand\docodeindex{#1}}% + } + ++ % The default indices: ++ \newindex{cp}% concepts, ++ \newcodeindex{fn}% functions, ++ \newcodeindex{vr}% variables, ++ \newcodeindex{tp}% types, ++ \newcodeindex{ky}% keys ++ \newcodeindex{pg}% and programs. ++ + + % @synindex foo bar makes index foo feed into index bar. + % Do this instead of @defindex foo if you don't want it as a separate index. +*************** +*** 4330,4343 **** + % #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), + % #3 the target index (bar). + \def\dosynindex#1#2#3{% +! % Only do \closeout if we haven't already done it, else we'll end up +! % closing the target index. +! \expandafter \ifx\csname donesynindex#2\endcsname \relax +! % The \closeout helps reduce unnecessary open files; the limit on the +! % Acorn RISC OS is a mere 16 files. +! \expandafter\closeout\csname#2indfile\endcsname +! \expandafter\let\csname donesynindex#2\endcsname = 1 +! \fi + % redefine \fooindfile: + \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname + \expandafter\let\csname#2indfile\endcsname=\temp +--- 4867,4873 ---- + % #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), + % #3 the target index (bar). + \def\dosynindex#1#2#3{% +! \requireopenindexfile{#3}% + % redefine \fooindfile: + \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname + \expandafter\let\csname#2indfile\endcsname=\temp +*************** +*** 4345,4779 **** + \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% + } + +! % Define \doindex, the driver for all \fooindex macros. + % Argument #1 is generated by the calling \fooindex macro, +! % and it is "foo", the name of the index. + +! % \doindex just uses \parsearg; it calls \doind for the actual work. +! % This is because \doind is more useful to call from other macros. +! +! % There is also \dosubind {index}{topic}{subtopic} +! % which makes an entry in a two-level index such as the operation index. +! +! \def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer} +! \def\singleindexer #1{\doind{\indexname}{#1}} + + % like the previous two, but they put @code around the argument. +! \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer} +! \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}} + +! % Take care of Texinfo commands that can appear in an index entry. +! % Since there are some commands we want to expand, and others we don't, +! % we have to laboriously prevent expansion for those that we don't. +! % +! \def\indexdummies{% +! \escapechar = `\\ % use backslash in output files. +! \def\@{@}% change to @@ when we switch to @ as escape char in index files. +! \def\ {\realbackslash\space }% +! % +! % Need these unexpandable (because we define \tt as a dummy) +! % definitions when @{ or @} appear in index entry text. Also, more +! % complicated, when \tex is in effect and \{ is a \delimiter again. +! % We can't use \lbracecmd and \rbracecmd because texindex assumes +! % braces and backslashes are used only as delimiters. Perhaps we +! % should define @lbrace and @rbrace commands a la @comma. +! \def\{{{\tt\char123}}% +! \def\}{{\tt\char125}}% +! % +! % I don't entirely understand this, but when an index entry is +! % generated from a macro call, the \endinput which \scanmacro inserts +! % causes processing to be prematurely terminated. This is, +! % apparently, because \indexsorttmp is fully expanded, and \endinput +! % is an expandable command. The redefinition below makes \endinput +! % disappear altogether for that purpose -- although logging shows that +! % processing continues to some further point. On the other hand, it +! % seems \endinput does not hurt in the printed index arg, since that +! % is still getting written without apparent harm. +! % +! % Sample source (mac-idx3.tex, reported by Graham Percival to +! % help-texinfo, 22may06): +! % @macro funindex {WORD} +! % @findex xyz +! % @end macro +! % ... +! % @funindex commtest +! % +! % The above is not enough to reproduce the bug, but it gives the flavor. +! % +! % Sample whatsit resulting: +! % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} +! % +! % So: +! \let\endinput = \empty +! % +! % Do the redefinitions. +! \commondummies +! } +! +! % For the aux and toc files, @ is the escape character. So we want to +! % redefine everything using @ as the escape character (instead of +! % \realbackslash, still used for index files). When everything uses @, +! % this will be simpler. + % +! \def\atdummies{% +! \def\@{@@}% +! \def\ {@ }% +! \let\{ = \lbraceatcmd +! \let\} = \rbraceatcmd +! % +! % Do the redefinitions. +! \commondummies +! \otherbackslash +! } + +! % Called from \indexdummies and \atdummies. + % +! \def\commondummies{% +! % +! % \definedummyword defines \#1 as \string\#1\space, thus effectively +! % preventing its expansion. This is used only for control words, +! % not control letters, because the \space would be incorrect for +! % control characters, but is needed to separate the control word +! % from whatever follows. +! % +! % For control letters, we have \definedummyletter, which omits the +! % space. +! % +! % These can be used both for control words that take an argument and +! % those that do not. If it is followed by {arg} in the input, then +! % that will dutifully get written to the index (or wherever). +! % +! \def\definedummyword ##1{\def##1{\string##1\space}}% +! \def\definedummyletter##1{\def##1{\string##1}}% +! \let\definedummyaccent\definedummyletter + % +! \commondummiesnofonts + % + \definedummyletter\_% + \definedummyletter\-% + % +! % Non-English letters. +! \definedummyword\AA +! \definedummyword\AE +! \definedummyword\DH +! \definedummyword\L +! \definedummyword\O +! \definedummyword\OE +! \definedummyword\TH +! \definedummyword\aa +! \definedummyword\ae +! \definedummyword\dh +! \definedummyword\exclamdown +! \definedummyword\l +! \definedummyword\o +! \definedummyword\oe +! \definedummyword\ordf +! \definedummyword\ordm +! \definedummyword\questiondown +! \definedummyword\ss +! \definedummyword\th +! % +! % Although these internal commands shouldn't show up, sometimes they do. +! \definedummyword\bf +! \definedummyword\gtr +! \definedummyword\hat +! \definedummyword\less +! \definedummyword\sf +! \definedummyword\sl +! \definedummyword\tclose +! \definedummyword\tt +! % +! \definedummyword\LaTeX +! \definedummyword\TeX +! % +! % Assorted special characters. +! \definedummyword\arrow +! \definedummyword\bullet +! \definedummyword\comma +! \definedummyword\copyright +! \definedummyword\registeredsymbol +! \definedummyword\dots +! \definedummyword\enddots +! \definedummyword\entrybreak +! \definedummyword\equiv +! \definedummyword\error +! \definedummyword\euro +! \definedummyword\expansion +! \definedummyword\geq +! \definedummyword\guillemetleft +! \definedummyword\guillemetright +! \definedummyword\guilsinglleft +! \definedummyword\guilsinglright +! \definedummyword\lbracechar +! \definedummyword\leq +! \definedummyword\minus +! \definedummyword\ogonek +! \definedummyword\pounds +! \definedummyword\point +! \definedummyword\print +! \definedummyword\quotedblbase +! \definedummyword\quotedblleft +! \definedummyword\quotedblright +! \definedummyword\quoteleft +! \definedummyword\quoteright +! \definedummyword\quotesinglbase +! \definedummyword\rbracechar +! \definedummyword\result +! \definedummyword\textdegree + % + % We want to disable all macros so that they are not expanded by \write. + \macrolist + % +! \normalturnoffactive +! % +! % Handle some cases of @value -- where it does not contain any +! % (non-fully-expandable) commands. +! \makevalueexpandable + } + +! % \commondummiesnofonts: common to \commondummies and \indexnofonts. +! % +! \def\commondummiesnofonts{% + % Control letters and accents. +! \definedummyletter\!% +! \definedummyaccent\"% +! \definedummyaccent\'% +! \definedummyletter\*% +! \definedummyaccent\,% +! \definedummyletter\.% +! \definedummyletter\/% +! \definedummyletter\:% +! \definedummyaccent\=% +! \definedummyletter\?% +! \definedummyaccent\^% +! \definedummyaccent\`% +! \definedummyaccent\~% +! \definedummyword\u +! \definedummyword\v +! \definedummyword\H +! \definedummyword\dotaccent +! \definedummyword\ogonek +! \definedummyword\ringaccent +! \definedummyword\tieaccent +! \definedummyword\ubaraccent +! \definedummyword\udotaccent +! \definedummyword\dotless + % + % Texinfo font commands. +! \definedummyword\b +! \definedummyword\i +! \definedummyword\r +! \definedummyword\sansserif +! \definedummyword\sc +! \definedummyword\slanted +! \definedummyword\t + % + % Commands that take arguments. +! \definedummyword\abbr +! \definedummyword\acronym +! \definedummyword\anchor +! \definedummyword\cite +! \definedummyword\code +! \definedummyword\command +! \definedummyword\dfn +! \definedummyword\dmn +! \definedummyword\email +! \definedummyword\emph +! \definedummyword\env +! \definedummyword\file +! \definedummyword\image +! \definedummyword\indicateurl +! \definedummyword\inforef +! \definedummyword\kbd +! \definedummyword\key +! \definedummyword\math +! \definedummyword\option +! \definedummyword\pxref +! \definedummyword\ref +! \definedummyword\samp +! \definedummyword\strong +! \definedummyword\tie +! \definedummyword\uref +! \definedummyword\url +! \definedummyword\var +! \definedummyword\verb +! \definedummyword\w +! \definedummyword\xref + } + + % \indexnofonts is used when outputting the strings to sort the index + % by, and when constructing control sequence names. It eliminates all + % control sequences and just writes whatever the best ASCII sort string + % would be for a given command (usually its argument). + % + \def\indexnofonts{% +! % Accent commands should become @asis. +! \def\definedummyaccent##1{\let##1\asis}% +! % We can just ignore other control letters. +! \def\definedummyletter##1{\let##1\empty}% +! % All control words become @asis by default; overrides below. +! \let\definedummyword\definedummyaccent +! % +! \commondummiesnofonts +! % +! % Don't no-op \tt, since it isn't a user-level command +! % and is used in the definitions of the active chars like <, >, |, etc. +! % Likewise with the other plain tex font commands. +! %\let\tt=\asis + % + \def\ { }% + \def\@{@}% + \def\_{\normalunderscore}% + \def\-{}% @- shouldn't affect sorting + % +! % Unfortunately, texindex is not prepared to handle braces in the +! % content at all. So for index sorting, we map @{ and @} to strings +! % starting with |, since that ASCII character is between ASCII { and }. +! \def\{{|a}% +! \def\lbracechar{|a}% +! % +! \def\}{|b}% +! \def\rbracechar{|b}% +! % +! % Non-English letters. +! \def\AA{AA}% +! \def\AE{AE}% +! \def\DH{DZZ}% +! \def\L{L}% +! \def\OE{OE}% +! \def\O{O}% +! \def\TH{ZZZ}% +! \def\aa{aa}% +! \def\ae{ae}% +! \def\dh{dzz}% +! \def\exclamdown{!}% +! \def\l{l}% +! \def\oe{oe}% +! \def\ordf{a}% +! \def\ordm{o}% +! \def\o{o}% +! \def\questiondown{?}% +! \def\ss{ss}% +! \def\th{zzz}% +! % +! \def\LaTeX{LaTeX}% +! \def\TeX{TeX}% +! % +! % Assorted special characters. +! % (The following {} will end up in the sort string, but that's ok.) +! \def\arrow{->}% +! \def\bullet{bullet}% +! \def\comma{,}% +! \def\copyright{copyright}% +! \def\dots{...}% +! \def\enddots{...}% +! \def\equiv{==}% +! \def\error{error}% +! \def\euro{euro}% +! \def\expansion{==>}% +! \def\geq{>=}% +! \def\guillemetleft{<<}% +! \def\guillemetright{>>}% +! \def\guilsinglleft{<}% +! \def\guilsinglright{>}% +! \def\leq{<=}% +! \def\minus{-}% +! \def\point{.}% +! \def\pounds{pounds}% +! \def\print{-|}% +! \def\quotedblbase{"}% +! \def\quotedblleft{"}% +! \def\quotedblright{"}% +! \def\quoteleft{`}% +! \def\quoteright{'}% +! \def\quotesinglbase{,}% +! \def\registeredsymbol{R}% +! \def\result{=>}% +! \def\textdegree{o}% + % +- \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax +- \else \indexlquoteignore \fi + % + % We need to get rid of all macros, leaving only the arguments (if present). + % Of course this is not nearly correct, but it is the best we can do for now. +- % makeinfo does not expand macros in the argument to @deffn, which ends up +- % writing an index entry, and texindex isn't prepared for an index sort entry +- % that starts with \. + % + % Since macro invocations are followed by braces, we can just redefine them + % to take a single TeX argument. The case of a macro invocation that + % goes to end-of-line is not handled. + % + \macrolist + } + +- % Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us +- % ignore left quotes in the sort term. +- {\catcode`\`=\active +- \gdef\indexlquoteignore{\let`=\empty}} + +- \let\indexbackslash=0 %overridden during \printindex. +- \let\SETmarginindex=\relax % put index entries in margin (undocumented)? + +! % Most index entries go through here, but \dosubind is the general case. + % #1 is the index name, #2 is the entry text. +! \def\doind#1#2{\dosubind{#1}{#2}{}} + +! % Workhorse for all \fooindexes. +! % #1 is name of index, #2 is stuff to put there, #3 is subentry -- +! % empty if called from \doind, as we usually are (the main exception +! % is with most defuns, which call us directly). +! % +! \def\dosubind#1#2#3{% + \iflinks + {% +- % Store the main index entry text (including the third arg). +- \toks0 = {#2}% +- % If third arg is present, precede it with a space. +- \def\thirdarg{#3}% +- \ifx\thirdarg\empty \else +- \toks0 = \expandafter{\the\toks0 \space #3}% +- \fi + % + \edef\writeto{\csname#1indfile\endcsname}% + % +! \safewhatsit\dosubindwrite + }% + \fi + } + +! % Write the entry in \toks0 to the index file: + % +! \def\dosubindwrite{% +! % Put the index entry in the margin if desired. +! \ifx\SETmarginindex\relax\else +! \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% + \fi + % +! % Remember, we are within a group. +! \indexdummies % Must do this here, since \bf, etc expand at this stage +! \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now +! % so it will be output as is; and it will print as backslash. +! % +! % Process the index entry with all font commands turned off, to +! % get the string to sort by. +! {\indexnofonts +! \edef\temp{\the\toks0}% need full expansion +! \xdef\indexsorttmp{\temp}% +! }% + % + % Set up the complete index entry, with both the sort key and + % the original text, including any font commands. We write + % three arguments to \entry to the .?? file (four in the + % subentry case), texindex reduces to two when writing the .??s + % sorted result. + \edef\temp{% + \write\writeto{% +! \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% + }% + \temp + } + + % Take care of unwanted page breaks/skips around a whatsit: + % + % If a skip is the last thing on the list now, preserve it +--- 4875,5411 ---- + \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% + } + +! % Define \doindex, the driver for all index macros. + % Argument #1 is generated by the calling \fooindex macro, +! % and it is the two-letter name of the index. + +! \def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx} +! \def\doindexxxx #1{\doind{\indexname}{#1}} + + % like the previous two, but they put @code around the argument. +! \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} +! \def\docodeindexxxx #1{\docind{\indexname}{#1}} +! + +! % \definedummyword defines \#1 as \string\#1\space, thus effectively +! % preventing its expansion. This is used only for control words, +! % not control letters, because the \space would be incorrect for +! % control characters, but is needed to separate the control word +! % from whatever follows. + % +! % These can be used both for control words that take an argument and +! % those that do not. If it is followed by {arg} in the input, then +! % that will dutifully get written to the index (or wherever). +! % +! % For control letters, we have \definedummyletter, which omits the +! % space. +! % +! \def\definedummyword #1{\def#1{\string#1\space}}% +! \def\definedummyletter#1{\def#1{\string#1}}% + +! % Used for the aux, toc and index files to prevent expansion of Texinfo +! % commands. Most of the commands are controlled through the +! % \ifdummies conditional. + % +! \def\atdummies{% +! \dummiestrue + % +! \definedummyletter\@% +! \definedummyletter\ % +! \definedummyletter\{% +! \definedummyletter\}% +! \definedummyletter\&% + % + \definedummyletter\_% + \definedummyletter\-% + % +! \definedummyword\subentry + % + % We want to disable all macros so that they are not expanded by \write. ++ \let\commondummyword\definedummyword + \macrolist ++ \let\value\dummyvalue + % +! \turnoffactive + } + +! \newif\ifdummies +! \newif\ifindexnofonts +! +! \def\commondummyletter#1{% +! \expandafter\let\csname\string#1:impl\endcsname#1% +! \edef#1{% +! \noexpand\ifindexnofonts +! % empty expansion +! \noexpand\else +! \noexpand\ifdummies\string#1% +! \noexpand\else +! \noexpand\jumptwofi % dispose of the \fi +! \expandafter\noexpand\csname\string#1:impl\endcsname +! \noexpand\fi +! \noexpand\fi}% +! } +! +! \def\commondummyaccent#1{% +! \expandafter\let\csname\string#1:impl\endcsname#1% +! \edef#1{% +! \noexpand\ifindexnofonts +! \noexpand\expandafter % dispose of \else ... \fi +! \noexpand\asis +! \noexpand\else +! \noexpand\ifdummies\string#1% +! \noexpand\else +! \noexpand\jumptwofi % dispose of the \fi +! \expandafter\noexpand\csname\string#1:impl\endcsname +! \noexpand\fi +! \noexpand\fi}% +! } +! +! % Like \commondummyaccent but add a \space at the end of the dummy expansion +! % #2 is the expansion used for \indexnofonts. #2 is always followed by +! % \asis to remove a pair of following braces. +! \def\commondummyword#1#2{% +! \expandafter\let\csname\string#1:impl\endcsname#1% +! \expandafter\def\csname\string#1:ixnf\endcsname{#2\asis}% +! \edef#1{% +! \noexpand\ifindexnofonts +! \noexpand\expandafter % dispose of \else ... \fi +! \expandafter\noexpand\csname\string#1:ixnf\endcsname +! \noexpand\else +! \noexpand\ifdummies\string#1\space +! \noexpand\else +! \noexpand\jumptwofi % dispose of the \fi \fi +! \expandafter\noexpand\csname\string#1:impl\endcsname +! \noexpand\fi +! \noexpand\fi}% +! } +! \def\jumptwofi#1\fi\fi{\fi\fi#1} +! +! % For \atdummies and \indexnofonts. \atdummies sets +! % \dummiestrue and \indexnofonts sets \indexnofontstrue. +! \def\definedummies{ +! % @-sign is always an escape character when reading auxiliary files +! \escapechar = `\@ +! % +! \commondummyletter\!% +! \commondummyaccent\"% +! \commondummyaccent\'% +! \commondummyletter\*% +! \commondummyaccent\,% +! \commondummyletter\.% +! \commondummyletter\/% +! \commondummyletter\:% +! \commondummyaccent\=% +! \commondummyletter\?% +! \commondummyaccent\^% +! \commondummyaccent\`% +! \commondummyaccent\~% +! % + % Control letters and accents. +! \commondummyword\u {}% +! \commondummyword\v {}% +! \commondummyword\H {}% +! \commondummyword\dotaccent {}% +! \commondummyword\ogonek {}% +! \commondummyword\ringaccent {}% +! \commondummyword\tieaccent {}% +! \commondummyword\ubaraccent {}% +! \commondummyword\udotaccent {}% +! \commondummyword\dotless {}% + % + % Texinfo font commands. +! \commondummyword\b {}% +! \commondummyword\i {}% +! \commondummyword\r {}% +! \commondummyword\sansserif {}% +! \commondummyword\sc {}% +! \commondummyword\slanted {}% +! \commondummyword\t {}% + % + % Commands that take arguments. +! \commondummyword\abbr {}% +! \commondummyword\acronym {}% +! \commondummyword\anchor {}% +! \commondummyword\cite {}% +! \commondummyword\code {}% +! \commondummyword\command {}% +! \commondummyword\dfn {}% +! \commondummyword\dmn {}% +! \commondummyword\email {}% +! \commondummyword\emph {}% +! \commondummyword\env {}% +! \commondummyword\file {}% +! \commondummyword\image {}% +! \commondummyword\indicateurl{}% +! \commondummyword\inforef {}% +! \commondummyword\kbd {}% +! \commondummyword\key {}% +! \commondummyword\link {}% +! \commondummyword\math {}% +! \commondummyword\option {}% +! \commondummyword\pxref {}% +! \commondummyword\ref {}% +! \commondummyword\samp {}% +! \commondummyword\strong {}% +! \commondummyword\tie {}% +! \commondummyword\U {}% +! \commondummyword\uref {}% +! \commondummyword\url {}% +! \commondummyword\var {}% +! \commondummyword\verb {}% +! \commondummyword\w {}% +! \commondummyword\xref {}% +! % +! \commondummyword\AA {AA}% +! \commondummyword\AE {AE}% +! \commondummyword\DH {DZZ}% +! \commondummyword\L {L}% +! \commondummyword\O {O}% +! \commondummyword\OE {OE}% +! \commondummyword\TH {TH}% +! \commondummyword\aa {aa}% +! \commondummyword\ae {ae}% +! \commondummyword\dh {dzz}% +! \commondummyword\exclamdown {!}% +! \commondummyword\l {l}% +! \commondummyword\o {o}% +! \commondummyword\oe {oe}% +! \commondummyword\ordf {a}% +! \commondummyword\ordm {o}% +! \commondummyword\questiondown {?}% +! \commondummyword\ss {ss}% +! \commondummyword\th {th}% +! % +! \commondummyword\LaTeX {LaTeX}% +! \commondummyword\TeX {TeX}% +! % +! % Assorted special characters. +! \commondummyword\ampchar {\normalamp}% +! \commondummyword\atchar {\@}% +! \commondummyword\arrow {->}% +! \commondummyword\backslashchar {\realbackslash}% +! \commondummyword\bullet {bullet}% +! \commondummyword\comma {,}% +! \commondummyword\copyright {copyright}% +! \commondummyword\dots {...}% +! \commondummyword\enddots {...}% +! \commondummyword\entrybreak {}% +! \commondummyword\equiv {===}% +! \commondummyword\error {error}% +! \commondummyword\euro {euro}% +! \commondummyword\expansion {==>}% +! \commondummyword\geq {>=}% +! \commondummyword\guillemetleft {<<}% +! \commondummyword\guillemetright {>>}% +! \commondummyword\guilsinglleft {<}% +! \commondummyword\guilsinglright {>}% +! \commondummyword\lbracechar {\{}% +! \commondummyword\leq {<=}% +! \commondummyword\mathopsup {sup}% +! \commondummyword\minus {-}% +! \commondummyword\pounds {pounds}% +! \commondummyword\point {.}% +! \commondummyword\print {-|}% +! \commondummyword\quotedblbase {"}% +! \commondummyword\quotedblleft {"}% +! \commondummyword\quotedblright {"}% +! \commondummyword\quoteleft {`}% +! \commondummyword\quoteright {'}% +! \commondummyword\quotesinglbase {,}% +! \commondummyword\rbracechar {\}}% +! \commondummyword\registeredsymbol {R}% +! \commondummyword\result {=>}% +! \commondummyword\sub {}% +! \commondummyword\sup {}% +! \commondummyword\textdegree {o}% +! } +! +! \let\indexlbrace\relax +! \let\indexrbrace\relax +! \let\indexatchar\relax +! \let\indexbackslash\relax +! +! {\catcode`\@=0 +! \catcode`\\=13 +! @gdef@backslashdisappear{@def\{}} + } + ++ { ++ \catcode`\<=13 ++ \catcode`\-=13 ++ \catcode`\`=13 ++ \gdef\indexnonalnumdisappear{% ++ \ifflagclear{txiindexlquoteignore}{}{% ++ % @set txiindexlquoteignore makes us ignore left quotes in the sort term. ++ % (Introduced for FSFS 2nd ed.) ++ \let`=\empty ++ }% ++ % ++ \ifflagclear{txiindexbackslashignore}{}{% ++ \backslashdisappear ++ }% ++ \ifflagclear{txiindexhyphenignore}{}{% ++ \def-{}% ++ }% ++ \ifflagclear{txiindexlessthanignore}{}{% ++ \def<{}% ++ }% ++ \ifflagclear{txiindexatsignignore}{}{% ++ \def\@{}% ++ }% ++ } ++ ++ \gdef\indexnonalnumreappear{% ++ \let-\normaldash ++ \let<\normalless ++ } ++ } ++ ++ + % \indexnofonts is used when outputting the strings to sort the index + % by, and when constructing control sequence names. It eliminates all + % control sequences and just writes whatever the best ASCII sort string + % would be for a given command (usually its argument). + % + \def\indexnofonts{% +! \indexnofontstrue + % + \def\ { }% + \def\@{@}% + \def\_{\normalunderscore}% + \def\-{}% @- shouldn't affect sorting + % +! \uccode`\1=`\{ \uppercase{\def\{{1}}% +! \uccode`\1=`\} \uppercase{\def\}{1}}% +! \def\lbracechar##1{\{}% +! \def\rbracechar##1{\}}% + % + % + % We need to get rid of all macros, leaving only the arguments (if present). + % Of course this is not nearly correct, but it is the best we can do for now. + % + % Since macro invocations are followed by braces, we can just redefine them + % to take a single TeX argument. The case of a macro invocation that + % goes to end-of-line is not handled. + % ++ \def\commondummyword##1{\let##1\asis}% + \macrolist ++ \let\value\indexnofontsvalue + } + + + +! + % #1 is the index name, #2 is the entry text. +! \def\doind#1#2{% +! \iflinks +! {% +! % +! \requireopenindexfile{#1}% +! \edef\writeto{\csname#1indfile\endcsname}% +! % +! \def\indextext{#2}% +! \safewhatsit\doindwrite +! }% +! \fi +! } + +! % Same as \doind, but for code indices +! \def\docind#1#2{% + \iflinks + {% + % ++ \requireopenindexfile{#1}% + \edef\writeto{\csname#1indfile\endcsname}% + % +! \def\indextext{#2}% +! \safewhatsit\docindwrite + }% + \fi + } + +! % Check if an index file has been opened, and if not, open it. +! \def\requireopenindexfile#1{% +! \ifnum\csname #1indfile\endcsname=0 +! \expandafter\newwrite \csname#1indfile\endcsname +! \edef\suffix{#1}% +! % A .fls suffix would conflict with the file extension for the output +! % of -recorder, so use .f1s instead. +! \ifx\suffix\indexisfl\def\suffix{f1}\fi +! % Open the file +! \immediate\openout\csname#1indfile\endcsname \jobname.\suffix +! % Using \immediate above here prevents an object entering into the current +! % box, which could confound checks such as those in \safewhatsit for +! % preceding skips. +! \typeout{Writing index file \jobname.\suffix}% +! \fi} +! \def\indexisfl{fl} +! +! % Definition for writing index entry sort key. +! { +! \catcode`\-=13 +! \gdef\indexwritesortas{% +! \begingroup +! \indexnonalnumreappear +! \indexwritesortasxxx} +! \gdef\indexwritesortasxxx#1{% +! \xdef\indexsortkey{#1}\endgroup} +! } +! +! \def\indexwriteseealso#1{ +! \gdef\pagenumbertext{\string\seealso{#1}}% +! } +! \def\indexwriteseeentry#1{ +! \gdef\pagenumbertext{\string\seeentry{#1}}% +! } +! +! % The default definitions +! \def\sortas#1{}% +! \def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only +! \def\putwordSeeAlso{See also} +! \def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only +! +! +! % Given index entry text like "aaa @subentry bbb @sortas{ZZZ}": +! % * Set \bracedtext to "{aaa}{bbb}" +! % * Set \fullindexsortkey to "aaa @subentry ZZZ" +! % * If @seealso occurs, set \pagenumbertext + % +! \def\splitindexentry#1{% +! \gdef\fullindexsortkey{}% +! \xdef\bracedtext{}% +! \def\sep{}% +! \def\seealso##1{}% +! \def\seeentry##1{}% +! \expandafter\doindexsegment#1\subentry\finish\subentry +! } +! +! % append the results from the next segment +! \def\doindexsegment#1\subentry{% +! \def\segment{#1}% +! \ifx\segment\isfinish +! \else +! % +! % Fully expand the segment, throwing away any @sortas directives, and +! % trim spaces. +! \edef\trimmed{\segment}% +! \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% +! \ifincodeindex +! \edef\trimmed{\noexpand\code{\trimmed}}% +! \fi +! % +! \xdef\bracedtext{\bracedtext{\trimmed}}% +! % +! % Get the string to sort by. Process the segment with all +! % font commands turned off. +! \bgroup +! \let\sortas\indexwritesortas +! \let\seealso\indexwriteseealso +! \let\seeentry\indexwriteseeentry +! \indexnofonts +! % The braces around the commands are recognized by texindex. +! \def\lbracechar{{\string\indexlbrace}}% +! \def\rbracechar{{\string\indexrbrace}}% +! \let\{=\lbracechar +! \let\}=\rbracechar +! \def\@{{\string\indexatchar}}% +! \def\atchar##1{\@}% +! \def\backslashchar{{\string\indexbackslash}}% +! \uccode`\~=`\\ \uppercase{\let~\backslashchar}% +! % +! \let\indexsortkey\empty +! \global\let\pagenumbertext\empty +! % Execute the segment and throw away the typeset output. This executes +! % any @sortas or @seealso commands in this segment. +! \setbox\dummybox = \hbox{\segment}% +! \ifx\indexsortkey\empty{% +! \indexnonalnumdisappear +! \xdef\trimmed{\segment}% +! \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% +! \xdef\indexsortkey{\trimmed}% +! \ifx\indexsortkey\empty +! \message{Empty index sort key near line \the\inputlineno}% +! \xdef\indexsortkey{ }% +! \fi +! }\fi +! % +! % Append to \fullindexsortkey. +! \edef\tmp{\gdef\noexpand\fullindexsortkey{% +! \fullindexsortkey\sep\indexsortkey}}% +! \tmp +! \egroup +! \def\sep{\subentry}% +! % +! \expandafter\doindexsegment + \fi ++ } ++ \def\isfinish{\finish}% ++ \newbox\dummybox % used above ++ ++ \let\subentry\relax ++ ++ % Use \ instead of @ in index files. To support old texi2dvi and texindex. ++ % This works without changing the escape character used in the toc or aux ++ % files because the index entries are fully expanded here, and \string uses ++ % the current value of \escapechar. ++ \def\escapeisbackslash{\escapechar=`\\} ++ ++ % Uncomment to use \ in index files by default. Old texi2dvi (before 2019) ++ % didn't support @ as the escape character (as it checked for "\entry" in ++ % the files, and not "@entry"). ++ % In the future we can remove this flag and simplify the code for ++ % index files and backslashes, once the support is no longer likely to be ++ % useful. ++ % ++ % \set txiindexescapeisbackslash ++ ++ % Write the entry in \indextext to the index file. ++ % ++ ++ \newif\ifincodeindex ++ \def\doindwrite{\incodeindexfalse\doindwritex} ++ \def\docindwrite{\incodeindextrue\doindwritex} ++ ++ \def\doindwritex{% ++ \maybemarginindex + % +! \atdummies +! % +! \ifflagclear{txiindexescapeisbackslash}{}{\escapeisbackslash}% +! % +! % For texindex which always views { and } as separators. +! \def\{{\lbracechar{}}% +! \def\}{\rbracechar{}}% +! \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}% +! % +! % Split the entry into primary entry and any subentries, and get the index +! % sort key. +! \splitindexentry\indextext + % + % Set up the complete index entry, with both the sort key and + % the original text, including any font commands. We write + % three arguments to \entry to the .?? file (four in the + % subentry case), texindex reduces to two when writing the .??s + % sorted result. ++ % + \edef\temp{% + \write\writeto{% +! \string\entry{\fullindexsortkey}% +! {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}% +! \bracedtext}% + }% + \temp + } + ++ % Put the index entry in the margin if desired (undocumented). ++ \def\maybemarginindex{% ++ \ifx\SETmarginindex\relax\else ++ \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}% ++ \fi ++ } ++ \let\SETmarginindex=\relax ++ ++ + % Take care of unwanted page breaks/skips around a whatsit: + % + % If a skip is the last thing on the list now, preserve it +*************** +*** 4860,4868 **** +--- 5492,5505 ---- + % \entry {topic}{pagelist} + % for a topic that is used without subtopics + % \primary {topic} ++ % \entry {topic}{} + % for the beginning of a topic that is used with subtopics + % \secondary {subtopic}{pagelist} + % for each subtopic. ++ % \secondary {subtopic}{} ++ % for a subtopic with sub-subtopics ++ % \tertiary {subtopic}{subsubtopic}{pagelist} ++ % for each sub-subtopic. + + % Define the user-accessible indexing commands + % @findex, @vindex, @kindex, @cindex. +*************** +*** 4874,4884 **** + \def\tindex {\tpindex} + \def\pindex {\pgindex} + +- \def\cindexsub {\begingroup\obeylines\cindexsub} +- {\obeylines % +- \gdef\cindexsub "#1" #2^^M{\endgroup % +- \dosubind{cp}{#2}{#1}}} +- + % Define the macros used in formatting output of the sorted index material. + + % @printindex causes a particular index (the ??s file) to get printed. +--- 5511,5516 ---- +*************** +*** 4891,4948 **** + \tolerance = 9500 + \plainfrenchspacing + \everypar = {}% don't want the \kern\-parindent from indentation suppression. + % + % See if the index file exists and is nonempty. +! % Change catcode of @ here so that if the index file contains +! % \initial {@} +! % as its first line, TeX doesn't complain about mismatched braces +! % (because it thinks @} is a control sequence). +! \catcode`\@ = 11 +! \openin 1 \jobname.#1s + \ifeof 1 + % \enddoublecolumns gets confused if there is no text in the index, + % and it loses the chapter title and the aux file entries for the + % index. The easiest way to prevent this problem is to make sure + % there is some text. + \putwordIndexNonexistent + \else +- % + % If the index file exists but is empty, then \openin leaves \ifeof + % false. We have to make TeX try to read something from the file, so + % it can discover if there is anything in it. +! \read 1 to \temp + \ifeof 1 + \putwordIndexIsEmpty + \else +! % Index files are almost Texinfo source, but we use \ as the escape +! % character. It would be better to use @, but that's too big a change +! % to make right now. +! \def\indexbackslash{\backslashcurfont}% +! \catcode`\\ = 0 +! \escapechar = `\\ +! \begindoublecolumns +! \input \jobname.#1s +! \enddoublecolumns + \fi + \fi + \closein 1 + \endgroup} + + % These macros are used by the sorted index file itself. + % Change them to control the appearance of the index. + +! \def\initial#1{{% +! % Some minor font changes for the special characters. +! \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt +! % + % Remove any glue we may have, we'll be inserting our own. + \removelastskip + % + % We like breaks before the index initials, so insert a bonus. + \nobreak +! \vskip 0pt plus 3\baselineskip +! \penalty 0 +! \vskip 0pt plus -3\baselineskip + % + % Typeset the initial. Making this add up to a whole number of + % baselineskips increases the chance of the dots lining up from column +--- 5523,5687 ---- + \tolerance = 9500 + \plainfrenchspacing + \everypar = {}% don't want the \kern\-parindent from indentation suppression. ++ \let\entry\indexentry ++ \ifxetex\xetexpreauxfile\fi ++ % ++ % See comment in \requireopenindexfile. ++ \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi + % + % See if the index file exists and is nonempty. +! \openin 1 \jobname.\indexname s + \ifeof 1 + % \enddoublecolumns gets confused if there is no text in the index, + % and it loses the chapter title and the aux file entries for the + % index. The easiest way to prevent this problem is to make sure + % there is some text. + \putwordIndexNonexistent ++ \typeout{No file \jobname.\indexname s.}% + \else + % If the index file exists but is empty, then \openin leaves \ifeof + % false. We have to make TeX try to read something from the file, so + % it can discover if there is anything in it. +! \read 1 to \thisline + \ifeof 1 + \putwordIndexIsEmpty + \else +! \expandafter\printindexzz\thisline\relax\relax\finish% + \fi + \fi + \closein 1 ++ \ifxetex\xetexpostauxfile\fi + \endgroup} + ++ % Checked in @bye ++ \let\byeerror\relax ++ ++ % If the index file starts with a backslash, forgo reading the index ++ % file altogether. If somebody upgrades texinfo.tex they may still have ++ % old index files using \ as the escape character. Reading this would ++ % at best lead to typesetting garbage, at worst a TeX syntax error. ++ \def\printindexzz#1#2\finish{% ++ \ifflagclear{txiindexescapeisbackslash}{% ++ \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 ++ \ifflagclear{txiskipindexfileswithbackslash}{% ++ % Delay the error message until the very end to give a chance ++ % for the whole index to be output as input for texindex. ++ \global\def\byeerror{% ++ ERROR: A sorted index file in an obsolete format was skipped. ++ To fix this problem, please upgrade your version of 'texi2dvi' ++ or 'texi2pdf' to that at . ++ If you are using an old version of 'texindex' (part of the Texinfo ++ distribution), you may also need to upgrade to a newer version (at least 6.0). ++ You may be able to typeset the index if you run ++ 'texindex \jobname.\indexname' yourself. ++ You could also try setting the 'txiindexescapeisbackslash' flag by ++ running a command like ++ 'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do ++ this, Texinfo will try to use index files in the old format. ++ If you continue to have problems, deleting the index files and starting again ++ might help (with 'rm \jobname.?? \jobname.??s')% ++ }% ++ }{% ++ (Skipped sorted index file in obsolete format) ++ }% ++ \else ++ \begindoublecolumns ++ \ifxetex\xetexpreauxfile\fi ++ \input \jobname.\indexname s ++ \ifxetex\xetexpostauxfile\fi ++ \enddoublecolumns ++ \fi ++ }{% ++ \begindoublecolumns ++ \catcode`\\=0\relax ++ % ++ % Make @ an escape character to give macros a chance to work. This ++ % should work because we (hopefully) don't otherwise use @ in index files. ++ %\catcode`\@=12\relax ++ \catcode`\@=0\relax ++ \ifxetex\xetexpreauxfile\fi ++ \input \jobname.\indexname s ++ \ifxetex\xetexpostauxfile\fi ++ \enddoublecolumns ++ }% ++ } ++ ++ \def\indexentry#1#2{% ++ \let\entrypagetarget\empty ++ \ifpdforxetex ++ % only link the index text to the page if no comma appears in the ++ % list of pages, i.e. there is only one page ++ \checkpagelistcomma{#2}\pagelistcomma ++ \expandafter\ifcase\pagelistcomma ++ \def\entrypagetarget{#2}% ++ \fi ++ \fi% ++ \entryinternal{#1}{#2}% ++ } ++ ++ \def\checkpagelistcomma#1#2{% ++ \checkpagelistcommaxx#2#1,\finish ++ } ++ \def\checkpagelistcommaxx#1#2,#3\finish{% ++ \def\tmp{#3}% ++ \ifx\tmp\empty ++ \def#1{0\relax} ++ \else ++ \def#1{1\relax} ++ \fi ++ } ++ ++ + % These macros are used by the sorted index file itself. + % Change them to control the appearance of the index. + +! {\catcode`\/=13 \catcode`\-=13 \catcode`\^=13 \catcode`\~=13 \catcode`\_=13 +! \catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13 +! \catcode`\$=3 +! \gdef\initialglyphs{% +! % special control sequences used in the index sort key +! \let\indexlbrace\{% +! \let\indexrbrace\}% +! \let\indexatchar\@% +! \def\indexbackslash{\math{\backslash}}% +! % +! % Some changes for non-alphabetic characters. Using the glyphs from the +! % math fonts looks more consistent than the typewriter font used elsewhere +! % for these characters. +! \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}} +! % +! % In case @\ is used for backslash +! \uppercase{\let\\=~} +! % Can't get bold backslash so don't use bold forward slash +! \catcode`\/=13 +! \def/{{\secrmnotbold \normalslash}}% +! \def-{{\normaldash\normaldash}}% en dash `--' +! \def^{{\chapbf \normalcaret}}% +! \def~{{\chapbf \normaltilde}}% +! \def\_{% +! \leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }% +! \def|{$\vert$}% +! \def<{$\less$}% +! \def>{$\gtr$}% +! \def+{$\normalplus$}% +! }} +! +! \def\initial{% +! \bgroup +! \initialx +! } +! +! \def\initialx#1{% + % Remove any glue we may have, we'll be inserting our own. + \removelastskip + % + % We like breaks before the index initials, so insert a bonus. ++ % The glue before the bonus allows a little bit of space at the ++ % bottom of a column to reduce an increase in inter-line spacing. + \nobreak +! \vskip 0pt plus 5\baselineskip +! \penalty -300 +! \vskip 0pt plus -5\baselineskip + % + % Typeset the initial. Making this add up to a whole number of + % baselineskips increases the chance of the dots lining up from column +*************** +*** 4950,5012 **** + % we need before each entry, but it's better. + % + % No shrink because it confuses \balancecolumns. +! \vskip 1.67\baselineskip plus .5\baselineskip +! \leftline{\secbf #1}% + % Do our best not to break after the initial. + \nobreak + \vskip .33\baselineskip plus .1\baselineskip +! }} + +! % \entry typesets a paragraph consisting of the text (#1), dot leaders, and +! % then page number (#2) flushed to the right margin. It is used for index +! % and table of contents entries. The paragraph is indented by \leftskip. +! % +! % A straightforward implementation would start like this: +! % \def\entry#1#2{... +! % But this freezes the catcodes in the argument, and can cause problems to +! % @code, which sets - active. This problem was fixed by a kludge--- +! % ``-'' was active throughout whole index, but this isn't really right. +! % The right solution is to prevent \entry from swallowing the whole text. +! % --kasal, 21nov03 +! \def\entry{% + \begingroup + % + % Start a new paragraph if necessary, so our assignments below can't + % affect previous text. + \par + % +- % Do not fill out the last line with white space. +- \parfillskip = 0in +- % + % No extra space above this paragraph. + \parskip = 0in + % +- % Do not prefer a separate line ending with a hyphen to fewer lines. +- \finalhyphendemerits = 0 +- % +- % \hangindent is only relevant when the entry text and page number +- % don't both fit on one line. In that case, bob suggests starting the +- % dots pretty far over on the line. Unfortunately, a large +- % indentation looks wrong when the entry text itself is broken across +- % lines. So we use a small indentation and put up with long leaders. +- % +- % \hangafter is reset to 1 (which is the value we want) at the start +- % of each paragraph, so we need not do anything with that. +- \hangindent = 2em +- % +- % When the entry text needs to be broken, just fill out the first line +- % with blank space. +- \rightskip = 0pt plus1fil +- % +- % A bit of stretch before each entry for the benefit of balancing +- % columns. +- \vskip 0pt plus1pt +- % + % When reading the text of entry, convert explicit line breaks + % from @* into spaces. The user might give these in long section + % titles, for instance. + \def\*{\unskip\space\ignorespaces}% +! \def\entrybreak{\hfil\break}% + % + % Swallow the left brace of the text (first parameter): + \afterassignment\doentry +--- 5689,5764 ---- + % we need before each entry, but it's better. + % + % No shrink because it confuses \balancecolumns. +! \vskip 1.67\baselineskip plus 1\baselineskip +! \doindexinitialentry{#1}% +! \initialglyphs +! \leftline{% +! \secfonts \kern-0.05em \secbf #1}% +! % \secfonts is inside the argument of \leftline so that the change of +! % \baselineskip will not affect any glue inserted before the vbox that +! % \leftline creates. + % Do our best not to break after the initial. + \nobreak + \vskip .33\baselineskip plus .1\baselineskip +! \egroup % \initialglyphs +! } +! +! \def\doindexinitialentry#1{% +! \ifpdforxetex +! \global\advance\idxinitialno by 1 +! \def\indexlbrace{\{}% +! \def\indexrbrace{\}}% +! \def\indexbackslash{\realbackslash}% +! \def\indexatchar{\@}% +! \writetocentry{idxinitial}{\asis #1}{IDX\the\idxinitialno}% +! % The @asis removes a pair of braces around e.g. {@indexatchar} that +! % are output by texindex. +! % +! \pdfmkdest{idx.\asis #1.IDX\the\idxinitialno}% +! \fi +! } +! +! % No listing in TOC +! \def\idxinitialentry#1#2#3#4{} +! +! % For index initials. +! \newcount\idxinitialno \idxinitialno=1 +! +! +! \newdimen\entryrightmargin +! \entryrightmargin=0pt + +! % amount to indent subsequent lines in an entry when it spans more than +! % one line. +! \newdimen\entrycontskip +! \entrycontskip=1em +! +! % for PDF output, whether to make the text of the entry a link to the section. +! % set for @contents and @shortcontents. +! \newif\iflinkentrytext +! +! % \entryinternal typesets a paragraph consisting of the text (#1), dot +! % leaders, and then page number (#2) flushed to the right margin. It is +! % used for index and table of contents entries. The paragraph is indented +! % by \leftskip. +! % For PDF output, if \linkentrytexttrue and \tocnodetarget is set, link text +! % to the referenced node. Else if \entrypagetarget is set, link text to the +! % page. +! \def\entryinternal{% + \begingroup + % + % Start a new paragraph if necessary, so our assignments below can't + % affect previous text. + \par + % + % No extra space above this paragraph. + \parskip = 0in + % + % When reading the text of entry, convert explicit line breaks + % from @* into spaces. The user might give these in long section + % titles, for instance. + \def\*{\unskip\space\ignorespaces}% +! \def\entrybreak{\hfil\break}% An undocumented command + % + % Swallow the left brace of the text (first parameter): + \afterassignment\doentry +*************** +*** 5014,5098 **** + } + \def\entrybreak{\unskip\space\ignorespaces}% + \def\doentry{% + \bgroup % Instead of the swallowed brace. + \noindent + \aftergroup\finishentry + % And now comes the text of the entry. + } +! \def\finishentry#1{% +! % #1 is the page number. +! % +! % The following is kludged to not output a line of dots in the index if +! % there are no page numbers. The next person who breaks this will be +! % cursed by a Unix daemon. +! \setbox\boxA = \hbox{#1}% +! \ifdim\wd\boxA = 0pt +! \ % +! \else +! % +! % If we must, put the page number on a line of its own, and fill out +! % this line with blank space. (The \hfil is overwhelmed with the +! % fill leaders glue in \indexdotfill if the page number does fit.) +! \hfil\penalty50 +! \null\nobreak\indexdotfill % Have leaders before the page number. +! % +! % The `\ ' here is removed by the implicit \unskip that TeX does as +! % part of (the primitive) \par. Without it, a spurious underfull +! % \hbox ensues. +! \ifpdf +! \pdfgettoks#1.% +! \ \the\toksA + \else +! \ #1% + \fi + \fi +- \par + \endgroup +! } + +! % Like plain.tex's \dotfill, except uses up at least 1 em. + \def\indexdotfill{\cleaders +! \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} + + \def\primary #1{\line{#1\hfil}} + +! \newskip\secondaryindent \secondaryindent=0.5cm +! \def\secondary#1#2{{% +! \parfillskip=0in +! \parskip=0in +! \hangindent=1in +! \hangafter=1 +! \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill +! \ifpdf +! \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. +! \else +! #2 +! \fi +! \par +! }} + + % Define two-column mode, which we use to typeset indexes. + % Adapted from the TeXbook, page 416, which is to say, + % the manmac.tex format used to print the TeXbook itself. +! \catcode`\@=11 + + \newbox\partialpage + \newdimen\doublecolumnhsize + + \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns + % Grab any single-column material above us. + \output = {% +! % +! % Here is a possibility not foreseen in manmac: if we accumulate a +! % whole lot of material, we might end up calling this \output +! % routine twice in a row (see the doublecol-lose test, which is +! % essentially a couple of indexes with @setchapternewpage off). In +! % that case we just ship out what is in \partialpage with the normal +! % output routine. Generally, \partialpage will be empty when this +! % runs and this will be a no-op. See the indexspread.tex test case. +! \ifvoid\partialpage \else +! \onepageout{\pagecontents\partialpage}% +! \fi + % + \global\setbox\partialpage = \vbox{% + % Unvbox the main output page. +--- 5766,5916 ---- + } + \def\entrybreak{\unskip\space\ignorespaces}% + \def\doentry{% ++ % Save the text of the entry in \boxA ++ \global\setbox\boxA=\hbox\bgroup + \bgroup % Instead of the swallowed brace. + \noindent + \aftergroup\finishentry + % And now comes the text of the entry. ++ % Not absorbing as a macro argument reduces the chance of problems ++ % with catcodes occurring. + } +! {\catcode`\@=11 +! % #1 is the page number +! \gdef\finishentry#1{% +! \egroup % end \boxA +! \dimen@ = \wd\boxA % Length of text of entry +! % add any leaders and page number to \boxA. +! \global\setbox\boxA=\hbox\bgroup +! \ifpdforxetex +! \iflinkentrytext +! \ifx\tocnodetarget\empty +! \unhbox\boxA +! \else +! \startxreflink{\tocnodetarget}{}% +! \unhbox\boxA +! \endlink +! \fi +! \else +! \ifx\entrypagetarget\empty +! \unhbox\boxA +! \else +! \pdflinkpage{\entrypagetarget}{\unhbox\boxA}% +! \fi +! \fi + \else +! \unhbox\boxA + \fi ++ % ++ % Get the width of the page numbers, and only use ++ % leaders if they are present. ++ \global\setbox\boxB = \hbox{#1}% ++ \ifdim\wd\boxB = 0pt ++ \null\nobreak\hfill\ % ++ \else ++ % ++ \null\nobreak\indexdotfill % Have leaders before the page number. ++ % ++ \hskip\skip\thinshrinkable ++ \ifpdforxetex ++ \ifx\tocnodetarget\empty ++ \pdfgettoks#1.% ++ \the\toksA ++ \else ++ % Should just be a single page number in toc ++ \startxreflink{\tocnodetarget}{}% ++ #1\endlink ++ \fi ++ \else ++ #1% ++ \fi ++ \fi ++ \egroup % end \boxA ++ % ++ % now output ++ \ifdim\wd\boxB = 0pt ++ \noindent\unhbox\boxA\par ++ \nobreak ++ \else\bgroup ++ % We want the text of the entries to be aligned to the left, and the ++ % page numbers to be aligned to the right. ++ % ++ \parindent = 0pt ++ \advance\leftskip by 0pt plus 1fil ++ \advance\leftskip by 0pt plus -1fill ++ \rightskip = 0pt plus -1fil ++ \advance\rightskip by 0pt plus 1fill ++ % Cause last line, which could consist of page numbers on their own ++ % if the list of page numbers is long, to be aligned to the right. ++ \parfillskip=0pt plus -1fill ++ % ++ \advance\rightskip by \entryrightmargin ++ % ++ \dimen@ii = \hsize ++ \advance\dimen@ii by -1\leftskip ++ \advance\dimen@ii by -1\entryrightmargin ++ \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line ++ \ifdim\dimen@ > 0.8\dimen@ii % due to long index text ++ \advance\leftskip by 0pt plus 1fill % ragged right ++ % ++ % Indent all lines but the first one. ++ \advance\leftskip by \entrycontskip ++ \advance\parindent by -\entrycontskip ++ \fi\fi ++ \indent % start paragraph ++ \unhbox\boxA ++ % ++ % Do not prefer a separate line ending with a hyphen to fewer lines. ++ \finalhyphendemerits = 0 ++ % ++ % Word spacing - no stretch ++ \spaceskip=\fontdimen2\font minus \fontdimen4\font ++ % ++ \linepenalty=1000 % Discourage line breaks. ++ \hyphenpenalty=5000 % Discourage hyphenation. ++ % ++ \par % format the paragraph ++ \egroup % The \vbox + \fi + \endgroup +! }} +! +! \newskip\thinshrinkable +! \skip\thinshrinkable=.15em minus .15em + +! % Like plain.tex's \dotfill, except uses up at least 0.5 em. +! % The filll stretch here overpowers both the fil and fill stretch to push +! % the page number to the right. + \def\indexdotfill{\cleaders +! \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 0.5em plus 1filll} + + \def\primary #1{\line{#1\hfil}} + +! \def\secondary{\indententry{0.5cm}} +! \def\tertiary{\indententry{1cm}} +! +! \def\indententry#1#2#3{% +! \bgroup +! \leftskip=#1 +! \entry{#2}{#3}% +! \egroup +! } + + % Define two-column mode, which we use to typeset indexes. + % Adapted from the TeXbook, page 416, which is to say, + % the manmac.tex format used to print the TeXbook itself. +! \catcode`\@=11 % private names + + \newbox\partialpage + \newdimen\doublecolumnhsize + + \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns ++ % If not much space left on page, start a new page. ++ \ifdim\pagetotal>0.8\vsize\vfill\eject\fi ++ % + % Grab any single-column material above us. + \output = {% +! \savetopmark + % + \global\setbox\partialpage = \vbox{% + % Unvbox the main output page. +*************** +*** 5117,5123 **** + % below is chosen so that the gutter has the same value (well, +-<1pt) + % as it did when we hard-coded it. + % +! % We put the result in a separate register, \doublecolumhsize, so we + % can restore it in \pagesofar, after \hsize itself has (potentially) + % been clobbered. + % +--- 5935,5941 ---- + % below is chosen so that the gutter has the same value (well, +-<1pt) + % as it did when we hard-coded it. + % +! % We put the result in a separate register, \doublecolumnhsize, so we + % can restore it in \pagesofar, after \hsize itself has (potentially) + % been clobbered. + % +*************** +*** 5126,5152 **** + \divide\doublecolumnhsize by 2 + \hsize = \doublecolumnhsize + % +! % Double the \vsize as well. (We don't need a separate register here, +! % since nobody clobbers \vsize.) + \vsize = 2\vsize + } + + % The double-column output routine for all double-column pages except +! % the last. + % + \def\doublecolumnout{% + \splittopskip=\topskip \splitmaxdepth=\maxdepth +- % Get the available space for the double columns -- the normal +- % (undoubled) page height minus any material left over from the +- % previous page. + \dimen@ = \vsize + \divide\dimen@ by 2 +- \advance\dimen@ by -\ht\partialpage + % + % box0 will be the left-hand column, box2 the right. +! \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ +! \onepageout\pagesofar +! \unvbox255 + \penalty\outputpenalty + } + % +--- 5944,5974 ---- + \divide\doublecolumnhsize by 2 + \hsize = \doublecolumnhsize + % +! % Get the available space for the double columns -- the normal +! % (undoubled) page height minus any material left over from the +! % previous page. +! \advance\vsize by -\ht\partialpage + \vsize = 2\vsize ++ % ++ % For the benefit of balancing columns ++ \advance\baselineskip by 0pt plus 0.5pt + } + + % The double-column output routine for all double-column pages except +! % the last, which is done by \balancecolumns. + % + \def\doublecolumnout{% ++ % ++ \savetopmark + \splittopskip=\topskip \splitmaxdepth=\maxdepth + \dimen@ = \vsize + \divide\dimen@ by 2 + % + % box0 will be the left-hand column, box2 the right. +! \setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@ +! \global\advance\vsize by 2\ht\partialpage +! \onepageout\pagesofar % empty except for the first time we are called +! \unvbox\PAGE + \penalty\outputpenalty + } + % +*************** +*** 5157,5166 **** + % + \hsize = \doublecolumnhsize + \wd0=\hsize \wd2=\hsize +! \hbox to\pagewidth{\box0\hfil\box2}% + } +! % +! % All done with double columns. + \def\enddoublecolumns{% + % The following penalty ensures that the page builder is exercised + % _before_ we change the output routine. This is necessary in the +--- 5979,5989 ---- + % + \hsize = \doublecolumnhsize + \wd0=\hsize \wd2=\hsize +! \hbox to\txipagewidth{\box0\hfil\box2}% + } +! +! +! % Finished with double columns. + \def\enddoublecolumns{% + % The following penalty ensures that the page builder is exercised + % _before_ we change the output routine. This is necessary in the +*************** +*** 5183,5189 **** + % goal. When TeX sees \eject from below which follows the final + % section, it invokes the new output routine that we've set after + % \balancecolumns below; \onepageout will try to fit the two columns +! % and the final section into the vbox of \pageheight (see + % \pagebody), causing an overfull box. + % + % Note that glue won't work here, because glue does not exercise the +--- 6006,6012 ---- + % goal. When TeX sees \eject from below which follows the final + % section, it invokes the new output routine that we've set after + % \balancecolumns below; \onepageout will try to fit the two columns +! % and the final section into the vbox of \txipageheight (see + % \pagebody), causing an overfull box. + % + % Note that glue won't work here, because glue does not exercise the +*************** +*** 5191,5243 **** + \penalty0 + % + \output = {% +! % Split the last of the double-column material. Leave it on the +! % current page, no automatic page break. + \balancecolumns +! % +! % If we end up splitting too much material for the current page, +! % though, there will be another page break right after this \output +! % invocation ends. Having called \balancecolumns once, we do not + % want to call it again. Therefore, reset \output to its normal +! % definition right away. (We hope \balancecolumns will never be +! % called on to balance too much material, but if it is, this makes +! % the output somewhat more palatable.) +! \global\output = {\onepageout{\pagecontents\PAGE}}% +! }% +! \eject +! \endgroup % started in \begindoublecolumns +! % +! % \pagegoal was set to the doubled \vsize above, since we restarted +! % the current page. We're now back to normal single-column +! % typesetting, so reset \pagegoal to the normal \vsize (after the +! % \endgroup where \vsize got restored). +! \pagegoal = \vsize + } + % +! % Called at the end of the double column material. + \def\balancecolumns{% +! \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. + \dimen@ = \ht0 +! \advance\dimen@ by \topskip +! \advance\dimen@ by-\baselineskip +! \divide\dimen@ by 2 % target to split to +! %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}% +! \splittopskip = \topskip +! % Loop until we get a decent breakpoint. +! {% +! \vbadness = 10000 +! \loop +! \global\setbox3 = \copy0 +! \global\setbox1 = \vsplit3 to \dimen@ +! \ifdim\ht3>\dimen@ +! \global\advance\dimen@ by 1pt +! \repeat +! }% +! %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}% +! \setbox0=\vbox to\dimen@{\unvbox1}% +! \setbox2=\vbox to\dimen@{\unvbox3}% + % +- \pagesofar + } + \catcode`\@ = \other + +--- 6014,6101 ---- + \penalty0 + % + \output = {% +! % Split the last of the double-column material. +! \savetopmark + \balancecolumns +! }% +! \eject % call the \output just set +! \ifdim\pagetotal=0pt +! % Having called \balancecolumns once, we do not + % want to call it again. Therefore, reset \output to its normal +! % definition right away. +! \global\output=\expandafter{\the\defaultoutput} +! % +! \endgroup % started in \begindoublecolumns +! % Leave the double-column material on the current page, no automatic +! % page break. +! \box\balancedcolumns +! % +! % \pagegoal was set to the doubled \vsize above, since we restarted +! % the current page. We're now back to normal single-column +! % typesetting, so reset \pagegoal to the normal \vsize. +! \global\vsize = \txipageheight % +! \pagegoal = \txipageheight % +! \else +! % We had some left-over material. This might happen when \doublecolumnout +! % is called in \balancecolumns. Try again. +! \expandafter\enddoublecolumns +! \fi + } ++ \newbox\balancedcolumns ++ \setbox\balancedcolumns=\vbox{shouldnt see this}% + % +! % Only called for the last of the double column material. \doublecolumnout +! % does the others. + \def\balancecolumns{% +! \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120. + \dimen@ = \ht0 +! \ifdim\dimen@<7\baselineskip +! % Don't split a short final column in two. +! \setbox2=\vbox{}% +! \global\setbox\balancedcolumns=\vbox{\pagesofar}% +! \else +! % double the leading vertical space +! \advance\dimen@ by \topskip +! \advance\dimen@ by-\baselineskip +! \divide\dimen@ by 2 % target to split to +! \dimen@ii = \dimen@ +! \splittopskip = \topskip +! % Loop until left column is at least as high as the right column. +! {% +! \vbadness = 10000 +! \loop +! \global\setbox3 = \copy0 +! \global\setbox1 = \vsplit3 to \dimen@ +! \ifdim\ht1<\ht3 +! \global\advance\dimen@ by 1pt +! \repeat +! }% +! % Now the left column is in box 1, and the right column in box 3. +! % +! % Check whether the left column has come out higher than the page itself. +! % (Note that we have doubled \vsize for the double columns, so +! % the actual height of the page is 0.5\vsize). +! \ifdim2\ht1>\vsize +! % It appears that we have been called upon to balance too much material. +! % Output some of it with \doublecolumnout, leaving the rest on the page. +! \setbox\PAGE=\box0 +! \doublecolumnout +! \else +! % Compare the heights of the two columns. +! \ifdim4\ht1>5\ht3 +! % Column heights are too different, so don't make their bottoms +! % flush with each other. +! \setbox2=\vbox to \ht1 {\unvbox3\vfill}% +! \setbox0=\vbox to \ht1 {\unvbox1\vfill}% +! \else +! % Make column bottoms flush with each other. +! \setbox2=\vbox to\ht1{\unvbox3\unskip}% +! \setbox0=\vbox to\ht1{\unvbox1\unskip}% +! \fi +! \global\setbox\balancedcolumns=\vbox{\pagesofar}% +! \fi +! \fi + % + } + \catcode`\@ = \other + +*************** +*** 5246,5261 **** + % Chapters, sections, etc. + + % Let's start with @part. +! \outer\parseargdef\part{\partzzz{#1}} + \def\partzzz#1{% + \chapoddpage + \null + \vskip.3\vsize % move it down on the page a bit + \begingroup +! \noindent \titlefonts\rmisbold #1\par % the text + \let\lastnode=\empty % no node to associate with + \writetocentry{part}{#1}{}% but put it in the toc + \headingsoff % no headline or footline on the part page + \chapoddpage + \endgroup + } +--- 6104,6123 ---- + % Chapters, sections, etc. + + % Let's start with @part. +! \parseargdef\part{\partzzz{#1}} + \def\partzzz#1{% + \chapoddpage + \null + \vskip.3\vsize % move it down on the page a bit + \begingroup +! \noindent \titlefonts\rm #1\par % the text + \let\lastnode=\empty % no node to associate with + \writetocentry{part}{#1}{}% but put it in the toc + \headingsoff % no headline or footline on the part page ++ % This outputs a mark at the end of the page that clears \thischapter ++ % and \thissection, as is done in \startcontents. ++ \let\pchapsepmacro\relax ++ \chapmacro{}{Yomitfromtoc}{}% + \chapoddpage + \endgroup + } +*************** +*** 5329,5339 **** + + % @raisesections: treat @section as chapter, @subsection as section, etc. + \def\raisesections{\global\advance\secbase by -1} +- \let\up=\raisesections % original BFox name + + % @lowersections: treat @chapter as section, @section as subsection, etc. + \def\lowersections{\global\advance\secbase by 1} +- \let\down=\lowersections % original BFox name + + % we only have subsub. + \chardef\maxseclevel = 3 +--- 6191,6199 ---- +*************** +*** 5470,5477 **** + % normally unnmhead0 calls unnumberedzzz: + \outer\parseargdef\unnumbered{\unnmhead0{#1}} + \def\unnumberedzzz#1{% +! \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 +! \global\advance\unnumberedno by 1 + % + % Since an unnumbered has no number, no prefix for figures. + \global\let\chaplevelprefix = \empty +--- 6330,6336 ---- + % normally unnmhead0 calls unnumberedzzz: + \outer\parseargdef\unnumbered{\unnmhead0{#1}} + \def\unnumberedzzz#1{% +! \global\advance\unnumberedno by 1 + % + % Since an unnumbered has no number, no prefix for figures. + \global\let\chaplevelprefix = \empty +*************** +*** 5500,5508 **** + + % @centerchap is like @unnumbered, but the heading is centered. + \outer\parseargdef\centerchap{% +- % Well, we could do the following in a group, but that would break +- % an assumption that \chapmacro is called at the outermost level. +- % Thus we are safer this way: --kasal, 24feb04 + \let\centerparametersmaybe = \centerparameters + \unnmhead0{#1}% + \let\centerparametersmaybe = \relax +--- 6359,6364 ---- +*************** +*** 5512,5518 **** + \let\top\unnumbered + + % Sections. +! % + \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz + \def\seczzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 +--- 6368,6374 ---- + \let\top\unnumbered + + % Sections. +! % + \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz + \def\seczzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 +*************** +*** 5530,5541 **** + % normally calls unnumberedseczzz: + \outer\parseargdef\unnumberedsec{\unnmhead1{#1}} + \def\unnumberedseczzz#1{% +! \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 +! \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% + } + + % Subsections. +! % + % normally calls numberedsubseczzz: + \outer\parseargdef\numberedsubsec{\numhead2{#1}} + \def\numberedsubseczzz#1{% +--- 6386,6397 ---- + % normally calls unnumberedseczzz: + \outer\parseargdef\unnumberedsec{\unnmhead1{#1}} + \def\unnumberedseczzz#1{% +! \global\advance\unnumberedno by 1 +! \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno}% + } + + % Subsections. +! % + % normally calls numberedsubseczzz: + \outer\parseargdef\numberedsubsec{\numhead2{#1}} + \def\numberedsubseczzz#1{% +*************** +*** 5554,5566 **** + % normally calls unnumberedsubseczzz: + \outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} + \def\unnumberedsubseczzz#1{% +! \global\subsubsecno=0 \global\advance\subsecno by 1 +! \sectionheading{#1}{subsec}{Ynothing}% +! {\the\unnumberedno.\the\secno.\the\subsecno}% + } + + % Subsubsections. +! % + % normally numberedsubsubseczzz: + \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} + \def\numberedsubsubseczzz#1{% +--- 6410,6421 ---- + % normally calls unnumberedsubseczzz: + \outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} + \def\unnumberedsubseczzz#1{% +! \global\advance\unnumberedno by 1 +! \sectionheading{#1}{subsec}{Ynothing}{\the\unnumberedno}% + } + + % Subsubsections. +! % + % normally numberedsubsubseczzz: + \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} + \def\numberedsubsubseczzz#1{% +*************** +*** 5580,5588 **** + % normally unnumberedsubsubseczzz: + \outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} + \def\unnumberedsubsubseczzz#1{% +! \global\advance\subsubsecno by 1 +! \sectionheading{#1}{subsubsec}{Ynothing}% +! {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% + } + + % These macros control what the section commands do, according +--- 6435,6442 ---- + % normally unnumberedsubsubseczzz: + \outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} + \def\unnumberedsubsubseczzz#1{% +! \global\advance\unnumberedno by 1 +! \sectionheading{#1}{subsubsec}{Ynothing}{\the\unnumberedno}% + } + + % These macros control what the section commands do, according +*************** +*** 5614,5619 **** +--- 6468,6477 ---- + \parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} + ++ % @xrefname - give text with printed name for linking to node and allow ++ % referencing node, but do not print any heading. ++ \parseargdef\xrefname{\donoderef{Yomitfromtoc}{#1}}% ++ + % These macros generate a chapter, section, etc. heading only + % (including whitespace, linebreaking, etc. around it), + % given all the information in convenient, parsed form. +*************** +*** 5626,5632 **** +--- 6484,6494 ---- + + % Define plain chapter starts, and page on/off switching for it. + \def\chapbreak{\dobreak \chapheadingskip {-4000}} ++ ++ % Start a new page + \def\chappager{\par\vfill\supereject} ++ ++ % \chapoddpage - start on an odd page for a new chapter + % Because \domark is called before \chapoddpage, the filler page will + % get the headings for the next chapter, which is wrong. But we don't + % care -- we just disable all headings on the filler page. +*************** +*** 5641,5712 **** + \fi + } + +! \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} + + \def\CHAPPAGoff{% + \global\let\contentsalignmacro = \chappager + \global\let\pchapsepmacro=\chapbreak +! \global\let\pagealignmacro=\chappager} + + \def\CHAPPAGon{% + \global\let\contentsalignmacro = \chappager + \global\let\pchapsepmacro=\chappager +- \global\let\pagealignmacro=\chappager + \global\def\HEADINGSon{\HEADINGSsingle}} + + \def\CHAPPAGodd{% + \global\let\contentsalignmacro = \chapoddpage + \global\let\pchapsepmacro=\chapoddpage +- \global\let\pagealignmacro=\chapoddpage + \global\def\HEADINGSon{\HEADINGSdouble}} + +! \CHAPPAGon + +! % Chapter opening. + % + % #1 is the text, #2 is the section type (Ynumbered, Ynothing, + % Yappendix, Yomitfromtoc), #3 the chapter number. + % + % To test against our argument. + \def\Ynothingkeyword{Ynothing} +- \def\Yomitfromtockeyword{Yomitfromtoc} + \def\Yappendixkeyword{Yappendix} + % + \def\chapmacro#1#2#3{% + % Insert the first mark before the heading break (see notes for \domark). +! \let\prevchapterdefs=\lastchapterdefs +! \let\prevsectiondefs=\lastsectiondefs +! \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% + \gdef\thissection{}}% + % + \def\temptype{#2}% + \ifx\temptype\Ynothingkeyword +! \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{\thischaptername}}% + \else\ifx\temptype\Yomitfromtockeyword +! \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{}}% + \else\ifx\temptype\Yappendixkeyword + \toks0={#1}% +! \xdef\lastchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\appendixletter}% +! % \noexpand\putwordAppendix avoids expanding indigestible +! % commands in some of the translations. +! \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} +! \noexpand\thischapternum: +! \noexpand\thischaptername}% + }% + \else + \toks0={#1}% +! \xdef\lastchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\the\chapno}% +! % \noexpand\putwordChapter avoids expanding indigestible +! % commands in some of the translations. +! \gdef\noexpand\thischapter{\noexpand\putwordChapter{} +! \noexpand\thischapternum: +! \noexpand\thischaptername}% + }% + \fi\fi\fi + % +--- 6503,6578 ---- + \fi + } + +! \parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname\HEADINGSon} + + \def\CHAPPAGoff{% + \global\let\contentsalignmacro = \chappager + \global\let\pchapsepmacro=\chapbreak +! \global\def\HEADINGSon{\HEADINGSsinglechapoff}} + + \def\CHAPPAGon{% + \global\let\contentsalignmacro = \chappager + \global\let\pchapsepmacro=\chappager + \global\def\HEADINGSon{\HEADINGSsingle}} + + \def\CHAPPAGodd{% + \global\let\contentsalignmacro = \chapoddpage + \global\let\pchapsepmacro=\chapoddpage + \global\def\HEADINGSon{\HEADINGSdouble}} + +! \setchapternewpage on + +! % \chapmacro - Chapter opening. + % + % #1 is the text, #2 is the section type (Ynumbered, Ynothing, + % Yappendix, Yomitfromtoc), #3 the chapter number. ++ % Not used for @heading series. + % + % To test against our argument. + \def\Ynothingkeyword{Ynothing} + \def\Yappendixkeyword{Yappendix} ++ \def\Yomitfromtockeyword{Yomitfromtoc} ++ % ++ % ++ % Definitions for @thischapter. These can be overridden in translation ++ % files. ++ \def\thischapterAppendix{% ++ \putwordAppendix{} \thischapternum: \thischaptername} ++ ++ \def\thischapterChapter{% ++ \putwordChapter{} \thischapternum: \thischaptername} ++ % + % + \def\chapmacro#1#2#3{% ++ \expandafter\ifx\thisenv\titlepage\else ++ \checkenv{}% chapters, etc., should not start inside an environment. ++ \fi + % Insert the first mark before the heading break (see notes for \domark). +! \let\prevchapterdefs=\currentchapterdefs +! \let\prevsectiondefs=\currentsectiondefs +! \gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% + \gdef\thissection{}}% + % + \def\temptype{#2}% + \ifx\temptype\Ynothingkeyword +! \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{\thischaptername}}% + \else\ifx\temptype\Yomitfromtockeyword +! \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{}}% + \else\ifx\temptype\Yappendixkeyword + \toks0={#1}% +! \xdef\currentchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\appendixletter}% +! \let\noexpand\thischapter\noexpand\thischapterAppendix + }% + \else + \toks0={#1}% +! \xdef\currentchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\the\chapno}% +! \let\noexpand\thischapter\noexpand\thischapterChapter + }% + \fi\fi\fi + % +*************** +*** 5719,5735 **** + % + % Now the second mark, after the heading break. No break points + % between here and the heading. +! \let\prevchapterdefs=\lastchapterdefs +! \let\prevsectiondefs=\lastsectiondefs + \domark + % + {% +! \chapfonts \rmisbold +! % +! % Have to define \lastsection before calling \donoderef, because the +! % xref code eventually uses it. On the other hand, it has to be called +! % after \pchapsepmacro, or the headline will change too soon. +! \gdef\lastsection{#1}% + % + % Only insert the separating space if we have a chapter/appendix + % number, and don't print the unnumbered ``number''. +--- 6585,6597 ---- + % + % Now the second mark, after the heading break. No break points + % between here and the heading. +! \let\prevchapterdefs=\currentchapterdefs +! \let\prevsectiondefs=\currentsectiondefs + \domark + % + {% +! \chapfonts \rm +! \let\footnote=\errfootnoteheading % give better error message + % + % Only insert the separating space if we have a chapter/appendix + % number, and don't print the unnumbered ``number''. +*************** +*** 5757,5763 **** + % been typeset. If the destination for the pdf outline is after the + % text, then jumping from the outline may wind up with the text not + % being visible, for instance under high magnification. +! \donoderef{#2}% + % + % Typeset the actual heading. + \nobreak % Avoid page breaks at the interline glue. +--- 6619,6625 ---- + % been typeset. If the destination for the pdf outline is after the + % text, then jumping from the outline may wind up with the text not + % being visible, for instance under high magnification. +! \donoderef{#2}{#1}% + % + % Typeset the actual heading. + \nobreak % Avoid page breaks at the interline glue. +*************** +*** 5777,5806 **** + } + + +- % I don't think this chapter style is supported any more, so I'm not +- % updating it with the new noderef stuff. We'll see. --karl, 11aug03. +- % +- \def\setchapterstyle #1 {\csname CHAPF#1\endcsname} +- % +- \def\unnchfopen #1{% +- \chapoddpage +- \vbox{\chapfonts \raggedtitlesettings #1\par}% +- \nobreak\bigskip\nobreak +- } +- \def\chfopen #1#2{\chapoddpage {\chapfonts +- \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% +- \par\penalty 5000 % +- } +- \def\centerchfopen #1{% +- \chapoddpage +- \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% +- \nobreak\bigskip \nobreak +- } +- \def\CHAPFopen{% +- \global\let\chapmacro=\chfopen +- \global\let\centerchapmacro=\centerchfopen} +- +- + % Section titles. These macros combine the section number parts and + % call the generic \sectionheading to do the printing. + % +--- 6639,6644 ---- +*************** +*** 5815,5844 **** + \def\subsubsecheadingskip{\subsecheadingskip} + \def\subsubsecheadingbreak{\subsecheadingbreak} + + + % Print any size, any type, section title. + % +! % #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is +! % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the +! % section number. + % + \def\seckeyword{sec} + % + \def\sectionheading#1#2#3#4{% + {% +- \checkenv{}% should not be in an environment. +- % +- % Switch to the right set of fonts. +- \csname #2fonts\endcsname \rmisbold +- % + \def\sectionlevel{#2}% + \def\temptype{#3}% + % + % Insert first mark before the heading break (see notes for \domark). +! \let\prevsectiondefs=\lastsectiondefs + \ifx\temptype\Ynothingkeyword + \ifx\sectionlevel\seckeyword +! \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% + \gdef\thissection{\thissectionname}}% + \fi + \else\ifx\temptype\Yomitfromtockeyword +--- 6653,6695 ---- + \def\subsubsecheadingskip{\subsecheadingskip} + \def\subsubsecheadingbreak{\subsecheadingbreak} + ++ % Definition for @thissection. This can be overridden in translation ++ % files. ++ \def\thissectionDef{% ++ \putwordSection{} \thissectionnum: \thissectionname} ++ % ++ + + % Print any size, any type, section title. + % +! % #1 is the text of the title, +! % #2 is the section level (sec/subsec/subsubsec), +! % #3 is the section type (Ynumbered, Ynothing, Yappendix, Yomitfromtoc), +! % #4 is the section number. + % + \def\seckeyword{sec} + % + \def\sectionheading#1#2#3#4{% + {% + \def\sectionlevel{#2}% + \def\temptype{#3}% + % ++ % It is ok for the @heading series commands to appear inside an ++ % environment (it's been historically allowed, though the logic is ++ % dubious), but not the others. ++ \ifx\temptype\Yomitfromtockeyword\else ++ \checkenv{}% non-@*heading should not be in an environment. ++ \fi ++ \let\footnote=\errfootnoteheading ++ % ++ % Switch to the right set of fonts. ++ \csname #2fonts\endcsname \rm ++ % + % Insert first mark before the heading break (see notes for \domark). +! \let\prevsectiondefs=\currentsectiondefs + \ifx\temptype\Ynothingkeyword + \ifx\sectionlevel\seckeyword +! \gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% + \gdef\thissection{\thissectionname}}% + \fi + \else\ifx\temptype\Yomitfromtockeyword +*************** +*** 5846,5872 **** + \else\ifx\temptype\Yappendixkeyword + \ifx\sectionlevel\seckeyword + \toks0={#1}% +! \xdef\lastsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% +! % \noexpand\putwordSection avoids expanding indigestible +! % commands in some of the translations. +! \gdef\noexpand\thissection{\noexpand\putwordSection{} +! \noexpand\thissectionnum: +! \noexpand\thissectionname}% + }% + \fi + \else + \ifx\sectionlevel\seckeyword + \toks0={#1}% +! \xdef\lastsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% +! % \noexpand\putwordSection avoids expanding indigestible +! % commands in some of the translations. +! \gdef\noexpand\thissection{\noexpand\putwordSection{} +! \noexpand\thissectionnum: +! \noexpand\thissectionname}% + }% + \fi + \fi\fi\fi +--- 6697,6715 ---- + \else\ifx\temptype\Yappendixkeyword + \ifx\sectionlevel\seckeyword + \toks0={#1}% +! \xdef\currentsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% +! \let\noexpand\thissection\noexpand\thissectionDef + }% + \fi + \else + \ifx\sectionlevel\seckeyword + \toks0={#1}% +! \xdef\currentsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% +! \let\noexpand\thissection\noexpand\thissectionDef + }% + \fi + \fi\fi\fi +*************** +*** 5885,5912 **** + % + % Now the second mark, after the heading break. No break points + % between here and the heading. +! \let\prevsectiondefs=\lastsectiondefs + \domark + % + % Only insert the space after the number if we have a section number. + \ifx\temptype\Ynothingkeyword + \setbox0 = \hbox{}% + \def\toctype{unn}% +- \gdef\lastsection{#1}% + \else\ifx\temptype\Yomitfromtockeyword +! % for @headings -- no section number, don't include in toc, +! % and don't redefine \lastsection. + \setbox0 = \hbox{}% + \def\toctype{omit}% + \let\sectionlevel=\empty + \else\ifx\temptype\Yappendixkeyword + \setbox0 = \hbox{#4\enspace}% + \def\toctype{app}% +- \gdef\lastsection{#1}% + \else + \setbox0 = \hbox{#4\enspace}% + \def\toctype{num}% +- \gdef\lastsection{#1}% + \fi\fi\fi + % + % Write the toc entry (before \donoderef). See comments in \chapmacro. +--- 6728,6751 ---- + % + % Now the second mark, after the heading break. No break points + % between here and the heading. +! \global\let\prevsectiondefs=\currentsectiondefs + \domark + % + % Only insert the space after the number if we have a section number. + \ifx\temptype\Ynothingkeyword + \setbox0 = \hbox{}% + \def\toctype{unn}% + \else\ifx\temptype\Yomitfromtockeyword +! % for @headings -- no section number, don't include in toc. + \setbox0 = \hbox{}% + \def\toctype{omit}% + \let\sectionlevel=\empty + \else\ifx\temptype\Yappendixkeyword + \setbox0 = \hbox{#4\enspace}% + \def\toctype{app}% + \else + \setbox0 = \hbox{#4\enspace}% + \def\toctype{num}% + \fi\fi\fi + % + % Write the toc entry (before \donoderef). See comments in \chapmacro. +*************** +*** 5914,5920 **** + % + % Write the node reference (= pdf destination for pdftex). + % Again, see comments in \chapmacro. +! \donoderef{#3}% + % + % Interline glue will be inserted when the vbox is completed. + % That glue will be a valid breakpoint for the page, since it'll be +--- 6753,6759 ---- + % + % Write the node reference (= pdf destination for pdftex). + % Again, see comments in \chapmacro. +! \donoderef{#3}{#1}% + % + % Interline glue will be inserted when the vbox is completed. + % That glue will be a valid breakpoint for the page, since it'll be +*************** +*** 5996,6002 **** + % 1 and 2 (the page numbers aren't printed), and so are the first + % two pages of the document. Thus, we'd have two destinations named + % `1', and two named `2'. +! \ifpdf \global\pdfmakepagedesttrue \fi + } + + +--- 6835,6843 ---- + % 1 and 2 (the page numbers aren't printed), and so are the first + % two pages of the document. Thus, we'd have two destinations named + % `1', and two named `2'. +! \ifpdforxetex +! \global\pdfmakepagedesttrue +! \fi + } + + +*************** +*** 6024,6043 **** + \input \tocreadfilename + } + + \newskip\contentsrightmargin \contentsrightmargin=1in + \newcount\savepageno + \newcount\lastnegativepageno \lastnegativepageno = -1 + + % Prepare to read what we've written to \tocfile. + % +! \def\startcontents#1{% + % If @setchapternewpage on, and @headings double, the contents should +! % start on an odd page, unlike chapters. Thus, we maintain +! % \contentsalignmacro in parallel with \pagealignmacro. +! % From: Torbjorn Granlund + \contentsalignmacro + \immediate\closeout\tocfile + % + % Don't need to put `Contents' or `Short Contents' in the headline. + % It is abundantly clear what they are. + \chapmacro{#1}{Yomitfromtoc}{}% +--- 6865,6959 ---- + \input \tocreadfilename + } + ++ % process toc file to find the maximum width of the section numbers for ++ % each chapter ++ \def\findsecnowidths{% ++ \begingroup ++ \setupdatafile ++ \activecatcodes ++ \secentryfonts ++ % Redefinitions ++ \def\numchapentry##1##2##3##4{% ++ \def\curchapname{secnowidth-##2}% ++ \curchapmax=0pt ++ }% ++ \let\appentry\numchapentry ++ % ++ \def\numsecentry##1##2##3##4{% ++ \def\cursecname{secnowidth-##2}% ++ \cursecmax=0pt ++ % ++ \setbox0=\hbox{##2}% ++ \ifdim\wd0>\curchapmax ++ \curchapmax=\wd0 ++ \expandafter\xdef\csname\curchapname\endcsname{\the\wd0}% ++ \fi ++ }% ++ \let\appsecentry\numsecentry ++ % ++ \def\numsubsecentry##1##2##3##4{% ++ \def\curssecname{secnowidth-##2}% ++ \curssecmax=0pt ++ % ++ \setbox0=\hbox{##2}% ++ \ifdim\wd0>\cursecmax ++ \cursecmax=\wd0 ++ \expandafter\xdef\csname\cursecname\endcsname{\the\wd0}% ++ \fi ++ }% ++ \let\appsubsecentry\numsubsecentry ++ % ++ \def\numsubsubsecentry##1##2##3##4{% ++ \setbox0=\hbox{##2}% ++ \ifdim\wd0>\curssecmax ++ \curssecmax=\wd0 ++ \expandafter\xdef\csname\curssecname\endcsname{\the\wd0}% ++ \fi ++ }% ++ \let\appsubsubsecentry\numsubsubsecentry ++ % ++ % Discard any output by outputting to dummy vbox, in case the toc file ++ % contains macros that we have not redefined above. ++ \setbox\dummybox\vbox\bgroup ++ \input \tocreadfilename\relax ++ \egroup ++ \endgroup ++ } ++ \newdimen\curchapmax ++ \newdimen\cursecmax ++ \newdimen\curssecmax ++ ++ ++ % set #1 to the maximum section width for #2 ++ \def\retrievesecnowidth#1#2{% ++ \expandafter\let\expandafter\savedsecnowidth \csname secnowidth-#2\endcsname ++ \ifx\savedsecnowidth\relax ++ #1=0pt ++ \else ++ #1=\savedsecnowidth ++ \fi ++ } ++ \newdimen\secnowidthchap ++ \secnowidthchap=0pt ++ \newdimen\secnowidthsec ++ \secnowidthsec=0pt ++ \newdimen\secnowidthssec ++ \secnowidthssec=0pt ++ ++ + \newskip\contentsrightmargin \contentsrightmargin=1in + \newcount\savepageno + \newcount\lastnegativepageno \lastnegativepageno = -1 + + % Prepare to read what we've written to \tocfile. + % +! \def\startcontents#1#2{% + % If @setchapternewpage on, and @headings double, the contents should +! % start on an odd page, unlike chapters. + \contentsalignmacro + \immediate\closeout\tocfile + % ++ #2% + % Don't need to put `Contents' or `Short Contents' in the headline. + % It is abundantly clear what they are. + \chapmacro{#1}{Yomitfromtoc}{}% +*************** +*** 6045,6056 **** + \savepageno = \pageno + \begingroup % Set up to handle contents files properly. + \raggedbottom % Worry more about breakpoints than the bottom. +! \advance\hsize by -\contentsrightmargin % Don't use the full line length. + % + % Roman numerals for page numbers. + \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi + } + + % redefined for the two-volume lispref. We always output on + % \jobname.toc even if this is redefined. + % +--- 6961,6981 ---- + \savepageno = \pageno + \begingroup % Set up to handle contents files properly. + \raggedbottom % Worry more about breakpoints than the bottom. +! \entryrightmargin=\contentsrightmargin % Don't use the full line length. + % + % Roman numerals for page numbers. + \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi ++ \def\thistitle{}% no title in double-sided headings ++ % Record where the Roman numerals started. ++ \ifnum\romancount=0 \global\romancount=\pagecount \fi ++ \linkentrytexttrue + } + ++ % \raggedbottom in plain.tex hardcodes \topskip so override it ++ \catcode`\@=11 ++ \def\raggedbottom{\advance\topskip by 0pt plus60pt \r@ggedbottomtrue} ++ \catcode`\@=\other ++ + % redefined for the two-volume lispref. We always output on + % \jobname.toc even if this is redefined. + % +*************** +*** 6059,6067 **** + % Normal (long) toc. + % + \def\contents{% +! \startcontents{\putwordTOC}% + \openin 1 \tocreadfilename\space + \ifeof 1 \else + \readtocfile + \fi + \vfill \eject +--- 6984,6994 ---- + % Normal (long) toc. + % + \def\contents{% +! \startcontents{\putwordTOC}{\contentsmkdest}% +! \ifxetex\xetexpreauxfile\fi + \openin 1 \tocreadfilename\space + \ifeof 1 \else ++ \findsecnowidths + \readtocfile + \fi + \vfill \eject +*************** +*** 6070,6083 **** + \pdfmakeoutlines + \fi + \closein 1 + \endgroup +! \lastnegativepageno = \pageno +! \global\pageno = \savepageno + } + + % And just the chapters. + \def\summarycontents{% +! \startcontents{\putwordShortTOC}% + % + \let\partentry = \shortpartentry + \let\numchapentry = \shortchapentry +--- 6997,7014 ---- + \pdfmakeoutlines + \fi + \closein 1 ++ \ifxetex\xetexpostauxfile\fi + \endgroup +! \contentsendroman +! } +! +! \def\contentsmkdest{% +! \pdfmkdest{txi.CONTENTS}% + } + + % And just the chapters. + \def\summarycontents{% +! \startcontents{\putwordShortTOC}{}% + % + \let\partentry = \shortpartentry + \let\numchapentry = \shortchapentry +*************** +*** 6090,6095 **** +--- 7021,7027 ---- + \rm + \hyphenpenalty = 10000 + \advance\baselineskip by 1pt % Open it up a little. ++ \extrasecnoskip=0.4pt + \def\numsecentry##1##2##3##4{} + \let\appsecentry = \numsecentry + \let\unnsecentry = \numsecentry +*************** +*** 6099,6117 **** + \let\numsubsubsecentry = \numsecentry + \let\appsubsubsecentry = \numsecentry + \let\unnsubsubsecentry = \numsecentry + \openin 1 \tocreadfilename\space + \ifeof 1 \else + \readtocfile + \fi + \closein 1 + \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \endgroup +! \lastnegativepageno = \pageno +! \global\pageno = \savepageno + } + \let\shortcontents = \summarycontents + + % Typeset the label for a chapter or appendix for the short contents. + % The arg is, e.g., `A' for an appendix, or `3' for a chapter. + % +--- 7031,7057 ---- + \let\numsubsubsecentry = \numsecentry + \let\appsubsubsecentry = \numsecentry + \let\unnsubsubsecentry = \numsecentry ++ \ifxetex\xetexpreauxfile\fi + \openin 1 \tocreadfilename\space + \ifeof 1 \else + \readtocfile + \fi + \closein 1 ++ \ifxetex\xetexpostauxfile\fi + \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \endgroup +! \contentsendroman + } + \let\shortcontents = \summarycontents + ++ % Get ready to use Arabic numerals again ++ \def\contentsendroman{% ++ \lastnegativepageno = \pageno ++ \global\pageno=1 ++ \contentsendcount = \pagecount ++ } ++ + % Typeset the label for a chapter or appendix for the short contents. + % The arg is, e.g., `A' for an appendix, or `3' for a chapter. + % +*************** +*** 6119,6126 **** + % This space should be enough, since a single number is .5em, and the + % widest letter (M) is 1em, at least in the Computer Modern fonts. + % But use \hss just in case. +- % (This space doesn't include the extra space that gets added after +- % the label; that gets put in by \shortchapentry above.) + % + % We'd like to right-justify chapter numbers, but that looks strange + % with appendix letters. And right-justifying numbers and +--- 7059,7064 ---- +*************** +*** 6130,6145 **** + \hbox to 1em{#1\hss}% + } + +! % These macros generate individual entries in the table of contents. +! % The first argument is the chapter or section name. +! % The last argument is the page number. +! % The arguments in between are the chapter number, section number, ... + + % Parts, in the main contents. Replace the part number, which doesn't + % exist, with an empty box. Let's hope all the numbers have the same width. + % Also ignore the page number, which is conventionally not printed. + \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} +! \def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} + % + % Parts, in the short toc. + \def\shortpartentry#1#2#3#4{% +--- 7068,7096 ---- + \hbox to 1em{#1\hss}% + } + +! % These macros generate individual entries in the table of contents, +! % and are read in from the *.toc file. +! % +! % The arguments are like: +! % \def\numchapentry#1#2#3#4 +! % #1 - the chapter or section name. +! % #2 - section number +! % #3 - level of section (e.g "chap", "sec") +! % #4 - page number + + % Parts, in the main contents. Replace the part number, which doesn't + % exist, with an empty box. Let's hope all the numbers have the same width. + % Also ignore the page number, which is conventionally not printed. + \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} +! \def\partentry#1#2#3#4{% +! % Add stretch and a bonus for breaking the page before the part heading. +! % This reduces the chance of the page being broken immediately after the +! % part heading, before a following chapter heading. +! \vskip 0pt plus 5\baselineskip +! \penalty-300 +! \vskip 0pt plus -5\baselineskip +! \dochapentry{#1}{\numeralbox}{#3}{}% +! } + % + % Parts, in the short toc. + \def\shortpartentry#1#2#3#4{% +*************** +*** 6149,6160 **** + } + + % Chapters, in the main contents. +! \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} +! % + % Chapters, in the short toc. +- % See comments in \dochapentry re vbox and related settings. + \def\shortchapentry#1#2#3#4{% +! \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% + } + + % Appendices, in the main contents. +--- 7100,7113 ---- + } + + % Chapters, in the main contents. +! \def\numchapentry#1#2#3#4{% +! \retrievesecnowidth\secnowidthchap{#2}% +! \dochapentry{#1}{#2}{#3}{#4}% +! } +! + % Chapters, in the short toc. + \def\shortchapentry#1#2#3#4{% +! \tocentry{#1}{\shortchaplabel{#2}}{#3}{#4}% + } + + % Appendices, in the main contents. +*************** +*** 6165,6232 **** + \setbox0 = \hbox{\putwordAppendix{} M}% + \hbox to \wd0{\putwordAppendix{} #1\hss}} + % +! \def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} + + % Unnumbered chapters. +! \def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} +! \def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} + + % Sections. +! \def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} + \let\appsecentry=\numsecentry +! \def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} + + % Subsections. +! \def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} + \let\appsubsecentry=\numsubsecentry +! \def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} + + % And subsubsections. +! \def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} + \let\appsubsubsecentry=\numsubsubsecentry +! \def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} + + % This parameter controls the indentation of the various levels. + % Same as \defaultparindent. + \newdimen\tocindent \tocindent = 15pt + +! % Now for the actual typesetting. In all these, #1 is the text and #2 is the +! % page number. + % + % If the toc has to be broken over pages, we want it to be at chapters + % if at all possible; hence the \penalty. +! \def\dochapentry#1#2{% + \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip + \begingroup + \chapentryfonts +! \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \endgroup + \nobreak\vskip .25\baselineskip plus.1\baselineskip + } + +! \def\dosecentry#1#2{\begingroup + \secentryfonts \leftskip=\tocindent +! \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \endgroup} + +! \def\dosubsecentry#1#2{\begingroup + \subsecentryfonts \leftskip=2\tocindent +! \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \endgroup} + +! \def\dosubsubsecentry#1#2{\begingroup + \subsubsecentryfonts \leftskip=3\tocindent +! \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \endgroup} + +! % We use the same \entry macro as for the index entries. +! \let\tocentry = \entry +! +! % Space between chapter (or whatever) number and the title. +! \def\labelspace{\hskip1em \relax} +! +! \def\dopageno#1{{\rm #1}} +! \def\doshortpageno#1{{\rm #1}} + + \def\chapentryfonts{\secfonts \rm} + \def\secentryfonts{\textfonts} +--- 7118,7230 ---- + \setbox0 = \hbox{\putwordAppendix{} M}% + \hbox to \wd0{\putwordAppendix{} #1\hss}} + % +! \def\appentry#1#2#3#4{% +! \retrievesecnowidth\secnowidthchap{#2}% +! \dochapentry{\appendixbox{#2}\hskip.7em#1}{}{#3}{#4}% +! } + + % Unnumbered chapters. +! \def\unnchapentry#1#2#3#4{\dochapentry{#1}{}{#3}{#4}} +! \def\shortunnchapentry#1#2#3#4{\tocentry{#1}{}{#3}{#4}} + + % Sections. +! \def\numsecentry#1#2#3#4{% +! \retrievesecnowidth\secnowidthsec{#2}% +! \dosecentry{#1}{#2}{#3}{#4}% +! } + \let\appsecentry=\numsecentry +! \def\unnsecentry#1#2#3#4{% +! \retrievesecnowidth\secnowidthsec{#2}% +! \dosecentry{#1}{}{#3}{#4}% +! } + + % Subsections. +! \def\numsubsecentry#1#2#3#4{% +! \retrievesecnowidth\secnowidthssec{#2}% +! \dosubsecentry{#1}{#2}{#3}{#4}% +! } + \let\appsubsecentry=\numsubsecentry +! \def\unnsubsecentry#1#2#3#4{% +! \retrievesecnowidth\secnowidthssec{#2}% +! \dosubsecentry{#1}{}{#3}{#4}% +! } + + % And subsubsections. +! \def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#2}{#3}{#4}} + \let\appsubsubsecentry=\numsubsubsecentry +! \def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{}{#3}{#4}} + + % This parameter controls the indentation of the various levels. + % Same as \defaultparindent. + \newdimen\tocindent \tocindent = 15pt + +! % Now for the actual typesetting. In all these, #1 is the text, #2 is +! % a section number if present, #3 is the node, and #4 is the page number. + % + % If the toc has to be broken over pages, we want it to be at chapters + % if at all possible; hence the \penalty. +! \def\dochapentry#1#2#3#4{% + \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip + \begingroup ++ % Move the page numbers slightly to the right ++ \advance\entryrightmargin by -0.05em + \chapentryfonts +! \extrasecnoskip=0.4em % separate chapter number more +! \tocentry{#1}{#2}{#3}{#4}% + \endgroup + \nobreak\vskip .25\baselineskip plus.1\baselineskip + } + +! \def\dosecentry#1#2#3#4{\begingroup +! \secnowidth=\secnowidthchap + \secentryfonts \leftskip=\tocindent +! \tocentry{#1}{#2}{#3}{#4}% + \endgroup} + +! \def\dosubsecentry#1#2#3#4{\begingroup +! \secnowidth=\secnowidthsec + \subsecentryfonts \leftskip=2\tocindent +! \tocentry{#1}{#2}{#3}{#4}% + \endgroup} + +! \def\dosubsubsecentry#1#2#3#4{\begingroup +! \secnowidth=\secnowidthssec + \subsubsecentryfonts \leftskip=3\tocindent +! \tocentry{#1}{#2}{#3}{#4}% + \endgroup} + +! % Used for the maximum width of a section number so we can align +! % section titles. +! \newdimen\secnowidth +! \secnowidth=0pt +! \newdimen\extrasecnoskip +! \extrasecnoskip=0pt +! +! \let\tocnodetarget\empty +! \let\entrypagetarget\empty +! +! % \tocentry{TITLE}{SEC NO}{NODE}{PAGE} +! % +! \def\tocentry#1#2#3#4{% +! \def\tocnodetarget{#3}% +! \def\secno{#2}% +! \ifx\empty\secno +! \entryinternal{#1}{#4}% +! \else +! \ifdim 0pt=\secnowidth +! \setbox0=\hbox{#2\hskip\labelspace\hskip\extrasecnoskip}% +! \else +! \advance\secnowidth by \labelspace +! \advance\secnowidth by \extrasecnoskip +! \setbox0=\hbox to \secnowidth{% +! #2\hskip\labelspace\hskip\extrasecnoskip\hfill}% +! \fi +! \entrycontskip=\wd0 +! \entryinternal{\box0 #1}{#4}% +! \fi +! } +! \newdimen\labelspace +! \labelspace=0.6em + + \def\chapentryfonts{\secfonts \rm} + \def\secentryfonts{\textfonts} +*************** +*** 6242,6248 **** + % But \@ or @@ will get a plain @ character. + + \envdef\tex{% +! \setupmarkupstyle{tex}% + \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 + \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 + \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie +--- 7240,7246 ---- + % But \@ or @@ will get a plain @ character. + + \envdef\tex{% +! \setregularquotes + \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 + \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 + \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie +*************** +*** 6252,6265 **** + \catcode `\|=\other + \catcode `\<=\other + \catcode `\>=\other +! \catcode`\`=\other +! \catcode`\'=\other +! \escapechar=`\\ + % + % ' is active in math mode (mathcode"8000). So reset it, and all our + % other math active characters (just in case), to plain's definitions. + \mathactive + % + \let\b=\ptexb + \let\bullet=\ptexbullet + \let\c=\ptexc +--- 7250,7263 ---- + \catcode `\|=\other + \catcode `\<=\other + \catcode `\>=\other +! \catcode `\`=\other +! \catcode `\'=\other + % + % ' is active in math mode (mathcode"8000). So reset it, and all our + % other math active characters (just in case), to plain's definitions. + \mathactive + % ++ % Inverse of the list at the beginning of the file. + \let\b=\ptexb + \let\bullet=\ptexbullet + \let\c=\ptexc +*************** +*** 6275,6283 **** + \let\+=\tabalign + \let\}=\ptexrbrace + \let\/=\ptexslash + \let\*=\ptexstar + \let\t=\ptext +! \expandafter \let\csname top\endcsname=\ptextop % outer + \let\frenchspacing=\plainfrenchspacing + % + \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% +--- 7273,7283 ---- + \let\+=\tabalign + \let\}=\ptexrbrace + \let\/=\ptexslash ++ \let\sp=\ptexsp + \let\*=\ptexstar ++ %\let\sup=\ptexsup % do not redefine, we want @sup to work in math mode + \let\t=\ptext +! \expandafter \let\csname top\endcsname=\ptextop % we've made it outer + \let\frenchspacing=\plainfrenchspacing + % + \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% +*************** +*** 6314,6319 **** +--- 7314,7337 ---- + \endgraf + \ifdim\lastskip<\envskipamount + \removelastskip ++ \ifnum\lastpenalty<10000 ++ % Penalize breaking before the environment, because preceding text ++ % often leads into it. ++ \penalty100 ++ \fi ++ \vskip\envskipamount ++ \fi ++ \fi ++ }} ++ ++ \def\afterenvbreak{{% ++ % =10000 instead of <10000 because of a special case in \itemzzz and ++ % \sectionheading, q.v. ++ \ifnum \lastpenalty=10000 \else ++ \advance\envskipamount by \parskip ++ \endgraf ++ \ifdim\lastskip<\envskipamount ++ \removelastskip + % it's not a good place to break if the last penalty was \nobreak + % or better ... + \ifnum\lastpenalty<10000 \penalty-50 \fi +*************** +*** 6322,6340 **** + \fi + }} + +- \let\afterenvbreak = \aboveenvbreak +- + % \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will + % also clear it, so that its embedded environments do the narrowing again. + \let\nonarrowing=\relax + + % @cartouche ... @end cartouche: draw rectangle w/rounded corners around + % environment contents. +! \font\circle=lcircle10 +! \newdimen\circthick +! \newdimen\cartouter\newdimen\cartinner +! \newskip\normbskip\newskip\normpskip\newskip\normlskip +! \circthick=\fontdimen8\circle + % + \def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth + \def\ctr{{\hskip 6pt\circle\char'010}} +--- 7340,7352 ---- + \fi + }} + + % \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will + % also clear it, so that its embedded environments do the narrowing again. + \let\nonarrowing=\relax + + % @cartouche ... @end cartouche: draw rectangle w/rounded corners around + % environment contents. +! + % + \def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth + \def\ctr{{\hskip 6pt\circle\char'010}} +*************** +*** 6349,6388 **** + % + \newskip\lskip\newskip\rskip + +! \envdef\cartouche{% + \ifhmode\par\fi % can't be in the midst of a paragraph. + \startsavinginserts + \lskip=\leftskip \rskip=\rightskip + \leftskip=0pt\rightskip=0pt % we want these *outside*. + \cartinner=\hsize \advance\cartinner by-\lskip + \advance\cartinner by-\rskip + \cartouter=\hsize +! \advance\cartouter by 18.4pt % allow for 3pt kerns on either +! % side, and for 6pt waste from +! % each corner char, and rule thickness + \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip +- % Flag to tell @lisp, etc., not to narrow margin. +- \let\nonarrowing = t% + % + % If this cartouche directly follows a sectioning command, we need the + % \parskip glue (backspaced over by default) or the cartouche can + % collide with the section heading. + \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi + % +! \vbox\bgroup + \baselineskip=0pt\parskip=0pt\lineskip=0pt + \carttop + \hbox\bgroup +! \hskip\lskip +! \vrule\kern3pt +! \vbox\bgroup +! \kern3pt +! \hsize=\cartinner +! \baselineskip=\normbskip +! \lineskip=\normlskip +! \parskip=\normpskip +! \vskip -\parskip +! \comment % For explanation, see the end of def\group. + } + \def\Ecartouche{% + \ifhmode\par\fi +--- 7361,7418 ---- + % + \newskip\lskip\newskip\rskip + +! % only require the font if @cartouche is actually used +! \def\cartouchefontdefs{% +! \font\circle=lcircle10\relax +! \circthick=\fontdimen8\circle +! } +! \newdimen\circthick +! \newdimen\cartouter\newdimen\cartinner +! \newskip\normbskip\newskip\normpskip\newskip\normlskip +! +! \envparseargdef\cartouche{% +! \cartouchefontdefs + \ifhmode\par\fi % can't be in the midst of a paragraph. + \startsavinginserts + \lskip=\leftskip \rskip=\rightskip + \leftskip=0pt\rightskip=0pt % we want these *outside*. ++ % ++ % Set paragraph width for text inside cartouche. There are ++ % left and right margins of 3pt each plus two vrules 0.4pt each. + \cartinner=\hsize \advance\cartinner by-\lskip + \advance\cartinner by-\rskip ++ \advance\cartinner by -6.8pt ++ % ++ % For drawing top and bottom of cartouche. Each corner char ++ % adds 6pt and we take off the width of a rule to line up with the ++ % right boundary perfectly. + \cartouter=\hsize +! \advance\cartouter by 11.6pt +! % + \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip + % + % If this cartouche directly follows a sectioning command, we need the + % \parskip glue (backspaced over by default) or the cartouche can + % collide with the section heading. + \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi + % +! \setbox\groupbox=\vtop\bgroup + \baselineskip=0pt\parskip=0pt\lineskip=0pt + \carttop + \hbox\bgroup +! \hskip\lskip +! \vrule\kern3pt +! \vbox\bgroup +! \hsize=\cartinner +! \baselineskip=\normbskip +! \lineskip=\normlskip +! \parskip=\normpskip +! \def\arg{#1}% +! \ifx\arg\empty\else +! \centerV{\hfil \bf #1 \hfil}% +! \fi +! \kern3pt +! \vskip -\parskip + } + \def\Ecartouche{% + \ifhmode\par\fi +*************** +*** 6393,6398 **** +--- 7423,7429 ---- + \egroup + \cartbot + \egroup ++ \addgroupbox + \checkinserts + } + +*************** +*** 6402,6408 **** + \newdimen\nonfillparindent + \def\nonfillstart{% + \aboveenvbreak +! \hfuzz = 12pt % Don't be fussy + \sepspaces % Make spaces be word-separators rather than space tokens. + \let\par = \lisppar % don't ignore blank lines + \obeylines % each line of input is a line of output +--- 7433,7439 ---- + \newdimen\nonfillparindent + \def\nonfillstart{% + \aboveenvbreak +! \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy + \sepspaces % Make spaces be word-separators rather than space tokens. + \let\par = \lisppar % don't ignore blank lines + \obeylines % each line of input is a line of output +*************** +*** 6444,6450 **** + % If you want all examples etc. small: @set dispenvsize small. + % If you want even small examples the full size: @set dispenvsize nosmall. + % This affects the following displayed environments: +! % @example, @display, @format, @lisp + % + \def\smallword{small} + \def\nosmallword{nosmall} +--- 7475,7481 ---- + % If you want all examples etc. small: @set dispenvsize small. + % If you want even small examples the full size: @set dispenvsize nosmall. + % This affects the following displayed environments: +! % @example, @display, @format, @lisp, @verbatim + % + \def\smallword{small} + \def\nosmallword{nosmall} +*************** +*** 6490,6498 **** + % + \maketwodispenvdef{lisp}{example}{% + \nonfillstart +! \tt\setupmarkupstyle{example}% + \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. +! \gobble % eat return + } + % @display/@smalldisplay: same as @lisp except keep current font. + % +--- 7521,7529 ---- + % + \maketwodispenvdef{lisp}{example}{% + \nonfillstart +! \tt\setcodequotes + \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. +! \parsearg\gobble + } + % @display/@smalldisplay: same as @lisp except keep current font. + % +*************** +*** 6531,6556 **** + % @raggedright does more-or-less normal line breaking but no right + % justification. From plain.tex. + \envdef\raggedright{% +! \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax + } + \let\Eraggedright\par + +- \envdef\raggedleft{% +- \parindent=0pt \leftskip0pt plus2em +- \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt +- \hbadness=10000 % Last line will usually be underfull, so turn off +- % badness reporting. +- } +- \let\Eraggedleft\par +- +- \envdef\raggedcenter{% +- \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em +- \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt +- \hbadness=10000 % Last line will usually be underfull, so turn off +- % badness reporting. +- } +- \let\Eraggedcenter\par +- + + % @quotation does normal linebreaking (hence we can't use \nonfillstart) + % and narrows the margins. We keep \parskip nonzero in general, since +--- 7562,7571 ---- + % @raggedright does more-or-less normal line breaking but no right + % justification. From plain.tex. + \envdef\raggedright{% +! \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax + } + \let\Eraggedright\par + + + % @quotation does normal linebreaking (hence we can't use \nonfillstart) + % and narrows the margins. We keep \parskip nonzero in general, since +*************** +*** 6590,6596 **** + + % @indentedblock is like @quotation, but indents only on the left and + % has no optional argument. +! % + \makedispenvdef{indentedblock}{\indentedblockstart} + % + \def\indentedblockstart{% +--- 7605,7611 ---- + + % @indentedblock is like @quotation, but indents only on the left and + % has no optional argument. +! % + \makedispenvdef{indentedblock}{\indentedblockstart} + % + \def\indentedblockstart{% +*************** +*** 6648,6656 **** + \endgroup + % + \def\setupverb{% +! \tt % easiest (and conventionally used) font for verbatim + \def\par{\leavevmode\endgraf}% +! \setupmarkupstyle{verb}% + \tabeightspaces + % Respect line breaks, + % print special symbols as themselves, and +--- 7663,7672 ---- + \endgroup + % + \def\setupverb{% +! \tt + \def\par{\leavevmode\endgraf}% +! \parindent = 0pt +! \setcodequotes + \tabeightspaces + % Respect line breaks, + % print special symbols as themselves, and +*************** +*** 6665,6677 **** + \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount + % + % We typeset each line of the verbatim in an \hbox, so we can handle +! % tabs. The \global is in case the verbatim line starts with an accent, +! % or some other command that starts with a begin-group. Otherwise, the +! % entire \verbbox would disappear at the corresponding end-group, before +! % it is typeset. Meanwhile, we can't have nested verbatim commands +! % (can we?), so the \global won't be overwriting itself. + \newbox\verbbox +! \def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} + % + \begingroup + \catcode`\^^I=\active +--- 7681,7689 ---- + \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount + % + % We typeset each line of the verbatim in an \hbox, so we can handle +! % tabs. + \newbox\verbbox +! \def\starttabbox{\setbox\verbbox=\hbox\bgroup} + % + \begingroup + \catcode`\^^I=\active +*************** +*** 6682,6688 **** + \divide\dimen\verbbox by\tabw + \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw + \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw +! \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox + }% + } + \endgroup +--- 7694,7701 ---- + \divide\dimen\verbbox by\tabw + \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw + \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw +! \wd\verbbox=\dimen\verbbox +! \leavevmode\box\verbbox \starttabbox + }% + } + \endgroup +*************** +*** 6692,6708 **** + \let\nonarrowing = t% + \nonfillstart + \tt % easiest (and conventionally used) font for verbatim +! % The \leavevmode here is for blank lines. Otherwise, we would +! % never \starttabox and the \egroup would end verbatim mode. +! \def\par{\leavevmode\egroup\box\verbbox\endgraf}% + \tabexpand +! \setupmarkupstyle{verbatim}% + % Respect line breaks, + % print special symbols as themselves, and + % make each space count. + % Must do in this order: + \obeylines \uncatcodespecials \sepspaces +- \everypar{\starttabbox}% + } + + % Do the @verb magic: verbatim text is quoted by unique +--- 7705,7718 ---- + \let\nonarrowing = t% + \nonfillstart + \tt % easiest (and conventionally used) font for verbatim +! \def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}% + \tabexpand +! \setcodequotes + % Respect line breaks, + % print special symbols as themselves, and + % make each space count. + % Must do in this order: + \obeylines \uncatcodespecials \sepspaces + } + + % Do the @verb magic: verbatim text is quoted by unique +*************** +*** 6737,6749 **** + % ignore everything up to the first ^^M, that's the newline at the end + % of the @verbatim input line itself. Otherwise we get an extra blank + % line in the output. +! \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% + % We really want {...\end verbatim} in the body of the macro, but + % without the active space; thus we have to use \xdef and \gobble. + \endgroup + % + \envdef\verbatim{% +! \setupverbatim\doverbatim + } + \let\Everbatim = \afterenvbreak + +--- 7747,7762 ---- + % ignore everything up to the first ^^M, that's the newline at the end + % of the @verbatim input line itself. Otherwise we get an extra blank + % line in the output. +! \xdef\doverbatim#1^^M#2@end verbatim{% +! \starttabbox#2\egroup\noexpand\end\gobble verbatim}% + % We really want {...\end verbatim} in the body of the macro, but + % without the active space; thus we have to use \xdef and \gobble. ++ % The \egroup ends the \verbbox started at the end of the last line in ++ % the block. + \endgroup + % + \envdef\verbatim{% +! \setnormaldispenv\setupverbatim\doverbatim + } + \let\Everbatim = \afterenvbreak + +*************** +*** 6756,6764 **** + {% + \makevalueexpandable + \setupverbatim +! \indexnofonts % Allow `@@' and other weird things in file names. +! \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% +! \input #1 + \afterenvbreak + }% + } +--- 7769,7780 ---- + {% + \makevalueexpandable + \setupverbatim +! {% +! \indexnofonts % Allow `@@' and other weird things in file names. +! \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% +! \edef\tmp{\noexpand\input #1 } +! \expandafter +! }\expandafter\starttabbox\tmp\egroup + \afterenvbreak + }% + } +*************** +*** 6771,6781 **** + % typesetting commands (@smallbook, font changes, etc.) have to be done + % beforehand -- and a) we want @copying to be done first in the source + % file; b) letting users define the frontmatter in as flexible order as +! % possible is very desirable. +! % +! \def\copying{\checkenv{}\begingroup\scanargctxt\docopying} +! \def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} + % + \def\insertcopying{% + \begingroup + \parindent = 0pt % paragraph indentation looks wrong on title page +--- 7787,7799 ---- + % typesetting commands (@smallbook, font changes, etc.) have to be done + % beforehand -- and a) we want @copying to be done first in the source + % file; b) letting users define the frontmatter in as flexible order as +! % possible is desirable. + % ++ \def\copying{\checkenv{}\begingroup\macrobodyctxt\docopying} ++ {\catcode`\ =\other ++ \gdef\docopying#1@end copying{\endgroup\def\copyingtext{#1}} ++ } ++ + \def\insertcopying{% + \begingroup + \parindent = 0pt % paragraph indentation looks wrong on title page +*************** +*** 6823,6853 **** + \exdentamount=\defbodyindent + } + +! \def\dodefunx#1{% +! % First, check whether we are in the right environment: +! \checkenv#1% +! % +! % As above, allow line break if we have multiple x headers in a row. +! % It's not a great place, though. +! \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi +! % +! % And now, it's time to reuse the body of the original defun: +! \expandafter\gobbledefun#1% +! } +! \def\gobbledefun#1\startdefun{} +! +! % \printdefunline \deffnheader{text} + % + \def\printdefunline#1#2{% + \begingroup +! % call \deffnheader: + #1#2 \endheader + % common ending: + \interlinepenalty = 10000 + \advance\rightskip by 0pt plus 1fil\relax + \endgraf + \nobreak\vskip -\parskip +! \penalty\defunpenalty % signal to \startdefun and \dodefunx + % Some of the @defun-type tags do not enable magic parentheses, + % rendering the following check redundant. But we don't optimize. + \checkparencounts +--- 7841,7859 ---- + \exdentamount=\defbodyindent + } + +! % Called as \printdefunline \deffooheader{text} + % + \def\printdefunline#1#2{% + \begingroup +! \plainfrenchspacing +! % call \deffooheader: + #1#2 \endheader + % common ending: + \interlinepenalty = 10000 + \advance\rightskip by 0pt plus 1fil\relax + \endgraf + \nobreak\vskip -\parskip +! \penalty\defunpenalty % signal to \startdefun and \deffoox + % Some of the @defun-type tags do not enable magic parentheses, + % rendering the following check redundant. But we don't optimize. + \checkparencounts +*************** +*** 6856,6884 **** + + \def\Edefun{\endgraf\medbreak} + +! % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; +! % the only thing remaining is to define \deffnheader. + % + \def\makedefun#1{% + \expandafter\let\csname E#1\endcsname = \Edefun + \edef\temp{\noexpand\domakedefun + \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% + \temp + } +- +- % \domakedefun \deffn \deffnx \deffnheader +- % +- % Define \deffn and \deffnx, without parameters. +- % \deffnheader has to be defined explicitly. +- % + \def\domakedefun#1#2#3{% + \envdef#1{% + \startdefun + \doingtypefnfalse % distinguish typed functions from all else + \parseargusing\activeparens{\printdefunline#3}% + }% +! \def#2{\dodefunx#1}% +! \def#3% + } + + \newif\ifdoingtypefn % doing typed function? +--- 7862,7916 ---- + + \def\Edefun{\endgraf\medbreak} + +! % @defblock, @defline do not automatically create index entries +! \envdef\defblock{% +! \startdefun +! } +! \let\Edefblock\Edefun +! +! \def\defline{% +! \doingtypefnfalse +! \parseargusing\activeparens{\printdefunline\deflineheader}% +! } +! \def\deflineheader#1 #2 #3\endheader{% +! \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% +! } +! +! \def\deftypeline{% +! \doingtypefntrue +! \parseargusing\activeparens{\printdefunline\deftypelineheader}% +! } +! \def\deftypelineheader#1 #2 #3 #4\endheader{% +! \printdefname{#1}{#2}{#3}\magicamp\defunargs{#4\unskip}% +! } +! +! % \makedefun{deffoo} (\deffooheader parameters) { (\deffooheader expansion) } + % ++ % Define \deffoo, \deffoox \Edeffoo and \deffooheader. + \def\makedefun#1{% + \expandafter\let\csname E#1\endcsname = \Edefun + \edef\temp{\noexpand\domakedefun + \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% + \temp + } + \def\domakedefun#1#2#3{% + \envdef#1{% + \startdefun + \doingtypefnfalse % distinguish typed functions from all else + \parseargusing\activeparens{\printdefunline#3}% + }% +! \def#2{% +! % First, check whether we are in the right environment: +! \checkenv#1% +! % +! % As in \startdefun, allow line break if we have multiple x headers +! % in a row. It's not a great place, though. +! \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi +! % +! \doingtypefnfalse % distinguish typed functions from all else +! \parseargusing\activeparens{\printdefunline#3}% +! }% +! \def#3% definition of \deffooheader follows + } + + \newif\ifdoingtypefn % doing typed function? +*************** +*** 6887,6893 **** + % @deftypefnnewline on|off says whether the return type of typed functions + % are printed on their own line. This affects @deftypefn, @deftypefun, + % @deftypeop, and @deftypemethod. +! % + \parseargdef\deftypefnnewline{% + \def\temp{#1}% + \ifx\temp\onword +--- 7919,7925 ---- + % @deftypefnnewline on|off says whether the return type of typed functions + % are printed on their own line. This affects @deftypefn, @deftypefun, + % @deftypeop, and @deftypemethod. +! % + \parseargdef\deftypefnnewline{% + \def\temp{#1}% + \ifx\temp\onword +*************** +*** 6906,6962 **** + % Untyped functions: + + % @deffn category name args +! \makedefun{deffn}{\deffngeneral{}} +! +! % @deffn category class name args +! \makedefun{defop}#1 {\defopon{#1\ \putwordon}} +! +! % \defopon {category on}class name args +! \def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } + +! % \deffngeneral {subind}category name args +! % +! \def\deffngeneral#1#2 #3 #4\endheader{% +! % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. +! \dosubind{fn}{\code{#3}}{#1}% +! \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% + } + + % Typed functions: + + % @deftypefn category type name args +! \makedefun{deftypefn}{\deftypefngeneral{}} + + % @deftypeop category class type name args +! \makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} +! +! % \deftypeopon {category on}class type name args +! \def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } +! +! % \deftypefngeneral {subind}category type name args +! % +! \def\deftypefngeneral#1#2 #3 #4 #5\endheader{% +! \dosubind{fn}{\code{#4}}{#1}% + \doingtypefntrue +! \defname{#2}{#3}{#4}\defunargs{#5\unskip}% + } + + % Typed variables: + + % @deftypevr category type var args +! \makedefun{deftypevr}{\deftypecvgeneral{}} + + % @deftypecv category class type var args +! \makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} +! +! % \deftypecvof {category of}class type var args +! \def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } +! +! % \deftypecvgeneral {subind}category type var args +! % +! \def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% +! \dosubind{vr}{\code{#4}}{#1}% +! \defname{#2}{#3}{#4}\defunargs{#5\unskip}% + } + + % Untyped variables: +--- 7938,7985 ---- + % Untyped functions: + + % @deffn category name args +! \makedefun{deffn}#1 #2 #3\endheader{% +! \doind{fn}{\code{#2}}% +! \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% +! } + +! % @defop category class name args +! \makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}} +! \def\defopheaderx#1#2 #3 #4\endheader{% +! \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}% +! \printdefname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}% + } + + % Typed functions: + + % @deftypefn category type name args +! \makedefun{deftypefn}#1 #2 #3 #4\endheader{% +! \doind{fn}{\code{#3}}% +! \doingtypefntrue +! \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% +! } + + % @deftypeop category class type name args +! \makedefun{deftypeop}#1 {\deftypeopheaderx{#1\ \putwordon}} +! \def\deftypeopheaderx#1#2 #3 #4 #5\endheader{% +! \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}% + \doingtypefntrue +! \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% + } + + % Typed variables: + + % @deftypevr category type var args +! \makedefun{deftypevr}#1 #2 #3 #4\endheader{% +! \doind{vr}{\code{#3}}% +! \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% +! } + + % @deftypecv category class type var args +! \makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}} +! \def\deftypecvheaderx#1#2 #3 #4 #5\endheader{% +! \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}% +! \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% + } + + % Untyped variables: +*************** +*** 6965,6981 **** + \makedefun{defvr}#1 {\deftypevrheader{#1} {} } + + % @defcv category class var args +! \makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} +! +! % \defcvof {category of}class var args +! \def\defcvof#1#2 {\deftypecvof{#1}#2 {} } + + % Types: + + % @deftp category name args + \makedefun{deftp}#1 #2 #3\endheader{% + \doind{tp}{\code{#2}}% +! \defname{#1}{}{#2}\defunargs{#3\unskip}% + } + + % Remaining @defun-like shortcuts: +--- 7988,8002 ---- + \makedefun{defvr}#1 {\deftypevrheader{#1} {} } + + % @defcv category class var args +! \makedefun{defcv}#1 {\defcvheaderx{#1\ \putwordof}} +! \def\defcvheaderx#1#2 {\deftypecvheaderx{#1}#2 {} } + + % Types: + + % @deftp category name args + \makedefun{deftp}#1 #2 #3\endheader{% + \doind{tp}{\code{#2}}% +! \printdefname{#1}{}{#2}\defunargs{#3\unskip}% + } + + % Remaining @defun-like shortcuts: +*************** +*** 6986,7004 **** + \makedefun{defvar}{\defvrheader{\putwordDefvar} } + \makedefun{defopt}{\defvrheader{\putwordDefopt} } + \makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } +! \makedefun{defmethod}{\defopon\putwordMethodon} +! \makedefun{deftypemethod}{\deftypeopon\putwordMethodon} +! \makedefun{defivar}{\defcvof\putwordInstanceVariableof} +! \makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} + +! % \defname, which formats the name of the @def (not the args). + % #1 is the category, such as "Function". + % #2 is the return type, if any. + % #3 is the function name. + % + % We are followed by (but not passed) the arguments, if any. + % +! \def\defname#1#2#3{% + \par + % Get the values of \leftskip and \rightskip as they were outside the @def... + \advance\leftskip by -\defbodyindent +--- 8007,8025 ---- + \makedefun{defvar}{\defvrheader{\putwordDefvar} } + \makedefun{defopt}{\defvrheader{\putwordDefopt} } + \makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } +! \makedefun{defmethod}{\defopheaderx\putwordMethodon} +! \makedefun{deftypemethod}{\deftypeopheaderx\putwordMethodon} +! \makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof} +! \makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof} + +! % \printdefname, which formats the name of the @def (not the args). + % #1 is the category, such as "Function". + % #2 is the return type, if any. + % #3 is the function name. + % + % We are followed by (but not passed) the arguments, if any. + % +! \def\printdefname#1#2#3{% + \par + % Get the values of \leftskip and \rightskip as they were outside the @def... + \advance\leftskip by -\defbodyindent +*************** +*** 7008,7016 **** + \rettypeownlinefalse + \ifdoingtypefn % doing a typed function specifically? + % then check user option for putting return type on its own line: +! \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else +! \rettypeownlinetrue +! \fi + \fi + % + % How we'll format the category name. Putting it in brackets helps +--- 8029,8035 ---- + \rettypeownlinefalse + \ifdoingtypefn % doing a typed function specifically? + % then check user option for putting return type on its own line: +! \ifflagclear{txideftypefnnl}{}{\rettypeownlinetrue}% + \fi + % + % How we'll format the category name. Putting it in brackets helps +*************** +*** 7054,7059 **** +--- 8073,8080 ---- + \tolerance=10000 \hbadness=10000 + \exdentamount=\defbodyindent + {% ++ \def\^^M{}% for line continuation ++ % + % defun fonts. We use typewriter by default (used to be bold) because: + % . we're printing identifiers, they should be in tt in principle. + % . in languages with many accents, such as Czech or French, it's +*************** +*** 7068,7104 **** + \tclose{\temp}% typeset the return type + \ifrettypeownline + % put return type on its own line; prohibit line break following: +! \hfil\vadjust{\nobreak}\break + \else + \space % type on same line, so just followed by a space + \fi + \fi % no return type + #3% output function name + }% +! {\rm\enskip}% hskip 0.5 em of \tenrm + % +! \boldbrax + % arguments will be output next, if any. + } + +! % Print arguments in slanted roman (not ttsl), inconsistently with using +! % tt for the name. This is because literal text is sometimes needed in +! % the argument list (groff manual), and ttsl and tt are not very +! % distinguishable. Prevent hyphenation at `-' chars. +! % + \def\defunargs#1{% +! % use sl by default (not ttsl), +! % tt for the names. +! \df \sl \hyphenchar\font=0 +! % +! % On the other hand, if an argument has two dashes (for instance), we +! % want a way to get ttsl. We used to recommend @var for that, so +! % leave the code in, but it's strange for @var to lead to typewriter. +! % Nowadays we recommend @code, since the difference between a ttsl hyphen +! % and a tt hyphen is pretty tiny. @code also disables ?` !`. +! \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% +! #1% +! \sl\hyphenchar\font=45 + } + + % We want ()&[] to print specially on the defun line. +--- 8089,8121 ---- + \tclose{\temp}% typeset the return type + \ifrettypeownline + % put return type on its own line; prohibit line break following: +! \hfil\vadjust{\nobreak}\break + \else + \space % type on same line, so just followed by a space + \fi + \fi % no return type + #3% output function name + }% +! \ifflagclear{txidefnamenospace}{% +! {\rm\enskip}% hskip 0.5 em of \rmfont +! }{}% + % +! \parenbrackglyphs + % arguments will be output next, if any. + } + +! % Print arguments. Use slanted for @def*, typewriter for @deftype*. + \def\defunargs#1{% +! \bgroup +! \def\^^M{}% for line continuation +! \df \ifdoingtypefn \tt \else \sl \fi +! \ifflagclear{txicodevaristt}{}% +! % use \ttsl for @var in both @def* and @deftype*. +! % the kern prevents an italic correction at end, which appears +! % too much for ttsl. +! {\def\var##1{{\setregularquotes \ttsl ##1\kern 0pt }}}% +! #1% +! \egroup + } + + % We want ()&[] to print specially on the defun line. +*************** +*** 7113,7168 **** + \let\lparen = ( \let\rparen = ) + + % Be sure that we always have a definition for `(', etc. For example, +! % if the fn name has parens in it, \boldbrax will not be in effect yet, +! % so TeX would otherwise complain about undefined control sequence. + { + \activeparens +! \global\let(=\lparen \global\let)=\rparen +! \global\let[=\lbrack \global\let]=\rbrack +! \global\let& = \& + +! \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} + \gdef\magicamp{\let&=\amprm} + } + +! \newcount\parencount +! +! % If we encounter &foo, then turn on ()-hacking afterwards +! \newif\ifampseen +! \def\amprm#1 {\ampseentrue{\bf\ }} +! +! \def\parenfont{% +! \ifampseen +! % At the first level, print parens in roman, +! % otherwise use the default font. +! \ifnum \parencount=1 \rm \fi +! \else +! % The \sf parens (in \boldbrax) actually are a little bolder than +! % the contained text. This is especially needed for [ and ] . +! \sf +! \fi +! } +! \def\infirstlevel#1{% +! \ifampseen +! \ifnum\parencount=1 +! #1% +! \fi +! \fi +! } +! \def\bfafterword#1 {#1 \bf} + + \def\opnr{% + \global\advance\parencount by 1 +! {\parenfont(}% +! \infirstlevel \bfafterword + } +! \def\clnr{% +! {\parenfont)}% +! \infirstlevel \sl + \global\advance\parencount by -1 + } + + \newcount\brackcount + \def\lbrb{% + \global\advance\brackcount by 1 + {\bf[}% +--- 8130,8169 ---- + \let\lparen = ( \let\rparen = ) + + % Be sure that we always have a definition for `(', etc. For example, +! % if the fn name has parens in it, \parenbrackglyphs will not be in +! % effect yet, so TeX would otherwise complain about undefined control +! % sequence. + { + \activeparens +! \gdef\defcharsdefault{% +! \let(=\lparen \let)=\rparen +! \let[=\lbrack \let]=\rbrack +! \let& = \&% +! } +! \globaldefs=1 \defcharsdefault + +! \gdef\parenbrackglyphs{\let(=\opnr\let)=\cpnr\let[=\lbrb\let]=\rbrb} + \gdef\magicamp{\let&=\amprm} + } ++ \let\ampchar\& + +! \def\amprm#1 {{\rm\ }} + ++ \newcount\parencount ++ % opening and closing parentheses in roman font + \def\opnr{% ++ \ptexslash % italic correction + \global\advance\parencount by 1 +! {\sf(}% + } +! \def\cpnr{% +! \ptexslash % italic correction +! {\sf)}% + \global\advance\parencount by -1 + } + + \newcount\brackcount ++ % left and right square brackets in bold font + \def\lbrb{% + \global\advance\brackcount by 1 + {\bf[}% +*************** +*** 7204,7237 **** + } + \fi + +! \def\scanmacro#1{\begingroup + \newlinechar`\^^M +! \let\xeatspaces\eatspaces +! % +! % Undo catcode changes of \startcontents and \doprintindex +! % When called from @insertcopying or (short)caption, we need active +! % backslash to get it printed correctly. Previously, we had +! % \catcode`\\=\other instead. We'll see whether a problem appears +! % with macro expansion. --kasal, 19aug04 +! \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ + % +! % ... and for \example: +! \spaceisspace + % +! % The \empty here causes a following catcode 5 newline to be eaten as +! % part of reading whitespace after a control sequence. It does not +! % eat a catcode 13 newline. There's no good way to handle the two +! % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX +! % would then have different behavior). See the Macro Details node in +! % the manual for the workaround we recommend for macros and +! % line-oriented commands. +! % +! \scantokens{#1\empty}% +! \endgroup} + + \def\scanexp#1{% +! \edef\temp{\noexpand\scanmacro{#1}}% +! \temp + } + + \newcount\paramno % Count of parameters +--- 8205,8227 ---- + } + \fi + +! % Used at the time of macro expansion. +! % Argument is macro body with arguments substituted +! \def\scanmacro#1{% + \newlinechar`\^^M +! \def\xeatspaces##1{\eatleadingcrthen\eatspaces{##1}}% + % +! % Process the macro body under the current catcode regime. +! \scantokens{#1@comment}% + % +! % The \comment is to remove the \newlinechar added by \scantokens, and +! % can be noticed by \parsearg. Note \c isn't used because this means cedilla +! % in math mode. +! } + ++ % Used for copying and captions + \def\scanexp#1{% +! \expandafter\scanmacro\expandafter{#1}% + } + + \newcount\paramno % Count of parameters +*************** +*** 7239,7245 **** + \newif\ifrecursive % Is it recursive? + + % List of all defined macros in the form +! % \definedummyword\macro1\definedummyword\macro2... + % Currently is also contains all @aliases; the list can be split + % if there is a need. + \def\macrolist{} +--- 8229,8235 ---- + \newif\ifrecursive % Is it recursive? + + % List of all defined macros in the form +! % \commondummyword\macro1\commondummyword\macro2... + % Currently is also contains all @aliases; the list can be split + % if there is a need. + \def\macrolist{} +*************** +*** 7247,7253 **** + % Add the macro to \macrolist + \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} + \def\addtomacrolistxxx#1{% +! \toks0 = \expandafter{\macrolist\definedummyword#1}% + \xdef\macrolist{\the\toks0}% + } + +--- 8237,8243 ---- + % Add the macro to \macrolist + \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} + \def\addtomacrolistxxx#1{% +! \toks0 = \expandafter{\macrolist\commondummyword#1}% + \xdef\macrolist{\the\toks0}% + } + +*************** +*** 7272,7277 **** +--- 8262,8274 ---- + \unbrace{\gdef\trim@@@ #1 } #2@{#1} + } + ++ % Trim a single leading ^^M off a string, then call #1 ++ {\catcode`\^^M=\active \catcode`\Q=3% ++ \gdef\eatleadingcrthen #1#2{\eatlcra #1Q#2Q^^MQ}% ++ \gdef\eatlcra #1#2Q^^M{\eatlcrb #1#2Q}% ++ \gdef\eatlcrb #1Q#2Q#3Q{#1{#2}}% ++ } ++ + % Trim a single trailing ^^M off a string. + {\catcode`\^^M=\other \catcode`\Q=3% + \gdef\eatcr #1{\eatcra #1Q^^MQ}% +*************** +*** 7297,7344 **** + \catcode`\+=\other + \catcode`\<=\other + \catcode`\>=\other +- \catcode`\@=\other + \catcode`\^=\other + \catcode`\_=\other + \catcode`\|=\other + \catcode`\~=\other +! \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi +! } +! +! \def\scanargctxt{% used for copying and captions, not macros. +! \scanctxt +! \catcode`\\=\other + \catcode`\^^M=\other + } + +! \def\macrobodyctxt{% used for @macro definitions + \scanctxt + \catcode`\{=\other + \catcode`\}=\other +- \catcode`\^^M=\other +- \usembodybackslash + } + +! \def\macroargctxt{% used when scanning invocations + \scanctxt +! \catcode`\\=0 + } +- % why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes" +- % for the single characters \ { }. Thus, we end up with the "commands" +- % that would be written @\ @{ @} in a Texinfo document. +- % +- % We already have @{ and @}. For @\, we define it here, and only for +- % this purpose, to produce a typewriter backslash (so, the @\ that we +- % define for @math can't be used with @macro calls): +- % +- \def\\{\normalbackslash}% +- % +- % We would like to do this for \, too, since that is what makeinfo does. +- % But it is not possible, because Texinfo already has a command @, for a +- % cedilla accent. Documents must use @comma{} instead. +- % +- % \anythingelse will almost certainly be an error of some kind. + + + % \mbodybackslash is the definition of \ in @macro bodies. + % It maps \foo\ => \csname macarg.foo\endcsname => #N +--- 8294,8329 ---- + \catcode`\+=\other + \catcode`\<=\other + \catcode`\>=\other + \catcode`\^=\other + \catcode`\_=\other + \catcode`\|=\other + \catcode`\~=\other +! \catcode`\@=\other + \catcode`\^^M=\other ++ \catcode`\\=\active ++ \passthroughcharstrue + } + +! \def\macrobodyctxt{% used for @macro definitions and @copying + \scanctxt ++ \catcode`\ =\other + \catcode`\{=\other + \catcode`\}=\other + } + +! % Used when scanning braced macro arguments. Note, however, that catcode +! % changes here are ineffectual if the macro invocation was nested inside +! % an argument to another Texinfo command. +! \def\macroargctxt{% + \scanctxt +! \catcode`\ =\active + } + ++ \def\macrolineargctxt{% used for whole-line arguments without braces ++ \scanctxt ++ \catcode`\{=\other ++ \catcode`\}=\other ++ } + + % \mbodybackslash is the definition of \ in @macro bodies. + % It maps \foo\ => \csname macarg.foo\endcsname => #N +*************** +*** 7379,7385 **** + \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% + \addtomacrolist{\the\macname}% + \fi +! \begingroup \macrobodyctxt + \ifrecursive \expandafter\parsermacbody + \else \expandafter\parsemacbody + \fi} +--- 8364,8370 ---- + \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% + \addtomacrolist{\the\macname}% + \fi +! \begingroup \macrobodyctxt \usembodybackslash + \ifrecursive \expandafter\parsermacbody + \else \expandafter\parsemacbody + \fi} +*************** +*** 7391,7401 **** + % Remove the macro name from \macrolist: + \begingroup + \expandafter\let\csname#1\endcsname \relax +! \let\definedummyword\unmacrodo + \xdef\macrolist{\macrolist}% + \endgroup +- \else +- \errmessage{Macro #1 not defined}% + \fi + } + +--- 8376,8384 ---- + % Remove the macro name from \macrolist: + \begingroup + \expandafter\let\csname#1\endcsname \relax +! \let\commondummyword\unmacrodo + \xdef\macrolist{\macrolist}% + \endgroup + \fi + } + +*************** +*** 7406,7466 **** + \ifx #1\relax + % remove this + \else +! \noexpand\definedummyword \noexpand#1% + \fi + } + +! % This makes use of the obscure feature that if the last token of a +! % is #, then the preceding argument is delimited by +! % an opening brace, and that opening brace is not consumed. + \def\getargs#1{\getargsxxx#1{}} + \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} + \def\getmacname#1 #2\relax{\macname={#1}} + \def\getmacargs#1{\def\argl{#1}} + +! % For macro processing make @ a letter so that we can make Texinfo private macro names. + \edef\texiatcatcode{\the\catcode`\@} + \catcode `@=11\relax + +! % Parse the optional {params} list. Set up \paramno and \paramlist +! % so \defmacro knows what to do. Define \macarg.BLAH for each BLAH +! % in the params list to some hook where the argument si to be expanded. If +! % there are less than 10 arguments that hook is to be replaced by ##N where N + % is the position in that list, that is to say the macro arguments are to be +! % defined `a la TeX in the macro body. + % + % That gets used by \mbodybackslash (above). + % +! % We need to get `macro parameter char #' into several definitions. +! % The technique used is stolen from LaTeX: let \hash be something +! % unexpandable, insert that wherever you need a #, and then redefine +! % it to # just before using the token list produced. +! % +! % The same technique is used to protect \eatspaces till just before +! % the macro is used. +! % +! % If there are 10 or more arguments, a different technique is used, where the +! % hook remains in the body, and when macro is to be expanded the body is +! % processed again to replace the arguments. +! % +! % In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the +! % argument N value and then \edef the body (nothing else will expand because of +! % the catcode regime underwhich the body was input). + % +- % If you compile with TeX (not eTeX), and you have macros with 10 or more +- % arguments, you need that no macro has more than 256 arguments, otherwise an +- % error is produced. + \def\parsemargdef#1;{% + \paramno=0\def\paramlist{}% + \let\hash\relax + \let\xeatspaces\relax + \parsemargdefxxx#1,;,% +- % In case that there are 10 or more arguments we parse again the arguments +- % list to set new definitions for the \macarg.BLAH macros corresponding to +- % each BLAH argument. It was anyhow needed to parse already once this list +- % in order to count the arguments, and as macros with at most 9 arguments +- % are by far more frequent than macro with 10 or more arguments, defining +- % twice the \macarg.BLAH macros does not cost too much processing power. + \ifnum\paramno<10\relax\else + \paramno0\relax + \parsemmanyargdef@@#1,;,% 10 or more arguments +--- 8389,8432 ---- + \ifx #1\relax + % remove this + \else +! \noexpand\commondummyword \noexpand#1% + \fi + } + +! % \getargs -- Parse the arguments to a @macro line. Set \macname to +! % the name of the macro, and \argl to the braced argument list. + \def\getargs#1{\getargsxxx#1{}} + \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} + \def\getmacname#1 #2\relax{\macname={#1}} + \def\getmacargs#1{\def\argl{#1}} ++ % This made use of the feature that if the last token of a ++ % is #, then the preceding argument is delimited by ++ % an opening brace, and that opening brace is not consumed. + +! % Make @ a letter, so that we can make private-to-Texinfo macro names. + \edef\texiatcatcode{\the\catcode`\@} + \catcode `@=11\relax + +! % Parse the optional {params} list to @macro or @rmacro. +! % Set \paramno to the number of arguments, +! % and \paramlist to a parameter text for the macro (e.g. #1,#2,#3 for a +! % three-param macro.) Define \macarg.BLAH for each BLAH in the params +! % list to some hook where the argument is to be expanded. If there are +! % less than 10 arguments that hook is to be replaced by ##N where N + % is the position in that list, that is to say the macro arguments are to be +! % defined `a la TeX in the macro body. + % + % That gets used by \mbodybackslash (above). + % +! % If there are 10 or more arguments, a different technique is used: see +! % \parsemmanyargdef@@. + % + \def\parsemargdef#1;{% + \paramno=0\def\paramlist{}% + \let\hash\relax ++ % \hash is redefined to `#' later to get it into definitions + \let\xeatspaces\relax + \parsemargdefxxx#1,;,% + \ifnum\paramno<10\relax\else + \paramno0\relax + \parsemmanyargdef@@#1,;,% 10 or more arguments +*************** +*** 7475,7483 **** + \edef\paramlist{\paramlist\hash\the\paramno,}% + \fi\next} + + \def\parsemmanyargdef@@#1,{% + \if#1;\let\next=\relax +! \else + \let\next=\parsemmanyargdef@@ + \edef\tempb{\eatspaces{#1}}% + \expandafter\def\expandafter\tempa +--- 8441,8484 ---- + \edef\paramlist{\paramlist\hash\the\paramno,}% + \fi\next} + ++ % \parsemacbody, \parsermacbody ++ % ++ % Read recursive and nonrecursive macro bodies. (They're different since ++ % rec and nonrec macros end differently.) ++ % ++ % We are in \macrobodyctxt, and the \xdef causes backslashes in the macro ++ % body to be transformed. ++ % Set \macrobody to the body of the macro, and call \macrodef. ++ % ++ \catcode `\@\texiatcatcode ++ {\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{% ++ \xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% ++ {\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{% ++ \xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% ++ \catcode `\@=11\relax ++ ++ %%%%%%%%%%%%%% Code for > 10 arguments only %%%%%%%%%%%%%%%%%% ++ ++ % If there are 10 or more arguments, a different technique is used, where the ++ % hook remains in the body, and when macro is to be expanded the body is ++ % processed again to replace the arguments. ++ % ++ % In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the ++ % argument N value and then \edef the body (nothing else will expand because of ++ % the catcode regime under which the body was input). ++ % ++ % If you compile with TeX (not eTeX), and you have macros with 10 or more ++ % arguments, no macro can have more than 256 arguments (else error). ++ % ++ % In case that there are 10 or more arguments we parse again the arguments ++ % list to set new definitions for the \macarg.BLAH macros corresponding to ++ % each BLAH argument. It was anyhow needed to parse already once this list ++ % in order to count the arguments, and as macros with at most 9 arguments ++ % are by far more frequent than macro with 10 or more arguments, defining ++ % twice the \macarg.BLAH macros does not cost too much processing power. + \def\parsemmanyargdef@@#1,{% + \if#1;\let\next=\relax +! \else + \let\next=\parsemmanyargdef@@ + \edef\tempb{\eatspaces{#1}}% + \expandafter\def\expandafter\tempa +*************** +*** 7490,7505 **** + \advance\paramno by 1\relax + \fi\next} + +- % These two commands read recursive and nonrecursive macro bodies. +- % (They're different since rec and nonrec macros end differently.) +- % +- +- \catcode `\@\texiatcatcode +- \long\def\parsemacbody#1@end macro% +- {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% +- \long\def\parsermacbody#1@end rmacro% +- {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% +- \catcode `\@=11\relax + + \let\endargs@\relax + \let\nil@\relax +--- 8491,8496 ---- +*************** +*** 7507,7513 **** + \long\def\nillm@{\nil@}% + + % This macro is expanded during the Texinfo macro expansion, not during its +! % definition. It gets all the arguments values and assigns them to macros + % macarg.ARGNAME + % + % #1 is the macro name +--- 8498,8504 ---- + \long\def\nillm@{\nil@}% + + % This macro is expanded during the Texinfo macro expansion, not during its +! % definition. It gets all the arguments' values and assigns them to macros + % macarg.ARGNAME + % + % #1 is the macro name +*************** +*** 7528,7535 **** + \getargvals@@ + \fi + } +- +- % + \def\getargvals@@{% + \ifx\paramlist\nilm@ + % Some sanity check needed here that \argvaluelist is also empty. +--- 8519,8524 ---- +*************** +*** 7573,7579 **** + } + + % Replace arguments by their values in the macro body, and place the result +! % in macro \@tempa + \def\macvalstoargs@{% + % To do this we use the property that token registers that are \the'ed + % within an \edef expand only once. So we are going to place all argument +--- 8562,8569 ---- + } + + % Replace arguments by their values in the macro body, and place the result +! % in macro \@tempa. +! % + \def\macvalstoargs@{% + % To do this we use the property that token registers that are \the'ed + % within an \edef expand only once. So we are going to place all argument +*************** +*** 7597,7604 **** + \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% + } + +! \def\macargexpandinbody@{% +! %% Define the named-macro outside of this group and then close this group. + \expandafter + \endgroup + \macargdeflist@ +--- 8587,8595 ---- + \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% + } + +! % Define the named-macro outside of this group and then close this group. +! % +! \def\macargexpandinbody@{% + \expandafter + \endgroup + \macargdeflist@ +*************** +*** 7635,7648 **** + \next + } + +! % Save the token stack pointer into macro #1 +! \def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}} +! % Restore the token stack pointer from number in macro #1 +! \def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax} +! % newtoks that can be used non \outer . +! \def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi} +! +! % Tailing missing arguments are set to empty + \def\setemptyargvalues@{% + \ifx\paramlist\nilm@ + \let\next\macargexpandinbody@ +--- 8626,8633 ---- + \next + } + +! % Trailing missing arguments are set to empty. +! % + \def\setemptyargvalues@{% + \ifx\paramlist\nilm@ + \let\next\macargexpandinbody@ +*************** +*** 7672,7773 **** + \long\def#2{#4}% + } + +! % This defines a Texinfo @macro. There are eight cases: recursive and +! % nonrecursive macros of zero, one, up to nine, and many arguments. +! % Much magic with \expandafter here. + % \xdef is used so that macro definitions will survive the file +! % they're defined in; @include reads the file inside a group. + % +! \def\defmacro{% + \let\hash=##% convert placeholders to macro parameter chars +! \ifrecursive +! \ifcase\paramno +! % 0 +! \expandafter\xdef\csname\the\macname\endcsname{% +! \noexpand\scanmacro{\temp}}% +! \or % 1 +! \expandafter\xdef\csname\the\macname\endcsname{% +! \bgroup\noexpand\macroargctxt +! \noexpand\braceorline +! \expandafter\noexpand\csname\the\macname xxx\endcsname}% +! \expandafter\xdef\csname\the\macname xxx\endcsname##1{% +! \egroup\noexpand\scanmacro{\temp}}% +! \else +! \ifnum\paramno<10\relax % at most 9 +! \expandafter\xdef\csname\the\macname\endcsname{% +! \bgroup\noexpand\macroargctxt +! \noexpand\csname\the\macname xx\endcsname}% +! \expandafter\xdef\csname\the\macname xx\endcsname##1{% +! \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% +! \expandafter\expandafter +! \expandafter\xdef +! \expandafter\expandafter +! \csname\the\macname xxx\endcsname +! \paramlist{\egroup\noexpand\scanmacro{\temp}}% +! \else % 10 or more +! \expandafter\xdef\csname\the\macname\endcsname{% +! \noexpand\getargvals@{\the\macname}{\argl}% +! }% +! \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp +! \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble +! \fi +! \fi +! \else +! \ifcase\paramno +! % 0 + \expandafter\xdef\csname\the\macname\endcsname{% +! \noexpand\norecurse{\the\macname}% +! \noexpand\scanmacro{\temp}\egroup}% +! \or % 1 + \expandafter\xdef\csname\the\macname\endcsname{% +! \bgroup\noexpand\macroargctxt +! \noexpand\braceorline +! \expandafter\noexpand\csname\the\macname xxx\endcsname}% +! \expandafter\xdef\csname\the\macname xxx\endcsname##1{% +! \egroup +! \noexpand\norecurse{\the\macname}% +! \noexpand\scanmacro{\temp}\egroup}% +! \else % at most 9 +! \ifnum\paramno<10\relax +! \expandafter\xdef\csname\the\macname\endcsname{% +! \bgroup\noexpand\macroargctxt +! \expandafter\noexpand\csname\the\macname xx\endcsname}% +! \expandafter\xdef\csname\the\macname xx\endcsname##1{% +! \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% +! \expandafter\expandafter +! \expandafter\xdef +! \expandafter\expandafter +! \csname\the\macname xxx\endcsname +! \paramlist{% +! \egroup +! \noexpand\norecurse{\the\macname}% +! \noexpand\scanmacro{\temp}\egroup}% +! \else % 10 or more: +! \expandafter\xdef\csname\the\macname\endcsname{% +! \noexpand\getargvals@{\the\macname}{\argl}% +! }% +! \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp +! \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse +! \fi + \fi + \fi} + +! \catcode `\@\texiatcatcode\relax + + \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} + +! % \braceorline decides whether the next nonwhitespace character is a +! % {. If so it reads up to the closing }, if not, it reads the whole +! % line. Whatever was read is then fed to the next control sequence +! % as an argument (by \parsebrace or \parsearg). +! % + \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} + \def\braceorlinexxx{% +! \ifx\nchar\bgroup\else +! \expandafter\parsearg + \fi \macnamexxx} + + + % @alias. + % We need some trickery to remove the optional spaces around the equal + % sign. Make them active and then expand them all to nothing. +--- 8657,8927 ---- + \long\def#2{#4}% + } + +! +! %%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%% +! +! +! % This defines a Texinfo @macro or @rmacro, called by \parsemacbody. +! % \macrobody has the body of the macro in it, with placeholders for +! % its parameters, looking like "\xeatspaces{\hash 1}". +! % \paramno is the number of parameters +! % \paramlist is a TeX parameter text, e.g. "#1,#2,#3," +! % There are four cases: macros of zero, one, up to nine, and many arguments. + % \xdef is used so that macro definitions will survive the file +! % they're defined in: @include reads the file inside a group. + % +! \def\macrodef{% + \let\hash=##% convert placeholders to macro parameter chars +! \ifnum\paramno=1 +! \long\def\xeatspaces##1{##1}% +! % We don't use \xeatspaces for single-argument macros, because we +! % want to keep ends of lines. This definition removes \xeatspaces +! % when \macrobody is expanded below. +! \else +! \def\xeatspaces{\string\xeatspaces}% +! % This expands \xeatspaces as a sequence of character tokens, which +! % stops \scantokens inserting an extra space after the control sequence. +! \fi +! \ifcase\paramno +! % 0 +! \expandafter\xdef\csname\the\macname\endcsname{% +! \begingroup +! \noexpand\spaceisspace +! \noexpand\ignoreactivenewline +! \noexpand\expandafter % skip any whitespace after the macro name. +! \expandafter\noexpand\csname\the\macname @@@\endcsname}% +! \expandafter\xdef\csname\the\macname @@@\endcsname{% +! \endgroup +! \noexpand\scanmacro{\macrobody}}% +! \or % 1 +! \expandafter\xdef\csname\the\macname\endcsname{% +! \begingroup +! \noexpand\braceorline +! \expandafter\noexpand\csname\the\macname @@@\endcsname}% +! \expandafter\xdef\csname\the\macname @@@\endcsname##1{% +! \endgroup +! \noexpand\scanmacro{\macrobody}% +! }% +! \else % at most 9 +! \ifnum\paramno<10\relax +! % @MACNAME sets the context for reading the macro argument +! % @MACNAME@@ gets the argument, processes backslashes and appends a +! % comma. +! % @MACNAME@@@ removes braces surrounding the argument list. +! % @MACNAME@@@@ scans the macro body with arguments substituted. + \expandafter\xdef\csname\the\macname\endcsname{% +! \begingroup +! \noexpand\expandafter % This \expandafter skip any spaces after the +! \noexpand\macroargctxt % macro before we change the catcode of space. +! \noexpand\expandafter +! \expandafter\noexpand\csname\the\macname @@\endcsname}% +! \expandafter\xdef\csname\the\macname @@\endcsname##1{% +! \noexpand\passargtomacro +! \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}% +! \expandafter\xdef\csname\the\macname @@@\endcsname##1{% +! \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}% +! \expandaftergroup{\expandafter\xdef\csname\the\macname @@@@\endcsname}% +! \paramlist{% +! \endgroup\noexpand\scanmacro{\macrobody}}% +! \else % 10 or more: + \expandafter\xdef\csname\the\macname\endcsname{% +! \noexpand\getargvals@{\the\macname}{\argl}% +! }% +! \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody +! \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble + \fi + \fi} + +! \catcode `\@\texiatcatcode\relax % end private-to-Texinfo catcodes +! +! % utility definition to avoid excessive use of \expandafter. call +! % as \expandaftergroup{CONTENT}\WORD to expand \WORD exactly once and remove +! % braces around CONTENT. +! \def\expandaftergroup#1#2{% +! \expandafter\expandaftergroupx\expandafter{#2}{#1}% +! } +! \def\expandaftergroupx#1#2{% +! #2#1% +! } + + \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} + +! +! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +! % +! {\catcode`\@=0 \catcode`\\=13 % We need to manipulate \ so use @ as escape +! @catcode`@_=11 % private names +! @catcode`@!=11 % used as argument separator +! +! % \passargtomacro#1#2 - +! % Call #1 with a list of tokens #2, with any doubled backslashes in #2 +! % compressed to one. +! % +! % This implementation works by expansion, and not execution (so we cannot use +! % \def or similar). This reduces the risk of this failing in contexts where +! % complete expansion is done with no execution (for example, in writing out to +! % an auxiliary file for an index entry). +! % +! % State is kept in the input stream: the argument passed to +! % @look_ahead, @gobble_and_check_finish and @add_segment is +! % +! % THE_MACRO ARG_RESULT ! {PENDING_BS} NEXT_TOKEN (... rest of input) +! % +! % where: +! % THE_MACRO - name of the macro we want to call +! % ARG_RESULT - argument list we build to pass to that macro +! % PENDING_BS - either a backslash or nothing +! % NEXT_TOKEN - used to look ahead in the input stream to see what's coming next +! +! @gdef@passargtomacro#1#2{% +! @add_segment #1!{}@relax#2\@_finish\% +! } +! @gdef@_finish{@_finishx} @global@let@_finishx@relax +! +! % #1 - THE_MACRO ARG_RESULT +! % #2 - PENDING_BS +! % #3 - NEXT_TOKEN +! % #4 used to look ahead +! % +! % If the next token is not a backslash, process the rest of the argument; +! % otherwise, remove the next token. +! @gdef@look_ahead#1!#2#3#4{% +! @ifx#4\% +! @expandafter@gobble_and_check_finish +! @else +! @expandafter@add_segment +! @fi#1!{#2}#4#4% +! } +! +! % #1 - THE_MACRO ARG_RESULT +! % #2 - PENDING_BS +! % #3 - NEXT_TOKEN +! % #4 should be a backslash, which is gobbled. +! % #5 looks ahead +! % +! % Double backslash found. Add a single backslash, and look ahead. +! @gdef@gobble_and_check_finish#1!#2#3#4#5{% +! @add_segment#1\!{}#5#5% +! } +! +! @gdef@is_fi{@fi} +! +! % #1 - THE_MACRO ARG_RESULT +! % #2 - PENDING_BS +! % #3 - NEXT_TOKEN +! % #4 is input stream until next backslash +! % +! % Input stream is either at the start of the argument, or just after a +! % backslash sequence, either a lone backslash, or a doubled backslash. +! % NEXT_TOKEN contains the first token in the input stream: if it is \finish, +! % finish; otherwise, append to ARG_RESULT the segment of the argument up until +! % the next backslash. PENDING_BACKSLASH contains a backslash to represent +! % a backslash just before the start of the input stream that has not been +! % added to ARG_RESULT. +! @gdef@add_segment#1!#2#3#4\{% +! @ifx#3@_finish +! @call_the_macro#1!% +! @else +! % append the pending backslash to the result, followed by the next segment +! @expandafter@is_fi@look_ahead#1#2#4!{\}@fi +! % this @fi is discarded by @look_ahead. +! % we can't get rid of it with \expandafter because we don't know how +! % long #4 is. +! } +! +! % #1 - THE_MACRO +! % #2 - ARG_RESULT +! % #3 discards the res of the conditional in @add_segment, and @is_fi ends the +! % conditional. +! @gdef@call_the_macro#1#2!#3@fi{@is_fi #1{#2}} +! +! } +! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +! +! % \braceorline MAC is used for a one-argument macro MAC. It checks +! % whether the next non-whitespace character is a {. It sets the context +! % for reading the argument (slightly different in the two cases). Then, +! % to read the argument, in the whole-line case, it then calls the regular +! % \parsearg MAC; in the lbrace case, it calls \passargtomacro MAC. +! % + \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} + \def\braceorlinexxx{% +! \ifx\nchar\bgroup +! \macroargctxt +! \expandafter\passargtomacro +! \else +! \macrolineargctxt\expandafter\parsearg + \fi \macnamexxx} + + ++ % @linemacro ++ ++ \parseargdef\linemacro{% ++ \getargs{#1}% now \macname is the macname and \argl the arglist ++ \ifx\argl\empty ++ \paramno=0 ++ \let\hash\relax ++ \def\paramlist{\hash 1\endlinemacro}% ++ \else ++ \expandafter\linegetparamlist\argl;% ++ \fi ++ \begingroup \macrobodyctxt \usembodybackslash ++ \parselinemacrobody ++ } ++ ++ % Build up \paramlist which will be used as the parameter text for the macro. ++ % At the end it will be like "#1 #2 #3\endlinemacro". ++ \def\linegetparamlist#1;{% ++ \paramno=0\def\paramlist{}% ++ \let\hash\relax ++ \linegetparamlistxxx#1,;,% ++ } ++ \def\linegetparamlistxxx#1,{% ++ \if#1;\let\next=\linegetparamlistxxxx ++ \else \let\next=\linegetparamlistxxx ++ \advance\paramno by 1 ++ \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname ++ {\hash\the\paramno}% ++ \edef\paramlist{\paramlist\hash\the\paramno\space}% ++ \fi\next} ++ \def\linegetparamlistxxxx{% ++ \expandafter\fixparamlist\paramlist\fixparamlist ++ } ++ % Replace final space token ++ \def\fixparamlist#1 \fixparamlist{% ++ \def\paramlist{#1\endlinemacro}% ++ } ++ ++ % Read the body of the macro, replacing backslash-surrounded variables ++ % ++ {\catcode`\ =\other\long\gdef\parselinemacrobody#1@end linemacro{% ++ \xdef\macrobody{#1}% ++ \endgroup ++ \linemacrodef ++ }} ++ ++ % Make the definition ++ \def\linemacrodef{% ++ \let\hash=##% ++ \expandafter\xdef\csname\the\macname\endcsname{% ++ \bgroup ++ \noexpand\parsearg ++ \expandafter\noexpand\csname\the\macname @@\endcsname ++ } ++ \expandafter\xdef\csname\the\macname @@\endcsname##1{% ++ \egroup ++ \expandafter\noexpand ++ \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro ++ } ++ \expandaftergroup{\expandafter\xdef\csname\the\macname @@@\endcsname}% ++ \paramlist{% ++ \newlinechar=13 % split \macrobody into lines ++ \noexpand\scantokens{\macrobody}% ++ } ++ } ++ ++ ++ + % @alias. + % We need some trickery to remove the optional spaces around the equal + % sign. Make them active and then expand them all to nothing. +*************** +*** 7807,7826 **** + % also remove a trailing comma, in case of something like this: + % @node Help-Cross, , , Cross-refs + \def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} +! \def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} + +- \let\nwnode=\node + \let\lastnode=\empty + + % Write a cross-reference definition for the current node. #1 is the +! % type (Ynumbered, Yappendix, Ynothing). + % +! \def\donoderef#1{% + \ifx\lastnode\empty\else +! \setref{\lastnode}{#1}% + \global\let\lastnode=\empty + \fi + } + + % @anchor{NAME} -- define xref target at arbitrary point. + % +--- 8961,9012 ---- + % also remove a trailing comma, in case of something like this: + % @node Help-Cross, , , Cross-refs + \def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} +! \def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode} +! +! % Used so that the @top node doesn't have to be wrapped in an @ifnottex +! % conditional. +! % \doignore goes to more effort to skip nested conditionals but we don't need +! % that here. +! \def\omittopnode{% +! \ifx\lastnode\wordTop +! \expandafter\ignorenode\fi +! } +! \def\wordTop{Top} +! +! % Until the next @node, @part or @bye command, divert output to a box that +! % is not output. +! \def\ignorenode{\setbox\dummybox\vbox\bgroup +! \def\part{\egroup\part}% +! \def\node{\egroup\node}% +! \ignorenodebye +! } +! +! {\let\bye\relax +! \gdef\ignorenodebye{\let\bye\ignorenodebyedef} +! \gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}} +! % The redefinition of \bye here is because it is declared \outer + + \let\lastnode=\empty + + % Write a cross-reference definition for the current node. #1 is the +! % type (Ynumbered, Yappendix, Ynothing). #2 is the section title. + % +! \def\donoderef#1#2{% + \ifx\lastnode\empty\else +! \setref{\lastnode}{#1}{#2}% + \global\let\lastnode=\empty ++ \setnodeseenonce + \fi + } ++ \def\setnodeseenonce{ ++ \global\nodeseentrue ++ \let\setnodeseenonce\relax ++ } ++ ++ % @nodedescription, @nodedescriptionblock - do nothing for TeX ++ \parseargdef\nodedescription{} ++ \def\nodedescriptionblock{\doignore{nodedescriptionblock}} ++ + + % @anchor{NAME} -- define xref target at arbitrary point. + % +*************** +*** 7828,7857 **** + % + \def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} + \def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} +! \def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} + +! % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an +! % anchor), which consists of three parts: +! % 1) NAME-title - the current sectioning name taken from \lastsection, +! % or the anchor name. +! % 2) NAME-snt - section number and type, passed as the SNT arg, or +! % empty for anchors. + % 3) NAME-pg - the page number. + % + % This is called from \donoderef, \anchor, and \dofloat. In the case of + % floats, there is an additional part, which is not written here: + % 4) NAME-lof - the text as it should appear in a @listoffloats. + % +! \def\setref#1#2{% + \pdfmkdest{#1}% + \iflinks + {% + \atdummies % preserve commands, but don't expand them + \edef\writexrdef##1##2{% + \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef + ##1}{##2}}% these are parameters of \writexrdef + }% +! \toks0 = \expandafter{\lastsection}% + \immediate \writexrdef{title}{\the\toks0 }% + \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. + \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout +--- 9014,9053 ---- + % + \def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} + \def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} +! \def\anchor#1{% +! \savesf \setref{#1}{Yanchor}{#1}\restoresf \ignorespaces +! } +! +! % @namedanchor{NAME, XREFNAME} -- define xref target at arbitrary point +! % with label text for cross-references to it. +! \def\namedanchor#1{\donamedanchor#1\finish}% +! \def\donamedanchor#1,#2\finish{% +! \savesf \setref{#1}{Yanchor}{\ignorespaces #2\unskip}\restoresf \ignorespaces +! } + +! % \setref{NAME}{SNT}{TITLE} defines a cross-reference point NAME (a node +! % or an anchor), which consists of three parts: +! % 1) NAME-title - the current sectioning name +! % 2) NAME-snt - section number and type, passed as the SNT arg. + % 3) NAME-pg - the page number. + % + % This is called from \donoderef, \anchor, and \dofloat. In the case of + % floats, there is an additional part, which is not written here: + % 4) NAME-lof - the text as it should appear in a @listoffloats. + % +! \def\setref#1#2#3{% + \pdfmkdest{#1}% + \iflinks + {% ++ \requireauxfile + \atdummies % preserve commands, but don't expand them ++ % match definition in \xrdef, \refx, \xrefX. ++ \def\value##1{##1}% + \edef\writexrdef##1##2{% + \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef + ##1}{##2}}% these are parameters of \writexrdef + }% +! \toks0 = {#3}% + \immediate \writexrdef{title}{\the\toks0 }% + \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. + \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout +*************** +*** 7863,7869 **** + % automatically in xrefs, if the third arg is not explicitly specified. + % This was provided as a "secret" @set xref-automatic-section-title + % variable, now it's official. +! % + \parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword +--- 9059,9065 ---- + % automatically in xrefs, if the third arg is not explicitly specified. + % This was provided as a "secret" @set xref-automatic-section-title + % variable, now it's official. +! % + \parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword +*************** +*** 7879,7893 **** + \fi\fi + } + +! % + % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is + % the node name, #2 the name of the Info cross-reference, #3 the printed + % node name, #4 the name of the Info file, #5 the name of the printed + % manual. All but the node name can be omitted. + % +! \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} +! \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} +! \def\ref#1{\xrefX[#1,,,,,,,]} + % + \newbox\toprefbox + \newbox\printedrefnamebox +--- 9075,9092 ---- + \fi\fi + } + +! % + % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is + % the node name, #2 the name of the Info cross-reference, #3 the printed + % node name, #4 the name of the Info file, #5 the name of the printed + % manual. All but the node name can be omitted. + % +! \def\pxref{\putwordsee{} \xrefXX} +! \def\xref{\putwordSee{} \xrefXX} +! \def\ref{\xrefXX} +! +! \def\xrefXX#1{\def\xrefXXarg{#1}\futurelet\tokenafterxref\xrefXXX} +! \def\xrefXXX{\expandafter\xrefX\expandafter[\xrefXXarg,,,,,,,]} + % + \newbox\toprefbox + \newbox\printedrefnamebox +*************** +*** 7897,7983 **** + \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup + \unsepspaces + % +! % Get args without leading/trailing spaces. +! \def\printedrefname{\ignorespaces #3}% +! \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}% +! % + \def\infofilename{\ignorespaces #4}% + \setbox\infofilenamebox = \hbox{\infofilename\unskip}% + % +! \def\printedmanual{\ignorespaces #5}% +! \setbox\printedmanualbox = \hbox{\printedmanual\unskip}% +! % +! % If the printed reference name (arg #3) was not explicitly given in +! % the @xref, figure out what we want to use. +! \ifdim \wd\printedrefnamebox = 0pt +! % No printed node name was explicitly given. +! \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax +! % Not auto section-title: use node name inside the square brackets. +! \def\printedrefname{\ignorespaces #1}% +! \else +! % Auto section-title: use chapter/section title inside +! % the square brackets if we have it. +! \ifdim \wd\printedmanualbox > 0pt +! % It is in another manual, so we don't have it; use node name. +! \def\printedrefname{\ignorespaces #1}% +! \else +! \ifhavexrefs +! % We (should) know the real title if we have the xref values. +! \def\printedrefname{\refx{#1-title}{}}% +! \else +! % Otherwise just copy the Info node name. +! \def\printedrefname{\ignorespaces #1}% +! \fi% +! \fi +! \fi +! \fi +! % +! % Make link in pdf output. +! \ifpdf +! {\indexnofonts +! \turnoffactive +! \makevalueexpandable +! % This expands tokens, so do it after making catcode changes, so _ +! % etc. don't get their TeX definitions. This ignores all spaces in +! % #4, including (wrongly) those in the middle of the filename. +! \getfilename{#4}% +! % +! % This (wrongly) does not take account of leading or trailing +! % spaces in #1, which should be ignored. +! \edef\pdfxrefdest{#1}% +! \ifx\pdfxrefdest\empty +! \def\pdfxrefdest{Top}% no empty targets +! \else +! \txiescapepdf\pdfxrefdest % escape PDF special chars +! \fi +! % +! \leavevmode +! \startlink attr{/Border [0 0 0]}% +! \ifnum\filenamelength>0 +! goto file{\the\filename.pdf} name{\pdfxrefdest}% +! \else +! goto name{\pdfmkpgn{\pdfxrefdest}}% +! \fi +! }% +! \setcolor{\linkcolor}% +! \fi + % + % Float references are printed completely differently: "Figure 1.2" +! % instead of "[somenode], p.3". We distinguish them by the +! % LABEL-title being set to a magic string. +! {% +! % Have to otherify everything special to allow the \csname to +! % include an _ in the xref name, etc. +! \indexnofonts +! \turnoffactive +! \expandafter\global\expandafter\let\expandafter\Xthisreftitle +! \csname XR#1-title\endcsname +! }% + \iffloat\Xthisreftitle + % If the user specified the print name (third arg) to the ref, + % print it instead of our usual "Figure 1.2". + \ifdim\wd\printedrefnamebox = 0pt +! \refx{#1-snt}{}% + \else + \printedrefname + \fi +--- 9096,9116 ---- + \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup + \unsepspaces + % +! \getprintedrefname{#1}{#3}{#5}% + \def\infofilename{\ignorespaces #4}% + \setbox\infofilenamebox = \hbox{\infofilename\unskip}% + % +! \startxreflink{#1}{#4}% +! \getrefx{#1-title}\Xthisreftitle + % + % Float references are printed completely differently: "Figure 1.2" +! % instead of "[somenode], p.3". \iffloat distinguishes them by +! % \Xthisreftitle being set to a magic string. + \iffloat\Xthisreftitle + % If the user specified the print name (third arg) to the ref, + % print it instead of our usual "Figure 1.2". + \ifdim\wd\printedrefnamebox = 0pt +! \refx{#1-snt}% + \else + \printedrefname + \fi +*************** +*** 7989,8056 **** + \fi + \else + % node/anchor (non-float) references. +! % + % If we use \unhbox to print the node names, TeX does not insert + % empty discretionaries after hyphens, which means that it will not + % find a line break at a hyphen in a node names. Since some manuals + % are best written with fairly long node names, containing hyphens, + % this is a loss. Therefore, we give the text of the node name + % again, so it is as if TeX is seeing it for the first time. +! % + \ifdim \wd\printedmanualbox > 0pt + % Cross-manual reference with a printed manual name. +! % + \crossmanualxref{\cite{\printedmanual\unskip}}% +- % + \else\ifdim \wd\infofilenamebox > 0pt + % Cross-manual reference with only an info filename (arg 4), no + % printed manual name (arg 5). This is essentially the same as + % the case above; we output the filename, since we have nothing else. +! % + \crossmanualxref{\code{\infofilename\unskip}}% +- % + \else + % Reference within this manual. + % +! % _ (for example) has to be the character _ for the purposes of the +! % control sequence corresponding to the node, but it has to expand +! % into the usual \leavevmode...\vrule stuff for purposes of +! % printing. So we \turnoffactive for the \refx-snt, back on for the +! % printing, back off for the \refx-pg. +! {\turnoffactive +! % Only output a following space if the -snt ref is nonempty; for +! % @unnumbered and @anchor, it won't be. +! \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% +! \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi +! }% + % output the `[mynode]' via the macro below so it can be overridden. + \xrefprintnodename\printedrefname + % +! % But we always want a comma and a space: +! ,\space +! % +! % output the `page 3'. +! \turnoffactive \putwordpage\tie\refx{#1-pg}{}% + \fi\fi + \fi + \endlink + \endgroup} + + % Output a cross-manual xref to #1. Used just above (twice). +! % + % Only include the text "Section ``foo'' in" if the foo is neither + % missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply + % "see The Foo Manual", the idea being to refer to the whole manual. +! % + % But, this being TeX, we can't easily compare our node name against the + % string "Top" while ignoring the possible spaces before and after in + % the input. By adding the arbitrary 7sp below, we make it much less + % likely that a real node name would have the same width as "Top" (e.g., + % in a monospaced font). Hopefully it will never happen in practice. +! % + % For the same basic reason, we retypeset the "Top" at every + % reference, since the current font is indeterminate. +! % + \def\crossmanualxref#1{% + \setbox\toprefbox = \hbox{Top\kern7sp}% + \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% +--- 9122,9286 ---- + \fi + \else + % node/anchor (non-float) references. +! % + % If we use \unhbox to print the node names, TeX does not insert + % empty discretionaries after hyphens, which means that it will not + % find a line break at a hyphen in a node names. Since some manuals + % are best written with fairly long node names, containing hyphens, + % this is a loss. Therefore, we give the text of the node name + % again, so it is as if TeX is seeing it for the first time. +! % + \ifdim \wd\printedmanualbox > 0pt + % Cross-manual reference with a printed manual name. +! % + \crossmanualxref{\cite{\printedmanual\unskip}}% + \else\ifdim \wd\infofilenamebox > 0pt + % Cross-manual reference with only an info filename (arg 4), no + % printed manual name (arg 5). This is essentially the same as + % the case above; we output the filename, since we have nothing else. +! % + \crossmanualxref{\code{\infofilename\unskip}}% + \else + % Reference within this manual. + % +! % Only output a following space if the -snt ref is nonempty, as is +! % the case for @unnumbered and @anchor. +! \getrefx{#1-snt}\tmp +! \ifx\tmp\empty\else +! \ifx\tmp\Yanchor\else +! \tmp\space +! \fi +! \fi +! % + % output the `[mynode]' via the macro below so it can be overridden. + \xrefprintnodename\printedrefname + % +! \ifflagclear{txiomitxrefpg}{% +! % We always want a comma +! ,% +! % output the `page 3'. +! \turnoffactive \putpageref{#1}% +! % Add a , if xref followed by a space +! \if\space\noexpand\tokenafterxref ,% +! \else\ifx\ \tokenafterxref ,% @TAB +! \else\ifx\*\tokenafterxref ,% @* +! \else\ifx\ \tokenafterxref ,% @SPACE +! \else\ifx\ +! \tokenafterxref ,% @NL +! \else\ifx\tie\tokenafterxref ,% @tie +! \fi\fi\fi\fi\fi\fi +! }{}% + \fi\fi + \fi + \endlink + \endgroup} + ++ % \getprintedrefname{NODE}{LABEL}{MANUAL} ++ % - set \printedrefname and \printedmanual ++ % ++ \def\getprintedrefname#1#2#3{% ++ % Get args without leading/trailing spaces. ++ \def\printedrefname{\ignorespaces #2}% ++ \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}% ++ % ++ \def\printedmanual{\ignorespaces #3}% ++ \setbox\printedmanualbox = \hbox{\printedmanual\unskip}% ++ % ++ % If the printed reference name (arg #2) was not explicitly given in ++ % the @xref, figure out what we want to use. ++ \ifdim \wd\printedrefnamebox = 0pt ++ % No printed node name was explicitly given. ++ \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax ++ % Not auto section-title: use node name inside the square brackets. ++ \def\printedrefname{\ignorespaces #1}% ++ \else ++ % Auto section-title: use chapter/section title inside ++ % the square brackets if we have it. ++ \ifdim \wd\printedmanualbox > 0pt ++ % It is in another manual, so we don't have it; use node name. ++ \def\printedrefname{\ignorespaces #1}% ++ \else ++ \ifhavexrefs ++ % We (should) know the real title if we have the xref values. ++ \def\printedrefname{\refx{#1-title}}% ++ \else ++ % Otherwise just copy the Info node name. ++ \def\printedrefname{\ignorespaces #1}% ++ \fi ++ \fi ++ \fi ++ \fi ++ } ++ ++ % \startxreflink{NODE}{FILE} - start link in pdf output. ++ \def\startxreflink#1#2{% ++ \ifpdforxetex ++ % For pdfTeX and LuaTeX ++ {\indexnofonts ++ \makevalueexpandable ++ \turnoffactive ++ % This expands tokens, so do it after making catcode changes, so _ ++ % etc. don't get their TeX definitions. This ignores all spaces in ++ % #2, including (wrongly) those in the middle of the filename. ++ \getfilename{#2}% ++ % ++ % This (wrongly) does not take account of leading or trailing ++ % spaces in #1, which should be ignored. ++ \setpdfdestname{#1}% ++ % ++ \ifx\pdfdestname\empty ++ \def\pdfdestname{Top}% no empty targets ++ \fi ++ % ++ \leavevmode ++ \ifpdf ++ \startlink attr{/Border [0 0 0]}% ++ \ifnum\filenamelength>0 ++ goto file{\the\filename.pdf} name{\pdfdestname}% ++ \else ++ goto name{\pdfdestname}% ++ \fi ++ \else % XeTeX ++ \ifnum\filenamelength>0 ++ % With default settings, ++ % XeTeX (xdvipdfmx) replaces link destination names with integers. ++ % In this case, the replaced destination names of ++ % remote PDFs are no longer known. In order to avoid a replacement, ++ % you can use xdvipdfmx's command line option `-C 0x0010'. ++ % If you use XeTeX 0.99996+ (TeX Live 2016+), ++ % this command line option is no longer necessary ++ % because we can use the `dvipdfmx:config' special. ++ \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A ++ << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}% ++ \else ++ \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A ++ << /S /GoTo /D (\pdfdestname) >> >>}% ++ \fi ++ \fi ++ }% ++ \setcolor{\linkcolor}% ++ \fi ++ } ++ ++ % can be overridden in translation files ++ \def\putpageref#1{% ++ \space\putwordpage\tie\refx{#1-pg}} ++ + % Output a cross-manual xref to #1. Used just above (twice). +! % + % Only include the text "Section ``foo'' in" if the foo is neither + % missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply + % "see The Foo Manual", the idea being to refer to the whole manual. +! % + % But, this being TeX, we can't easily compare our node name against the + % string "Top" while ignoring the possible spaces before and after in + % the input. By adding the arbitrary 7sp below, we make it much less + % likely that a real node name would have the same width as "Top" (e.g., + % in a monospaced font). Hopefully it will never happen in practice. +! % + % For the same basic reason, we retypeset the "Top" at every + % reference, since the current font is indeterminate. +! % + \def\crossmanualxref#1{% + \setbox\toprefbox = \hbox{Top\kern7sp}% + \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% +*************** +*** 8069,8078 **** +--- 9299,9324 ---- + % + \def\xrefprintnodename#1{[#1]} + ++ % @link{NODENAME, LABEL, MANUAL} - create a "plain" link, with no ++ % page number. Not useful if printed on paper. ++ % ++ \def\link#1{\linkX[#1,,,]} ++ \def\linkX[#1,#2,#3,#4]{% ++ \begingroup ++ \unsepspaces ++ \getprintedrefname{#1}{#2}{#3}% ++ \startxreflink{#1}{#3}% ++ \printedrefname ++ \endlink ++ \endgroup ++ } ++ ++ + % Things referred to by \setref. + % + \def\Ynothing{} + \def\Yomitfromtoc{} ++ \def\Yanchor{\isanchor} \let\isanchor\relax + \def\Ynumbered{% + \ifnum\secno=0 + \putwordChapter@tie \the\chapno +*************** +*** 8097,8112 **** + \fi\fi\fi + } + +! % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. +! % If its value is nonempty, SUFFIX is output afterward. +! % +! \def\refx#1#2{% +! {% +! \indexnofonts +! \otherbackslash +! \expandafter\global\expandafter\let\expandafter\thisrefX +! \csname XR#1\endcsname +! }% + \ifx\thisrefX\relax + % If not defined, say something at least. + \angleleft un\-de\-fined\angleright +--- 9343,9351 ---- + \fi\fi\fi + } + +! % \refx{NAME} - reference a cross-reference string named NAME. +! \def\refx#1{% +! \getrefx{#1}\thisrefX + \ifx\thisrefX\relax + % If not defined, say something at least. + \angleleft un\-de\-fined\angleright +*************** +*** 8125,8147 **** + % It's defined, so just use it. + \thisrefX + \fi +- #2% Output the suffix in any case. + } + +! % This is the macro invoked by entries in the aux file. Usually it's +! % just a \def (we prepend XR to the control sequence name to avoid +! % collisions). But if this is a float type, we have more work to do. + % + \def\xrdef#1#2{% +! {% The node name might contain 8-bit characters, which in our current +! % implementation are changed to commands like @'e. Don't let these +! % mess up the control sequence name. + \indexnofonts + \turnoffactive + \xdef\safexrefname{#1}% + }% + % +! \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref + % + % Was that xref control sequence that we just defined for a float? + \expandafter\iffloat\csname XR\safexrefname\endcsname +--- 9364,9404 ---- + % It's defined, so just use it. + \thisrefX + \fi + } + +! % Set #2 to xref string #1 +! \def\getrefx#1#2{% +! \requireauxfile +! {% +! \indexnofonts +! \turnoffactive +! \def\value##1{##1}% +! \expandafter\global\expandafter\let\expandafter#2\csname XR#1\endcsname +! }% +! } +! +! % This is the macro invoked by entries in the aux file. Define a control +! % sequence for a cross-reference target (we prepend XR to the control sequence +! % name to avoid collisions). The value is the page number. If this is a float +! % type, we have more work to do. + % + \def\xrdef#1#2{% +! {% Expand the node or anchor name to remove control sequences. +! % \turnoffactive stops 8-bit characters being changed to commands +! % like @'e. \refx does the same to retrieve the value in the definition. + \indexnofonts + \turnoffactive ++ \def\value##1{##1}% + \xdef\safexrefname{#1}% + }% + % +! \bgroup +! \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% +! \egroup +! % We put the \gdef inside a group to avoid the definitions building up on +! % TeX's save stack, which can cause it to run out of space for aux files with +! % thousands of lines. \gdef doesn't use the save stack, but \csname does +! % when it defines an unknown control sequence as \relax. + % + % Was that xref control sequence that we just defined for a float? + \expandafter\iffloat\csname XR\safexrefname\endcsname +*************** +*** 8162,8178 **** +--- 9419,9455 ---- + \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 + {\safexrefname}}% + \fi ++ \ignorespaces % ignore ends of line in aux file ++ } ++ ++ % If working on a large document in chapters, it is convenient to ++ % be able to disable indexing, cross-referencing, and contents, for test runs. ++ % This is done with @novalidate at the beginning of the file. ++ % ++ \newif\iflinks \linkstrue % by default we want the aux files. ++ \let\novalidate = \linksfalse ++ ++ % Used when writing to the aux file, or when using data from it. ++ \def\requireauxfile{% ++ \iflinks ++ \tryauxfile ++ % Open the new aux file. TeX will close it automatically at exit. ++ \immediate\openout\auxfile=\jobname.aux ++ \fi ++ \global\let\requireauxfile=\relax % Only do this once. + } + + % Read the last existing aux file, if any. No error if none exists. + % + \def\tryauxfile{% ++ \ifxetex\xetexpreauxfile\fi + \openin 1 \jobname.aux + \ifeof 1 \else + \readdatafile{aux}% + \global\havexrefstrue + \fi + \closein 1 ++ \ifxetex\xetexpostauxfile\fi + } + + \def\setupdatafile{% +*************** +*** 8203,8221 **** + \catcode`\^^]=\other + \catcode`\^^^=\other + \catcode`\^^_=\other +- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. +- % in xref tags, i.e., node names. But since ^^e4 notation isn't +- % supported in the main text, it doesn't seem desirable. Furthermore, +- % that is not enough: for node names that actually contain a ^ +- % character, we would end up writing a line like this: 'xrdef {'hat +- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first +- % argument, and \hat is not an expandable control sequence. It could +- % all be worked out, but why? Either we support ^^ or we don't. +- % +- % The other change necessary for this was to define \auxhat: +- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter +- % and then to call \auxhat in \setq. +- % + \catcode`\^=\other + % + % Special characters. Should be turned off anyway, but... +--- 9480,9485 ---- +*************** +*** 8223,8256 **** + \catcode`\[=\other + \catcode`\]=\other + \catcode`\"=\other +! \catcode`\_=\other +! \catcode`\|=\other +! \catcode`\<=\other +! \catcode`\>=\other + \catcode`\$=\other + \catcode`\#=\other + \catcode`\&=\other + \catcode`\%=\other + \catcode`+=\other % avoid \+ for paranoia even though we've turned it off + % +! % This is to support \ in node names and titles, since the \ +! % characters end up in a \csname. It's easier than +! % leaving it active and making its active definition an actual \ +! % character. What I don't understand is why it works in the *value* +! % of the xrdef. Seems like it should be a catcode12 \, and that +! % should not typeset properly. But it works, so I'm moving on for +! % now. --karl, 15jan04. +! \catcode`\\=\other +! % +! % Make the characters 128-255 be printing characters. +! {% +! \count1=128 +! \def\loop{% +! \catcode\count1=\other +! \advance\count1 by 1 +! \ifnum \count1<256 \loop \fi +! }% +! }% + % + % @ is our escape character in .aux files, and we need braces. + \catcode`\{=1 +--- 9487,9503 ---- + \catcode`\[=\other + \catcode`\]=\other + \catcode`\"=\other +! \catcode`\_=\active +! \catcode`\|=\active +! \catcode`\<=\active +! \catcode`\>=\active + \catcode`\$=\other + \catcode`\#=\other + \catcode`\&=\other + \catcode`\%=\other + \catcode`+=\other % avoid \+ for paranoia even though we've turned it off + % +! \catcode`\\=\active + % + % @ is our escape character in .aux files, and we need braces. + \catcode`\{=1 +*************** +*** 8284,8291 **** + % + % Auto-number footnotes. Otherwise like plain. + \gdef\footnote{% +- \let\indent=\ptexindent +- \let\noindent=\ptexnoindent + \global\advance\footnoteno by \@ne + \edef\thisfootno{$^{\the\footnoteno}$}% + % +--- 9531,9536 ---- +*************** +*** 8309,8318 **** + % + \gdef\dofootnote{% + \insert\footins\bgroup + % We want to typeset this text as a normal paragraph, even if the + % footnote reference occurs in (for example) a display environment. + % So reset some parameters. +! \hsize=\pagewidth + \interlinepenalty\interfootnotelinepenalty + \splittopskip\ht\strutbox % top baseline for broken footnotes + \splitmaxdepth\dp\strutbox +--- 9554,9568 ---- + % + \gdef\dofootnote{% + \insert\footins\bgroup ++ % ++ % Nested footnotes are not supported in TeX, that would take a lot ++ % more work. (\startsavinginserts does not suffice.) ++ \let\footnote=\errfootnotenest ++ % + % We want to typeset this text as a normal paragraph, even if the + % footnote reference occurs in (for example) a display environment. + % So reset some parameters. +! \hsize=\txipagewidth + \interlinepenalty\interfootnotelinepenalty + \splittopskip\ht\strutbox % top baseline for broken footnotes + \splitmaxdepth\dp\strutbox +*************** +*** 8346,8358 **** + } + }%end \catcode `\@=11 + + % In case a @footnote appears in a vbox, save the footnote text and create + % the real \insert just after the vbox finished. Otherwise, the insertion + % would be lost. + % Similarly, if a @footnote appears inside an alignment, save the footnote + % text to a box and make the \insert when a row of the table is finished. + % And the same can be done for other insert classes. --kasal, 16nov03. +! + % Replace the \insert primitive by a cheating macro. + % Deeper inside, just make sure that the saved insertions are not spilled + % out prematurely. +--- 9596,9619 ---- + } + }%end \catcode `\@=11 + ++ \def\errfootnotenest{% ++ \errhelp=\EMsimple ++ \errmessage{Nested footnotes not supported in texinfo.tex, ++ even though they work in makeinfo; sorry} ++ } ++ ++ \def\errfootnoteheading{% ++ \errhelp=\EMsimple ++ \errmessage{Footnotes in chapters, sections, etc., are not supported} ++ } ++ + % In case a @footnote appears in a vbox, save the footnote text and create + % the real \insert just after the vbox finished. Otherwise, the insertion + % would be lost. + % Similarly, if a @footnote appears inside an alignment, save the footnote + % text to a box and make the \insert when a row of the table is finished. + % And the same can be done for other insert classes. --kasal, 16nov03. +! % + % Replace the \insert primitive by a cheating macro. + % Deeper inside, just make sure that the saved insertions are not spilled + % out prematurely. +*************** +*** 8426,8432 **** + \newif\ifwarnednoepsf + \newhelp\noepsfhelp{epsf.tex must be installed for images to + work. It is also included in the Texinfo distribution, or you can get +! it from ftp://tug.org/tex/epsf.tex.} + % + \def\image#1{% + \ifx\epsfbox\thisisundefined +--- 9687,9693 ---- + \newif\ifwarnednoepsf + \newhelp\noepsfhelp{epsf.tex must be installed for images to + work. It is also included in the Texinfo distribution, or you can get +! it from https://ctan.org/texarchive/macros/texinfo/texinfo/doc/epsf.tex.} + % + \def\image#1{% + \ifx\epsfbox\thisisundefined +*************** +*** 8439,8444 **** +--- 9700,9711 ---- + \imagexxx #1,,,,,\finish + \fi + } ++ ++ % Approximate height of a line in the standard text font. ++ \newdimen\capheight ++ \setbox0=\vbox{\tenrm H} ++ \capheight=\ht0 ++ + % + % Arguments to @image: + % #1 is (mandatory) image filename; we tack on .eps extension. +*************** +*** 8450,8496 **** + \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup + \catcode`\^^M = 5 % in case we're inside an example + \normalturnoffactive % allow _ et al. in names +! % If the image is by itself, center it. + \ifvmode + \imagevmodetrue +! \else \ifx\centersub\centerV +! % for @center @image, we need a vbox so we can have our vertical space +! \imagevmodetrue +! \vbox\bgroup % vbox has better behavior than vtop herev +! \fi\fi +! % +! \ifimagevmode +! \nobreak\medskip + % Usually we'll have text after the image which will insert + % \parskip glue, so insert it here too to equalize the space + % above and below. +! \nobreak\vskip\parskip +! \nobreak + \fi + % +! % Leave vertical mode so that indentation from an enclosing +! % environment such as @quotation is respected. +! % However, if we're at the top level, we don't want the +! % normal paragraph indentation. +! % On the other hand, if we are in the case of @center @image, we don't +! % want to start a paragraph, which will create a hsize-width box and +! % eradicate the centering. +! \ifx\centersub\centerV\else \noindent \fi + % + % Output the image. + \ifpdf + \dopdfimage{#1}{#2}{#3}% + \else +! % \epsfbox itself resets \epsf?size at each figure. +! \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi +! \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi +! \epsfbox{#1.eps}% + \fi + % + \ifimagevmode + \medskip % space after a standalone image +! \fi +! \ifx\centersub\centerV \egroup \fi + \endgroup} + + +--- 9717,9774 ---- + \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup + \catcode`\^^M = 5 % in case we're inside an example + \normalturnoffactive % allow _ et al. in names +! \makevalueexpandable + \ifvmode + \imagevmodetrue +! \medskip + % Usually we'll have text after the image which will insert + % \parskip glue, so insert it here too to equalize the space + % above and below. +! \vskip\parskip +! % +! % Place image in a \vtop for a top page margin that is (close to) correct, +! % as \topskip glue is relative to the first baseline. +! \vtop\bgroup \kern -\capheight \vskip-\parskip + \fi + % +! \ifx\centersub\centerV +! % For @center @image, enter vertical mode and add vertical space +! % Enter an extra \parskip because @center doesn't add space itself. +! \vbox\bgroup\vskip\parskip\medskip\vskip\parskip +! \else +! % Enter horizontal mode so that indentation from an enclosing +! % environment such as @quotation is respected. +! % However, if we're at the top level, we don't want the +! % normal paragraph indentation. +! \imageindent +! \fi + % + % Output the image. + \ifpdf ++ % For pdfTeX and LuaTeX <= 0.80 + \dopdfimage{#1}{#2}{#3}% + \else +! \ifxetex +! \doxeteximage{#1}{#2}{#3}% +! \else +! % For epsf.tex +! % \epsfbox itself resets \epsf?size at each figure. +! \setbox0 = \hbox{\ignorespaces #2}% +! \ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi +! \setbox0 = \hbox{\ignorespaces #3}% +! \ifdim\wd0 > 0pt \epsfysize=#3\relax \fi +! \epsfbox{#1.eps}% +! \fi + \fi + % + \ifimagevmode ++ \egroup + \medskip % space after a standalone image +! \fi +! \ifx\centersub\centerV % @center @image +! \medskip +! \egroup % close \vbox +! \fi + \endgroup} + + +*************** +*** 8557,8570 **** + \global\advance\floatno by 1 + % + {% +! % This magic value for \lastsection is output by \setref as the +! % XREFLABEL-title value. \xrefX uses it to distinguish float + % labels (which have a completely different output format) from + % node and anchor labels. And \xrdef uses it to construct the + % lists of floats. + % +! \edef\lastsection{\floatmagic=\safefloattype}% +! \setref{\floatlabel}{Yfloat}% + }% + \fi + % +--- 9835,9849 ---- + \global\advance\floatno by 1 + % + {% +! % This magic value for the third argument of \setref is output as +! % the XREFLABEL-title value. \xrefX uses it to distinguish float + % labels (which have a completely different output format) from + % node and anchor labels. And \xrdef uses it to construct the + % lists of floats. + % +! \edef\tmp{\noexpand\setref{\floatlabel}{Yfloat}% +! {\floatmagic=\safefloattype}}% +! \tmp + }% + \fi + % +*************** +*** 8606,8612 **** + % + \ifx\thiscaption\empty \else + \ifx\floatident\empty \else +! \appendtomacro\captionline{: }% had ident, so need a colon between + \fi + % + % caption text. +--- 9885,9891 ---- + % + \ifx\thiscaption\empty \else + \ifx\floatident\empty \else +! \appendtomacro\captionline{: }% had ident, so need a colon between + \fi + % + % caption text. +*************** +*** 8630,8661 **** + % \floatlabel-lof. Besides \floatident, we include the short + % caption if specified, else the full caption if specified, else nothing. + {% + \atdummies + % +! % since we read the caption text in the macro world, where ^^M +! % is turned into a normal character, we have to scan it back, so +! % we don't write the literal three characters "^^M" into the aux file. +! \scanexp{% +! \xdef\noexpand\gtemp{% +! \ifx\thisshortcaption\empty +! \thiscaption +! \else +! \thisshortcaption +! \fi +! }% +! }% + \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident +! \ifx\gtemp\empty \else : \gtemp \fi}}% + }% + \fi + \egroup % end of \vtop + % +- % place the captured inserts +- % +- % BEWARE: when the floats start floating, we have to issue warning +- % whenever an insert appears inside a float which could possibly +- % float. --kasal, 26may04 +- % + \checkinserts + } + +--- 9909,9928 ---- + % \floatlabel-lof. Besides \floatident, we include the short + % caption if specified, else the full caption if specified, else nothing. + {% ++ \requireauxfile + \atdummies + % +! \ifx\thisshortcaption\empty +! \def\gtemp{\thiscaption}% +! \else +! \def\gtemp{\thisshortcaption}% +! \fi + \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident +! \ifx\gtemp\empty \else : \gtemp \fi}}% + }% + \fi + \egroup % end of \vtop + % + \checkinserts + } + +*************** +*** 8669,8676 **** + % + \def\caption{\docaption\thiscaption} + \def\shortcaption{\docaption\thisshortcaption} +! \def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} +! \def\defcaption#1#2{\egroup \def#1{#2}} + + % The parameter is the control sequence identifying the counter we are + % going to use. Create it if it doesn't exist and assign it to \floatno. +--- 9936,9943 ---- + % + \def\caption{\docaption\thiscaption} + \def\shortcaption{\docaption\thisshortcaption} +! \def\docaption{\checkenv\float \bgroup\scanctxt\docaptionz} +! \def\docaptionz#1#2{\egroup \def#1{#2}} + + % The parameter is the control sequence identifying the counter we are + % going to use. Create it if it doesn't exist and assign it to \floatno. +*************** +*** 8698,8704 **** + + % #1 is the control sequence we are passed; we expand into a conditional + % which is true if #1 represents a float ref. That is, the magic +! % \lastsection value which we \setref above. + % + \def\iffloat#1{\expandafter\doiffloat#1==\finish} + % +--- 9965,9971 ---- + + % #1 is the control sequence we are passed; we expand into a conditional + % which is true if #1 represents a float ref. That is, the magic +! % value which we passed to \setref above. + % + \def\iffloat#1{\expandafter\doiffloat#1==\finish} + % +*************** +*** 8755,8760 **** +--- 10022,10028 ---- + \toksA = \expandafter{\csname XR#1-lof\endcsname}% + % + % use the same \entry macro we use to generate the TOC and index. ++ \let\entry\entryinternal + \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% + \writeentry + }} +*************** +*** 8769,8788 **** + { + \catcode`\_ = \active + \globaldefs=1 +! \parseargdef\documentlanguage{\begingroup +! \let_=\normalunderscore % normal _ character for filenames + \tex % read txi-??.tex file in plain TeX. + % Read the file by the name they passed if it exists. + \openin 1 txi-#1.tex + \ifeof 1 +! \documentlanguagetrywithoutunderscore{#1_\finish}% + \else + \globaldefs = 1 % everything in the txi-LL files needs to persist + \input txi-#1.tex + \fi + \closein 1 + \endgroup % end raw TeX +! \endgroup} + % + % If they passed de_DE, and txi-de_DE.tex doesn't exist, + % try txi-de.tex. +--- 10037,10056 ---- + { + \catcode`\_ = \active + \globaldefs=1 +! \parseargdef\documentlanguage{% + \tex % read txi-??.tex file in plain TeX. + % Read the file by the name they passed if it exists. ++ \let_ = \normalunderscore % normal _ character for filename test + \openin 1 txi-#1.tex + \ifeof 1 +! \documentlanguagetrywithoutunderscore #1_\finish + \else + \globaldefs = 1 % everything in the txi-LL files needs to persist + \input txi-#1.tex + \fi + \closein 1 + \endgroup % end raw TeX +! } + % + % If they passed de_DE, and txi-de_DE.tex doesn't exist, + % try txi-de.tex. +*************** +*** 8830,8835 **** +--- 10098,10172 ---- + \global\righthyphenmin = #3\relax + } + ++ % XeTeX and LuaTeX can handle Unicode natively. ++ % Their default I/O uses UTF-8 sequences instead of a byte-wise operation. ++ % Other TeX engines' I/O (pdfTeX, etc.) is byte-wise. ++ % ++ \newif\iftxinativeunicodecapable ++ \newif\iftxiusebytewiseio ++ ++ \ifxetex ++ \txinativeunicodecapabletrue ++ \txiusebytewiseiofalse ++ \else ++ \ifluatex ++ \txinativeunicodecapabletrue ++ \txiusebytewiseiofalse ++ \else ++ \txinativeunicodecapablefalse ++ \txiusebytewiseiotrue ++ \fi ++ \fi ++ ++ \let\xetexpreauxfile\relax ++ \let\xetexpostauxfile\relax ++ ++ % Set I/O by bytes instead of UTF-8 sequence for XeTeX and LuaTex ++ % for non-UTF-8 (byte-wise) encodings. ++ % ++ \def\setbytewiseio{% ++ \ifxetex ++ % For document root file ++ \XeTeXinputencoding "bytes" ++ % ++ % Setting for subsequent files to be read with @include. ++ \XeTeXdefaultencoding "bytes" ++ % ++ % Use UTF-8 for reading auxiliary index and TOC files, which are ++ % always output in UTF-8 with XeTeX. ++ \def\xetexpreauxfile{\XeTeXdefaultencoding "UTF-8"}% ++ \def\xetexpostauxfile{\XeTeXdefaultencoding "bytes"}% ++ \fi ++ ++ \ifluatex ++ \directlua{ ++ local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub ++ local function convert_char (char) ++ return utf8_char(byte(char)) ++ end ++ ++ local function convert_line (line) ++ return gsub(line, ".", convert_char) ++ end ++ ++ callback.register("process_input_buffer", convert_line) ++ ++ local function convert_line_out (line) ++ local line_out = "" ++ for c in string.utfvalues(line) do ++ line_out = line_out .. string.char(c) ++ end ++ return line_out ++ end ++ ++ callback.register("process_output_buffer", convert_line_out) ++ } ++ \fi ++ ++ \txiusebytewiseiotrue ++ } ++ ++ + % Helpers for encodings. + % Set the catcode of characters 128 through 255 to the specified number. + % +*************** +*** 8852,8858 **** + % @documentencoding sets the definition of non-ASCII characters + % according to the specified encoding. + % +! \parseargdef\documentencoding{% + % Encoding being declared for the document. + \def\declaredencoding{\csname #1.enc\endcsname}% + % +--- 10189,10197 ---- + % @documentencoding sets the definition of non-ASCII characters + % according to the specified encoding. + % +! \def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz} +! \def\documentencodingzzz#1{% +! % + % Encoding being declared for the document. + \def\declaredencoding{\csname #1.enc\endcsname}% + % +*************** +*** 8868,9138 **** + \asciichardefs + % + \else \ifx \declaredencoding \lattwo + \setnonasciicharscatcode\active + \lattwochardefs + % + \else \ifx \declaredencoding \latone + \setnonasciicharscatcode\active + \latonechardefs + % + \else \ifx \declaredencoding \latnine + \setnonasciicharscatcode\active + \latninechardefs + % + \else \ifx \declaredencoding \utfeight +! \setnonasciicharscatcode\active +! \utfeightchardefs + % + \else +! \message{Unknown document encoding #1, ignoring.}% + % + \fi % utfeight + \fi % latnine + \fi % latone + \fi % lattwo + \fi % ascii + } + + % A message to be logged when using a character that isn't available + % the default font encoding (OT1). + % +! \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} + + % Take account of \c (plain) vs. \, (Texinfo) difference. + \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} + +! % First, make active non-ASCII characters in order for them to be +! % correctly categorized when TeX reads the replacement text of +! % macros containing the character definitions. + \setnonasciicharscatcode\active +! % + % Latin1 (ISO-8859-1) character definitions. +! \def\latonechardefs{% +! \gdef^^a0{\tie} +! \gdef^^a1{\exclamdown} +! \gdef^^a2{\missingcharmsg{CENT SIGN}} +! \gdef^^a3{{\pounds}} +! \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} +! \gdef^^a5{\missingcharmsg{YEN SIGN}} +! \gdef^^a6{\missingcharmsg{BROKEN BAR}} +! \gdef^^a7{\S} +! \gdef^^a8{\"{}} +! \gdef^^a9{\copyright} +! \gdef^^aa{\ordf} +! \gdef^^ab{\guillemetleft} +! \gdef^^ac{$\lnot$} +! \gdef^^ad{\-} +! \gdef^^ae{\registeredsymbol} +! \gdef^^af{\={}} +! % +! \gdef^^b0{\textdegree} +! \gdef^^b1{$\pm$} +! \gdef^^b2{$^2$} +! \gdef^^b3{$^3$} +! \gdef^^b4{\'{}} +! \gdef^^b5{$\mu$} +! \gdef^^b6{\P} +! % +! \gdef^^b7{$^.$} +! \gdef^^b8{\cedilla\ } +! \gdef^^b9{$^1$} +! \gdef^^ba{\ordm} +! % +! \gdef^^bb{\guillemetright} +! \gdef^^bc{$1\over4$} +! \gdef^^bd{$1\over2$} +! \gdef^^be{$3\over4$} +! \gdef^^bf{\questiondown} +! % +! \gdef^^c0{\`A} +! \gdef^^c1{\'A} +! \gdef^^c2{\^A} +! \gdef^^c3{\~A} +! \gdef^^c4{\"A} +! \gdef^^c5{\ringaccent A} +! \gdef^^c6{\AE} +! \gdef^^c7{\cedilla C} +! \gdef^^c8{\`E} +! \gdef^^c9{\'E} +! \gdef^^ca{\^E} +! \gdef^^cb{\"E} +! \gdef^^cc{\`I} +! \gdef^^cd{\'I} +! \gdef^^ce{\^I} +! \gdef^^cf{\"I} +! % +! \gdef^^d0{\DH} +! \gdef^^d1{\~N} +! \gdef^^d2{\`O} +! \gdef^^d3{\'O} +! \gdef^^d4{\^O} +! \gdef^^d5{\~O} +! \gdef^^d6{\"O} +! \gdef^^d7{$\times$} +! \gdef^^d8{\O} +! \gdef^^d9{\`U} +! \gdef^^da{\'U} +! \gdef^^db{\^U} +! \gdef^^dc{\"U} +! \gdef^^dd{\'Y} +! \gdef^^de{\TH} +! \gdef^^df{\ss} +! % +! \gdef^^e0{\`a} +! \gdef^^e1{\'a} +! \gdef^^e2{\^a} +! \gdef^^e3{\~a} +! \gdef^^e4{\"a} +! \gdef^^e5{\ringaccent a} +! \gdef^^e6{\ae} +! \gdef^^e7{\cedilla c} +! \gdef^^e8{\`e} +! \gdef^^e9{\'e} +! \gdef^^ea{\^e} +! \gdef^^eb{\"e} +! \gdef^^ec{\`{\dotless i}} +! \gdef^^ed{\'{\dotless i}} +! \gdef^^ee{\^{\dotless i}} +! \gdef^^ef{\"{\dotless i}} +! % +! \gdef^^f0{\dh} +! \gdef^^f1{\~n} +! \gdef^^f2{\`o} +! \gdef^^f3{\'o} +! \gdef^^f4{\^o} +! \gdef^^f5{\~o} +! \gdef^^f6{\"o} +! \gdef^^f7{$\div$} +! \gdef^^f8{\o} +! \gdef^^f9{\`u} +! \gdef^^fa{\'u} +! \gdef^^fb{\^u} +! \gdef^^fc{\"u} +! \gdef^^fd{\'y} +! \gdef^^fe{\th} +! \gdef^^ff{\"y} + } + + % Latin9 (ISO-8859-15) encoding character definitions. +! \def\latninechardefs{% + % Encoding is almost identical to Latin1. + \latonechardefs + % +! \gdef^^a4{\euro} +! \gdef^^a6{\v S} +! \gdef^^a8{\v s} +! \gdef^^b4{\v Z} +! \gdef^^b8{\v z} +! \gdef^^bc{\OE} +! \gdef^^bd{\oe} +! \gdef^^be{\"Y} + } + + % Latin2 (ISO-8859-2) character definitions. +! \def\lattwochardefs{% +! \gdef^^a0{\tie} +! \gdef^^a1{\ogonek{A}} +! \gdef^^a2{\u{}} +! \gdef^^a3{\L} +! \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} +! \gdef^^a5{\v L} +! \gdef^^a6{\'S} +! \gdef^^a7{\S} +! \gdef^^a8{\"{}} +! \gdef^^a9{\v S} +! \gdef^^aa{\cedilla S} +! \gdef^^ab{\v T} +! \gdef^^ac{\'Z} +! \gdef^^ad{\-} +! \gdef^^ae{\v Z} +! \gdef^^af{\dotaccent Z} +! % +! \gdef^^b0{\textdegree} +! \gdef^^b1{\ogonek{a}} +! \gdef^^b2{\ogonek{ }} +! \gdef^^b3{\l} +! \gdef^^b4{\'{}} +! \gdef^^b5{\v l} +! \gdef^^b6{\'s} +! \gdef^^b7{\v{}} +! \gdef^^b8{\cedilla\ } +! \gdef^^b9{\v s} +! \gdef^^ba{\cedilla s} +! \gdef^^bb{\v t} +! \gdef^^bc{\'z} +! \gdef^^bd{\H{}} +! \gdef^^be{\v z} +! \gdef^^bf{\dotaccent z} +! % +! \gdef^^c0{\'R} +! \gdef^^c1{\'A} +! \gdef^^c2{\^A} +! \gdef^^c3{\u A} +! \gdef^^c4{\"A} +! \gdef^^c5{\'L} +! \gdef^^c6{\'C} +! \gdef^^c7{\cedilla C} +! \gdef^^c8{\v C} +! \gdef^^c9{\'E} +! \gdef^^ca{\ogonek{E}} +! \gdef^^cb{\"E} +! \gdef^^cc{\v E} +! \gdef^^cd{\'I} +! \gdef^^ce{\^I} +! \gdef^^cf{\v D} +! % +! \gdef^^d0{\DH} +! \gdef^^d1{\'N} +! \gdef^^d2{\v N} +! \gdef^^d3{\'O} +! \gdef^^d4{\^O} +! \gdef^^d5{\H O} +! \gdef^^d6{\"O} +! \gdef^^d7{$\times$} +! \gdef^^d8{\v R} +! \gdef^^d9{\ringaccent U} +! \gdef^^da{\'U} +! \gdef^^db{\H U} +! \gdef^^dc{\"U} +! \gdef^^dd{\'Y} +! \gdef^^de{\cedilla T} +! \gdef^^df{\ss} +! % +! \gdef^^e0{\'r} +! \gdef^^e1{\'a} +! \gdef^^e2{\^a} +! \gdef^^e3{\u a} +! \gdef^^e4{\"a} +! \gdef^^e5{\'l} +! \gdef^^e6{\'c} +! \gdef^^e7{\cedilla c} +! \gdef^^e8{\v c} +! \gdef^^e9{\'e} +! \gdef^^ea{\ogonek{e}} +! \gdef^^eb{\"e} +! \gdef^^ec{\v e} +! \gdef^^ed{\'{\dotless{i}}} +! \gdef^^ee{\^{\dotless{i}}} +! \gdef^^ef{\v d} +! % +! \gdef^^f0{\dh} +! \gdef^^f1{\'n} +! \gdef^^f2{\v n} +! \gdef^^f3{\'o} +! \gdef^^f4{\^o} +! \gdef^^f5{\H o} +! \gdef^^f6{\"o} +! \gdef^^f7{$\div$} +! \gdef^^f8{\v r} +! \gdef^^f9{\ringaccent u} +! \gdef^^fa{\'u} +! \gdef^^fb{\H u} +! \gdef^^fc{\"u} +! \gdef^^fd{\'y} +! \gdef^^fe{\cedilla t} +! \gdef^^ff{\dotaccent{}} + } + + % UTF-8 character definitions. + % + % This code to support UTF-8 is based on LaTeX's utf8.def, with some +--- 10207,10514 ---- + \asciichardefs + % + \else \ifx \declaredencoding \lattwo ++ \iftxinativeunicodecapable ++ \setbytewiseio ++ \fi + \setnonasciicharscatcode\active + \lattwochardefs + % + \else \ifx \declaredencoding \latone ++ \iftxinativeunicodecapable ++ \setbytewiseio ++ \fi + \setnonasciicharscatcode\active + \latonechardefs + % + \else \ifx \declaredencoding \latnine ++ \iftxinativeunicodecapable ++ \setbytewiseio ++ \fi + \setnonasciicharscatcode\active + \latninechardefs + % + \else \ifx \declaredencoding \utfeight +! \iftxinativeunicodecapable +! % For native Unicode handling (XeTeX and LuaTeX) +! \nativeunicodechardefs +! \else +! % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX). +! % Since we already invoke \utfeightchardefs at the top level, +! % making non-ascii chars active is sufficient. +! \setnonasciicharscatcode\active +! \fi + % + \else +! \message{Ignoring unknown document encoding: #1.}% + % + \fi % utfeight + \fi % latnine + \fi % latone + \fi % lattwo + \fi % ascii ++ % ++ \ifxetex ++ \ifx \declaredencoding \utfeight ++ \else ++ \ifx \declaredencoding \ascii ++ \else ++ \message{Warning: XeTeX with non-UTF-8 encodings cannot handle % ++ non-ASCII characters in auxiliary files.}% ++ \fi ++ \fi ++ \fi + } + + % A message to be logged when using a character that isn't available + % the default font encoding (OT1). + % +! \def\missingcharmsg#1{\message{Character missing, sorry: #1.}} + + % Take account of \c (plain) vs. \, (Texinfo) difference. + \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} + +! \def\gdefchar#1#2{% +! \gdef#1{% +! \ifpassthroughchars +! \string#1% +! \else +! #2% +! \fi +! }} +! +! \begingroup +! +! % Make non-ASCII characters active for defining the character definition +! % macros. + \setnonasciicharscatcode\active +! + % Latin1 (ISO-8859-1) character definitions. +! \gdef\latonechardefs{% +! \gdefchar^^a0{\tie} +! \gdefchar^^a1{\exclamdown} +! \gdefchar^^a2{{\tcfont \char162}} % cent +! \gdefchar^^a3{\pounds{}} +! \gdefchar^^a4{{\tcfont \char164}} % currency +! \gdefchar^^a5{{\tcfont \char165}} % yen +! \gdefchar^^a6{{\tcfont \char166}} % broken bar +! \gdefchar^^a7{\S} +! \gdefchar^^a8{\"{}} +! \gdefchar^^a9{\copyright{}} +! \gdefchar^^aa{\ordf} +! \gdefchar^^ab{\guillemetleft{}} +! \gdefchar^^ac{\ensuremath\lnot} +! \gdefchar^^ad{\-} +! \gdefchar^^ae{\registeredsymbol{}} +! \gdefchar^^af{\={}} +! % +! \gdefchar^^b0{\textdegree} +! \gdefchar^^b1{$\pm$} +! \gdefchar^^b2{$^2$} +! \gdefchar^^b3{$^3$} +! \gdefchar^^b4{\'{}} +! \gdefchar^^b5{$\mu$} +! \gdefchar^^b6{\P} +! \gdefchar^^b7{\ensuremath\cdot} +! \gdefchar^^b8{\cedilla\ } +! \gdefchar^^b9{$^1$} +! \gdefchar^^ba{\ordm} +! \gdefchar^^bb{\guillemetright{}} +! \gdefchar^^bc{$1\over4$} +! \gdefchar^^bd{$1\over2$} +! \gdefchar^^be{$3\over4$} +! \gdefchar^^bf{\questiondown} +! % +! \gdefchar^^c0{\`A} +! \gdefchar^^c1{\'A} +! \gdefchar^^c2{\^A} +! \gdefchar^^c3{\~A} +! \gdefchar^^c4{\"A} +! \gdefchar^^c5{\ringaccent A} +! \gdefchar^^c6{\AE} +! \gdefchar^^c7{\cedilla C} +! \gdefchar^^c8{\`E} +! \gdefchar^^c9{\'E} +! \gdefchar^^ca{\^E} +! \gdefchar^^cb{\"E} +! \gdefchar^^cc{\`I} +! \gdefchar^^cd{\'I} +! \gdefchar^^ce{\^I} +! \gdefchar^^cf{\"I} +! % +! \gdefchar^^d0{\DH} +! \gdefchar^^d1{\~N} +! \gdefchar^^d2{\`O} +! \gdefchar^^d3{\'O} +! \gdefchar^^d4{\^O} +! \gdefchar^^d5{\~O} +! \gdefchar^^d6{\"O} +! \gdefchar^^d7{$\times$} +! \gdefchar^^d8{\O} +! \gdefchar^^d9{\`U} +! \gdefchar^^da{\'U} +! \gdefchar^^db{\^U} +! \gdefchar^^dc{\"U} +! \gdefchar^^dd{\'Y} +! \gdefchar^^de{\TH} +! \gdefchar^^df{\ss} +! % +! \gdefchar^^e0{\`a} +! \gdefchar^^e1{\'a} +! \gdefchar^^e2{\^a} +! \gdefchar^^e3{\~a} +! \gdefchar^^e4{\"a} +! \gdefchar^^e5{\ringaccent a} +! \gdefchar^^e6{\ae} +! \gdefchar^^e7{\cedilla c} +! \gdefchar^^e8{\`e} +! \gdefchar^^e9{\'e} +! \gdefchar^^ea{\^e} +! \gdefchar^^eb{\"e} +! \gdefchar^^ec{\`{\dotless i}} +! \gdefchar^^ed{\'{\dotless i}} +! \gdefchar^^ee{\^{\dotless i}} +! \gdefchar^^ef{\"{\dotless i}} +! % +! \gdefchar^^f0{\dh} +! \gdefchar^^f1{\~n} +! \gdefchar^^f2{\`o} +! \gdefchar^^f3{\'o} +! \gdefchar^^f4{\^o} +! \gdefchar^^f5{\~o} +! \gdefchar^^f6{\"o} +! \gdefchar^^f7{$\div$} +! \gdefchar^^f8{\o} +! \gdefchar^^f9{\`u} +! \gdefchar^^fa{\'u} +! \gdefchar^^fb{\^u} +! \gdefchar^^fc{\"u} +! \gdefchar^^fd{\'y} +! \gdefchar^^fe{\th} +! \gdefchar^^ff{\"y} + } + + % Latin9 (ISO-8859-15) encoding character definitions. +! \gdef\latninechardefs{% + % Encoding is almost identical to Latin1. + \latonechardefs + % +! \gdefchar^^a4{\euro{}} +! \gdefchar^^a6{\v S} +! \gdefchar^^a8{\v s} +! \gdefchar^^b4{\v Z} +! \gdefchar^^b8{\v z} +! \gdefchar^^bc{\OE} +! \gdefchar^^bd{\oe} +! \gdefchar^^be{\"Y} + } + + % Latin2 (ISO-8859-2) character definitions. +! \gdef\lattwochardefs{% +! \gdefchar^^a0{\tie} +! \gdefchar^^a1{\ogonek{A}} +! \gdefchar^^a2{\u{}} +! \gdefchar^^a3{\L} +! \gdefchar^^a4{\missingcharmsg{CURRENCY SIGN}} +! \gdefchar^^a5{\v L} +! \gdefchar^^a6{\'S} +! \gdefchar^^a7{\S} +! \gdefchar^^a8{\"{}} +! \gdefchar^^a9{\v S} +! \gdefchar^^aa{\cedilla S} +! \gdefchar^^ab{\v T} +! \gdefchar^^ac{\'Z} +! \gdefchar^^ad{\-} +! \gdefchar^^ae{\v Z} +! \gdefchar^^af{\dotaccent Z} +! % +! \gdefchar^^b0{\textdegree} +! \gdefchar^^b1{\ogonek{a}} +! \gdefchar^^b2{\ogonek{ }} +! \gdefchar^^b3{\l} +! \gdefchar^^b4{\'{}} +! \gdefchar^^b5{\v l} +! \gdefchar^^b6{\'s} +! \gdefchar^^b7{\v{}} +! \gdefchar^^b8{\cedilla\ } +! \gdefchar^^b9{\v s} +! \gdefchar^^ba{\cedilla s} +! \gdefchar^^bb{\v t} +! \gdefchar^^bc{\'z} +! \gdefchar^^bd{\H{}} +! \gdefchar^^be{\v z} +! \gdefchar^^bf{\dotaccent z} +! % +! \gdefchar^^c0{\'R} +! \gdefchar^^c1{\'A} +! \gdefchar^^c2{\^A} +! \gdefchar^^c3{\u A} +! \gdefchar^^c4{\"A} +! \gdefchar^^c5{\'L} +! \gdefchar^^c6{\'C} +! \gdefchar^^c7{\cedilla C} +! \gdefchar^^c8{\v C} +! \gdefchar^^c9{\'E} +! \gdefchar^^ca{\ogonek{E}} +! \gdefchar^^cb{\"E} +! \gdefchar^^cc{\v E} +! \gdefchar^^cd{\'I} +! \gdefchar^^ce{\^I} +! \gdefchar^^cf{\v D} +! % +! \gdefchar^^d0{\DH} +! \gdefchar^^d1{\'N} +! \gdefchar^^d2{\v N} +! \gdefchar^^d3{\'O} +! \gdefchar^^d4{\^O} +! \gdefchar^^d5{\H O} +! \gdefchar^^d6{\"O} +! \gdefchar^^d7{$\times$} +! \gdefchar^^d8{\v R} +! \gdefchar^^d9{\ringaccent U} +! \gdefchar^^da{\'U} +! \gdefchar^^db{\H U} +! \gdefchar^^dc{\"U} +! \gdefchar^^dd{\'Y} +! \gdefchar^^de{\cedilla T} +! \gdefchar^^df{\ss} +! % +! \gdefchar^^e0{\'r} +! \gdefchar^^e1{\'a} +! \gdefchar^^e2{\^a} +! \gdefchar^^e3{\u a} +! \gdefchar^^e4{\"a} +! \gdefchar^^e5{\'l} +! \gdefchar^^e6{\'c} +! \gdefchar^^e7{\cedilla c} +! \gdefchar^^e8{\v c} +! \gdefchar^^e9{\'e} +! \gdefchar^^ea{\ogonek{e}} +! \gdefchar^^eb{\"e} +! \gdefchar^^ec{\v e} +! \gdefchar^^ed{\'{\dotless{i}}} +! \gdefchar^^ee{\^{\dotless{i}}} +! \gdefchar^^ef{\v d} +! % +! \gdefchar^^f0{\dh} +! \gdefchar^^f1{\'n} +! \gdefchar^^f2{\v n} +! \gdefchar^^f3{\'o} +! \gdefchar^^f4{\^o} +! \gdefchar^^f5{\H o} +! \gdefchar^^f6{\"o} +! \gdefchar^^f7{$\div$} +! \gdefchar^^f8{\v r} +! \gdefchar^^f9{\ringaccent u} +! \gdefchar^^fa{\'u} +! \gdefchar^^fb{\H u} +! \gdefchar^^fc{\"u} +! \gdefchar^^fd{\'y} +! \gdefchar^^fe{\cedilla t} +! \gdefchar^^ff{\dotaccent{}} + } + ++ \endgroup % active chars ++ + % UTF-8 character definitions. + % + % This code to support UTF-8 is based on LaTeX's utf8.def, with some +*************** +*** 9154,9197 **** + + \gdef\UTFviiiDefined#1{% + \ifx #1\relax +! \message{\linenumber Unicode char \string #1 not defined for Texinfo}% + \else + \expandafter #1% + \fi + } + + \begingroup + \catcode`\~13 + \catcode`\"12 + +! \def\UTFviiiLoop{% +! \global\catcode\countUTFx\active + \uccode`\~\countUTFx + \uppercase\expandafter{\UTFviiiTmp}% + \advance\countUTFx by 1 + \ifnum\countUTFx < \countUTFy + \expandafter\UTFviiiLoop + \fi} + + \countUTFx = "C2 + \countUTFy = "E0 + \def\UTFviiiTmp{% +! \xdef~{\noexpand\UTFviiiTwoOctets\string~}} + \UTFviiiLoop + + \countUTFx = "E0 + \countUTFy = "F0 + \def\UTFviiiTmp{% +! \xdef~{\noexpand\UTFviiiThreeOctets\string~}} + \UTFviiiLoop + + \countUTFx = "F0 + \countUTFy = "F4 + \def\UTFviiiTmp{% +! \xdef~{\noexpand\UTFviiiFourOctets\string~}} + \UTFviiiLoop + \endgroup + + \begingroup + \catcode`\"=12 + \catcode`\<=12 +--- 10530,10672 ---- + + \gdef\UTFviiiDefined#1{% + \ifx #1\relax +! \ifutfviiidefinedwarning +! \message{\linenumber Unicode char \string #1 not defined for Texinfo}% +! \fi + \else + \expandafter #1% + \fi + } ++ \newif\ifutfviiidefinedwarning ++ \utfviiidefinedwarningtrue + ++ % Give non-ASCII bytes the active definitions for processing UTF-8 sequences + \begingroup + \catcode`\~13 ++ \catcode`\$12 + \catcode`\"12 + +! % Loop from \countUTFx to \countUTFy, performing \UTFviiiTmp +! % substituting ~ and $ with a character token of that value. +! \gdef\UTFviiiLoop{% +! \catcode\countUTFx\active + \uccode`\~\countUTFx ++ \uccode`\$\countUTFx + \uppercase\expandafter{\UTFviiiTmp}% + \advance\countUTFx by 1 + \ifnum\countUTFx < \countUTFy + \expandafter\UTFviiiLoop + \fi} ++ % ++ % For bytes other than the first in a UTF-8 sequence. Not expected to ++ % be expanded except when writing to auxiliary files. ++ \countUTFx = "80 ++ \countUTFy = "C2 ++ \def\UTFviiiTmp{% ++ \gdef~{% ++ \ifpassthroughchars $\fi}}% ++ \UTFviiiLoop + + \countUTFx = "C2 + \countUTFy = "E0 + \def\UTFviiiTmp{% +! \gdef~{% +! \ifpassthroughchars $% +! \else\expandafter\UTFviiiTwoOctets\expandafter$\fi}}% + \UTFviiiLoop + + \countUTFx = "E0 + \countUTFy = "F0 + \def\UTFviiiTmp{% +! \gdef~{% +! \ifpassthroughchars $% +! \else\expandafter\UTFviiiThreeOctets\expandafter$\fi}}% + \UTFviiiLoop + + \countUTFx = "F0 + \countUTFy = "F4 + \def\UTFviiiTmp{% +! \gdef~{% +! \ifpassthroughchars $% +! \else\expandafter\UTFviiiFourOctets\expandafter$\fi +! }}% + \UTFviiiLoop ++ % ++ % for pdftex only, used to expand ASCII to UTF-16BE. ++ \gdef\asciitounicode{% ++ \countUTFx = "20 ++ \countUTFy = "80 ++ \def\UTFviiiTmp{% ++ \def~{\nullbyte $}}% ++ \UTFviiiLoop ++ } ++ {\catcode0=11 \gdef\nullbyte{^^00}}% + \endgroup + ++ \def\globallet{\global\let} % save some \expandafter's below ++ ++ % @U{xxxx} to produce U+xxxx, if we support it. ++ \def\U#1{% ++ \expandafter\ifx\csname uni:#1\endcsname \relax ++ \iftxinativeunicodecapable ++ % All Unicode characters can be used if native Unicode handling is ++ % active. However, if the font does not have the glyph, ++ % letters are missing. ++ \begingroup ++ \uccode`\.="#1\relax ++ \uppercase{.} ++ \endgroup ++ \else ++ \errhelp = \EMsimple ++ \errmessage{Unicode character U+#1 not supported, sorry}% ++ \fi ++ \else ++ \csname uni:#1\endcsname ++ \fi ++ } ++ ++ % These macros are used here to construct the names of macros ++ % that expand to the definitions for UTF-8 sequences. ++ \def\UTFviiiTwoOctetsName#1#2{% ++ \csname u8:#1\string #2\endcsname}% ++ \def\UTFviiiThreeOctetsName#1#2#3{% ++ \csname u8:#1\string #2\string #3\endcsname}% ++ \def\UTFviiiFourOctetsName#1#2#3#4{% ++ \csname u8:#1\string #2\string #3\string #4\endcsname}% ++ ++ % generate UTF-16 from codepoint ++ \def\utfsixteentotoks#1#2{% ++ \countUTFz = "#2\relax ++ \ifnum \countUTFz > 65535 ++ % doesn't work for codepoints > U+FFFF ++ % we don't define glyphs for any of these anyway, so it doesn't matter ++ #1={U+#2}% ++ \else ++ \countUTFx = \countUTFz ++ \divide\countUTFx by 256 ++ \countUTFy = \countUTFx ++ \multiply\countUTFx by 256 ++ \advance\countUTFz by -\countUTFx ++ \uccode`,=\countUTFy ++ \uccode`;=\countUTFz ++ \ifnum\countUTFy = 0 ++ \uppercase{#1={\nullbyte\string;}}% ++ \else\ifnum\countUTFz = 0 ++ \uppercase{#1={\string,\nullbyte}}% ++ \else ++ \uppercase{#1={\string,\string;}}% ++ \fi\fi ++ % NB \uppercase cannot insert a null byte ++ \fi ++ } ++ ++ \newif\ifutfbytespdf ++ \utfbytespdffalse ++ ++ % For UTF-8 byte sequences (TeX, e-TeX and pdfTeX), ++ % provide a definition macro to replace a Unicode character; ++ % this gets used by the @U command ++ % + \begingroup + \catcode`\"=12 + \catcode`\<=12 +*************** +*** 9200,9663 **** + \catcode`\;=12 + \catcode`\!=12 + \catcode`\~=13 +! +! \gdef\DeclareUnicodeCharacter#1#2{% + \countUTFz = "#1\relax +- %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% + \begingroup + \parseXMLCharref +! \def\UTFviiiTwoOctets##1##2{% +! \csname u8:##1\string ##2\endcsname}% +! \def\UTFviiiThreeOctets##1##2##3{% +! \csname u8:##1\string ##2\string ##3\endcsname}% +! \def\UTFviiiFourOctets##1##2##3##4{% +! \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% +! \expandafter\expandafter\expandafter\expandafter +! \expandafter\expandafter\expandafter +! \gdef\UTFviiiTmp{#2}% + \endgroup} +! + \gdef\parseXMLCharref{% +! \ifnum\countUTFz < "A0\relax + \errhelp = \EMsimple +! \errmessage{Cannot define Unicode char value < 00A0}% + \else\ifnum\countUTFz < "800\relax + \parseUTFviiiA,% +! \parseUTFviiiB C\UTFviiiTwoOctets.,% + \else\ifnum\countUTFz < "10000\relax + \parseUTFviiiA;% + \parseUTFviiiA,% +! \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% + \else + \parseUTFviiiA;% + \parseUTFviiiA,% + \parseUTFviiiA!% +! \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% + \fi\fi\fi + } + + \gdef\parseUTFviiiA#1{% + \countUTFx = \countUTFz + \divide\countUTFz by 64 +! \countUTFy = \countUTFz + \multiply\countUTFz by 64 + \advance\countUTFx by -\countUTFz + \advance\countUTFx by 128 + \uccode `#1\countUTFx + \countUTFz = \countUTFy} + + \gdef\parseUTFviiiB#1#2#3#4{% + \advance\countUTFz by "#10\relax + \uccode `#3\countUTFz + \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} + \endgroup + + \def\utfeightchardefs{% +! \DeclareUnicodeCharacter{00A0}{\tie} +! \DeclareUnicodeCharacter{00A1}{\exclamdown} +! \DeclareUnicodeCharacter{00A3}{\pounds} +! \DeclareUnicodeCharacter{00A8}{\"{ }} +! \DeclareUnicodeCharacter{00A9}{\copyright} +! \DeclareUnicodeCharacter{00AA}{\ordf} +! \DeclareUnicodeCharacter{00AB}{\guillemetleft} +! \DeclareUnicodeCharacter{00AD}{\-} +! \DeclareUnicodeCharacter{00AE}{\registeredsymbol} +! \DeclareUnicodeCharacter{00AF}{\={ }} +! +! \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} +! \DeclareUnicodeCharacter{00B4}{\'{ }} +! \DeclareUnicodeCharacter{00B8}{\cedilla{ }} +! \DeclareUnicodeCharacter{00BA}{\ordm} +! \DeclareUnicodeCharacter{00BB}{\guillemetright} +! \DeclareUnicodeCharacter{00BF}{\questiondown} +! +! \DeclareUnicodeCharacter{00C0}{\`A} +! \DeclareUnicodeCharacter{00C1}{\'A} +! \DeclareUnicodeCharacter{00C2}{\^A} +! \DeclareUnicodeCharacter{00C3}{\~A} +! \DeclareUnicodeCharacter{00C4}{\"A} +! \DeclareUnicodeCharacter{00C5}{\AA} +! \DeclareUnicodeCharacter{00C6}{\AE} +! \DeclareUnicodeCharacter{00C7}{\cedilla{C}} +! \DeclareUnicodeCharacter{00C8}{\`E} +! \DeclareUnicodeCharacter{00C9}{\'E} +! \DeclareUnicodeCharacter{00CA}{\^E} +! \DeclareUnicodeCharacter{00CB}{\"E} +! \DeclareUnicodeCharacter{00CC}{\`I} +! \DeclareUnicodeCharacter{00CD}{\'I} +! \DeclareUnicodeCharacter{00CE}{\^I} +! \DeclareUnicodeCharacter{00CF}{\"I} +! +! \DeclareUnicodeCharacter{00D0}{\DH} +! \DeclareUnicodeCharacter{00D1}{\~N} +! \DeclareUnicodeCharacter{00D2}{\`O} +! \DeclareUnicodeCharacter{00D3}{\'O} +! \DeclareUnicodeCharacter{00D4}{\^O} +! \DeclareUnicodeCharacter{00D5}{\~O} +! \DeclareUnicodeCharacter{00D6}{\"O} +! \DeclareUnicodeCharacter{00D8}{\O} +! \DeclareUnicodeCharacter{00D9}{\`U} +! \DeclareUnicodeCharacter{00DA}{\'U} +! \DeclareUnicodeCharacter{00DB}{\^U} +! \DeclareUnicodeCharacter{00DC}{\"U} +! \DeclareUnicodeCharacter{00DD}{\'Y} +! \DeclareUnicodeCharacter{00DE}{\TH} +! \DeclareUnicodeCharacter{00DF}{\ss} +! +! \DeclareUnicodeCharacter{00E0}{\`a} +! \DeclareUnicodeCharacter{00E1}{\'a} +! \DeclareUnicodeCharacter{00E2}{\^a} +! \DeclareUnicodeCharacter{00E3}{\~a} +! \DeclareUnicodeCharacter{00E4}{\"a} +! \DeclareUnicodeCharacter{00E5}{\aa} +! \DeclareUnicodeCharacter{00E6}{\ae} +! \DeclareUnicodeCharacter{00E7}{\cedilla{c}} +! \DeclareUnicodeCharacter{00E8}{\`e} +! \DeclareUnicodeCharacter{00E9}{\'e} +! \DeclareUnicodeCharacter{00EA}{\^e} +! \DeclareUnicodeCharacter{00EB}{\"e} +! \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} +! \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} +! \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} +! \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} +! +! \DeclareUnicodeCharacter{00F0}{\dh} +! \DeclareUnicodeCharacter{00F1}{\~n} +! \DeclareUnicodeCharacter{00F2}{\`o} +! \DeclareUnicodeCharacter{00F3}{\'o} +! \DeclareUnicodeCharacter{00F4}{\^o} +! \DeclareUnicodeCharacter{00F5}{\~o} +! \DeclareUnicodeCharacter{00F6}{\"o} +! \DeclareUnicodeCharacter{00F8}{\o} +! \DeclareUnicodeCharacter{00F9}{\`u} +! \DeclareUnicodeCharacter{00FA}{\'u} +! \DeclareUnicodeCharacter{00FB}{\^u} +! \DeclareUnicodeCharacter{00FC}{\"u} +! \DeclareUnicodeCharacter{00FD}{\'y} +! \DeclareUnicodeCharacter{00FE}{\th} +! \DeclareUnicodeCharacter{00FF}{\"y} +! +! \DeclareUnicodeCharacter{0100}{\=A} +! \DeclareUnicodeCharacter{0101}{\=a} +! \DeclareUnicodeCharacter{0102}{\u{A}} +! \DeclareUnicodeCharacter{0103}{\u{a}} +! \DeclareUnicodeCharacter{0104}{\ogonek{A}} +! \DeclareUnicodeCharacter{0105}{\ogonek{a}} +! \DeclareUnicodeCharacter{0106}{\'C} +! \DeclareUnicodeCharacter{0107}{\'c} +! \DeclareUnicodeCharacter{0108}{\^C} +! \DeclareUnicodeCharacter{0109}{\^c} +! \DeclareUnicodeCharacter{0118}{\ogonek{E}} +! \DeclareUnicodeCharacter{0119}{\ogonek{e}} +! \DeclareUnicodeCharacter{010A}{\dotaccent{C}} +! \DeclareUnicodeCharacter{010B}{\dotaccent{c}} +! \DeclareUnicodeCharacter{010C}{\v{C}} +! \DeclareUnicodeCharacter{010D}{\v{c}} +! \DeclareUnicodeCharacter{010E}{\v{D}} +! +! \DeclareUnicodeCharacter{0112}{\=E} +! \DeclareUnicodeCharacter{0113}{\=e} +! \DeclareUnicodeCharacter{0114}{\u{E}} +! \DeclareUnicodeCharacter{0115}{\u{e}} +! \DeclareUnicodeCharacter{0116}{\dotaccent{E}} +! \DeclareUnicodeCharacter{0117}{\dotaccent{e}} +! \DeclareUnicodeCharacter{011A}{\v{E}} +! \DeclareUnicodeCharacter{011B}{\v{e}} +! \DeclareUnicodeCharacter{011C}{\^G} +! \DeclareUnicodeCharacter{011D}{\^g} +! \DeclareUnicodeCharacter{011E}{\u{G}} +! \DeclareUnicodeCharacter{011F}{\u{g}} +! +! \DeclareUnicodeCharacter{0120}{\dotaccent{G}} +! \DeclareUnicodeCharacter{0121}{\dotaccent{g}} +! \DeclareUnicodeCharacter{0124}{\^H} +! \DeclareUnicodeCharacter{0125}{\^h} +! \DeclareUnicodeCharacter{0128}{\~I} +! \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} +! \DeclareUnicodeCharacter{012A}{\=I} +! \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} +! \DeclareUnicodeCharacter{012C}{\u{I}} +! \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} +! +! \DeclareUnicodeCharacter{0130}{\dotaccent{I}} +! \DeclareUnicodeCharacter{0131}{\dotless{i}} +! \DeclareUnicodeCharacter{0132}{IJ} +! \DeclareUnicodeCharacter{0133}{ij} +! \DeclareUnicodeCharacter{0134}{\^J} +! \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} +! \DeclareUnicodeCharacter{0139}{\'L} +! \DeclareUnicodeCharacter{013A}{\'l} +! +! \DeclareUnicodeCharacter{0141}{\L} +! \DeclareUnicodeCharacter{0142}{\l} +! \DeclareUnicodeCharacter{0143}{\'N} +! \DeclareUnicodeCharacter{0144}{\'n} +! \DeclareUnicodeCharacter{0147}{\v{N}} +! \DeclareUnicodeCharacter{0148}{\v{n}} +! \DeclareUnicodeCharacter{014C}{\=O} +! \DeclareUnicodeCharacter{014D}{\=o} +! \DeclareUnicodeCharacter{014E}{\u{O}} +! \DeclareUnicodeCharacter{014F}{\u{o}} +! +! \DeclareUnicodeCharacter{0150}{\H{O}} +! \DeclareUnicodeCharacter{0151}{\H{o}} +! \DeclareUnicodeCharacter{0152}{\OE} +! \DeclareUnicodeCharacter{0153}{\oe} +! \DeclareUnicodeCharacter{0154}{\'R} +! \DeclareUnicodeCharacter{0155}{\'r} +! \DeclareUnicodeCharacter{0158}{\v{R}} +! \DeclareUnicodeCharacter{0159}{\v{r}} +! \DeclareUnicodeCharacter{015A}{\'S} +! \DeclareUnicodeCharacter{015B}{\'s} +! \DeclareUnicodeCharacter{015C}{\^S} +! \DeclareUnicodeCharacter{015D}{\^s} +! \DeclareUnicodeCharacter{015E}{\cedilla{S}} +! \DeclareUnicodeCharacter{015F}{\cedilla{s}} +! +! \DeclareUnicodeCharacter{0160}{\v{S}} +! \DeclareUnicodeCharacter{0161}{\v{s}} +! \DeclareUnicodeCharacter{0162}{\cedilla{t}} +! \DeclareUnicodeCharacter{0163}{\cedilla{T}} +! \DeclareUnicodeCharacter{0164}{\v{T}} +! +! \DeclareUnicodeCharacter{0168}{\~U} +! \DeclareUnicodeCharacter{0169}{\~u} +! \DeclareUnicodeCharacter{016A}{\=U} +! \DeclareUnicodeCharacter{016B}{\=u} +! \DeclareUnicodeCharacter{016C}{\u{U}} +! \DeclareUnicodeCharacter{016D}{\u{u}} +! \DeclareUnicodeCharacter{016E}{\ringaccent{U}} +! \DeclareUnicodeCharacter{016F}{\ringaccent{u}} +! +! \DeclareUnicodeCharacter{0170}{\H{U}} +! \DeclareUnicodeCharacter{0171}{\H{u}} +! \DeclareUnicodeCharacter{0174}{\^W} +! \DeclareUnicodeCharacter{0175}{\^w} +! \DeclareUnicodeCharacter{0176}{\^Y} +! \DeclareUnicodeCharacter{0177}{\^y} +! \DeclareUnicodeCharacter{0178}{\"Y} +! \DeclareUnicodeCharacter{0179}{\'Z} +! \DeclareUnicodeCharacter{017A}{\'z} +! \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} +! \DeclareUnicodeCharacter{017C}{\dotaccent{z}} +! \DeclareUnicodeCharacter{017D}{\v{Z}} +! \DeclareUnicodeCharacter{017E}{\v{z}} +! +! \DeclareUnicodeCharacter{01C4}{D\v{Z}} +! \DeclareUnicodeCharacter{01C5}{D\v{z}} +! \DeclareUnicodeCharacter{01C6}{d\v{z}} +! \DeclareUnicodeCharacter{01C7}{LJ} +! \DeclareUnicodeCharacter{01C8}{Lj} +! \DeclareUnicodeCharacter{01C9}{lj} +! \DeclareUnicodeCharacter{01CA}{NJ} +! \DeclareUnicodeCharacter{01CB}{Nj} +! \DeclareUnicodeCharacter{01CC}{nj} +! \DeclareUnicodeCharacter{01CD}{\v{A}} +! \DeclareUnicodeCharacter{01CE}{\v{a}} +! \DeclareUnicodeCharacter{01CF}{\v{I}} +! +! \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} +! \DeclareUnicodeCharacter{01D1}{\v{O}} +! \DeclareUnicodeCharacter{01D2}{\v{o}} +! \DeclareUnicodeCharacter{01D3}{\v{U}} +! \DeclareUnicodeCharacter{01D4}{\v{u}} +! +! \DeclareUnicodeCharacter{01E2}{\={\AE}} +! \DeclareUnicodeCharacter{01E3}{\={\ae}} +! \DeclareUnicodeCharacter{01E6}{\v{G}} +! \DeclareUnicodeCharacter{01E7}{\v{g}} +! \DeclareUnicodeCharacter{01E8}{\v{K}} +! \DeclareUnicodeCharacter{01E9}{\v{k}} +! +! \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} +! \DeclareUnicodeCharacter{01F1}{DZ} +! \DeclareUnicodeCharacter{01F2}{Dz} +! \DeclareUnicodeCharacter{01F3}{dz} +! \DeclareUnicodeCharacter{01F4}{\'G} +! \DeclareUnicodeCharacter{01F5}{\'g} +! \DeclareUnicodeCharacter{01F8}{\`N} +! \DeclareUnicodeCharacter{01F9}{\`n} +! \DeclareUnicodeCharacter{01FC}{\'{\AE}} +! \DeclareUnicodeCharacter{01FD}{\'{\ae}} +! \DeclareUnicodeCharacter{01FE}{\'{\O}} +! \DeclareUnicodeCharacter{01FF}{\'{\o}} +! +! \DeclareUnicodeCharacter{021E}{\v{H}} +! \DeclareUnicodeCharacter{021F}{\v{h}} +! +! \DeclareUnicodeCharacter{0226}{\dotaccent{A}} +! \DeclareUnicodeCharacter{0227}{\dotaccent{a}} +! \DeclareUnicodeCharacter{0228}{\cedilla{E}} +! \DeclareUnicodeCharacter{0229}{\cedilla{e}} +! \DeclareUnicodeCharacter{022E}{\dotaccent{O}} +! \DeclareUnicodeCharacter{022F}{\dotaccent{o}} +! +! \DeclareUnicodeCharacter{0232}{\=Y} +! \DeclareUnicodeCharacter{0233}{\=y} +! \DeclareUnicodeCharacter{0237}{\dotless{j}} +! +! \DeclareUnicodeCharacter{02DB}{\ogonek{ }} +! +! \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} +! \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} +! \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} +! \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} +! \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} +! \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} +! \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} +! \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} +! \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} +! \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} +! \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} +! \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} +! +! \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} +! \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} +! +! \DeclareUnicodeCharacter{1E20}{\=G} +! \DeclareUnicodeCharacter{1E21}{\=g} +! \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} +! \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} +! \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} +! \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} +! \DeclareUnicodeCharacter{1E26}{\"H} +! \DeclareUnicodeCharacter{1E27}{\"h} +! +! \DeclareUnicodeCharacter{1E30}{\'K} +! \DeclareUnicodeCharacter{1E31}{\'k} +! \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} +! \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} +! \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} +! \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} +! \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} +! \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} +! \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} +! \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} +! \DeclareUnicodeCharacter{1E3E}{\'M} +! \DeclareUnicodeCharacter{1E3F}{\'m} +! +! \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} +! \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} +! \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} +! \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} +! \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} +! \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} +! \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} +! \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} +! \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} +! \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} +! +! \DeclareUnicodeCharacter{1E54}{\'P} +! \DeclareUnicodeCharacter{1E55}{\'p} +! \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} +! \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} +! \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} +! \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} +! \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} +! \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} +! \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} +! \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} +! +! \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} +! \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} +! \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} +! \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} +! \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} +! \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} +! \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} +! \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} +! \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} +! \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} +! +! \DeclareUnicodeCharacter{1E7C}{\~V} +! \DeclareUnicodeCharacter{1E7D}{\~v} +! \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} +! \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} +! +! \DeclareUnicodeCharacter{1E80}{\`W} +! \DeclareUnicodeCharacter{1E81}{\`w} +! \DeclareUnicodeCharacter{1E82}{\'W} +! \DeclareUnicodeCharacter{1E83}{\'w} +! \DeclareUnicodeCharacter{1E84}{\"W} +! \DeclareUnicodeCharacter{1E85}{\"w} +! \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} +! \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} +! \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} +! \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} +! \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} +! \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} +! \DeclareUnicodeCharacter{1E8C}{\"X} +! \DeclareUnicodeCharacter{1E8D}{\"x} +! \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} +! \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} +! +! \DeclareUnicodeCharacter{1E90}{\^Z} +! \DeclareUnicodeCharacter{1E91}{\^z} +! \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} +! \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} +! \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} +! \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} +! \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} +! \DeclareUnicodeCharacter{1E97}{\"t} +! \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} +! \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} +! +! \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} +! \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} +! +! \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} +! \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} +! \DeclareUnicodeCharacter{1EBC}{\~E} +! \DeclareUnicodeCharacter{1EBD}{\~e} +! +! \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} +! \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} +! \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} +! \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} +! +! \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} +! \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} +! +! \DeclareUnicodeCharacter{1EF2}{\`Y} +! \DeclareUnicodeCharacter{1EF3}{\`y} +! \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} +! +! \DeclareUnicodeCharacter{1EF8}{\~Y} +! \DeclareUnicodeCharacter{1EF9}{\~y} +! +! \DeclareUnicodeCharacter{2013}{--} +! \DeclareUnicodeCharacter{2014}{---} +! \DeclareUnicodeCharacter{2018}{\quoteleft} +! \DeclareUnicodeCharacter{2019}{\quoteright} +! \DeclareUnicodeCharacter{201A}{\quotesinglbase} +! \DeclareUnicodeCharacter{201C}{\quotedblleft} +! \DeclareUnicodeCharacter{201D}{\quotedblright} +! \DeclareUnicodeCharacter{201E}{\quotedblbase} +! \DeclareUnicodeCharacter{2022}{\bullet} +! \DeclareUnicodeCharacter{2026}{\dots} +! \DeclareUnicodeCharacter{2039}{\guilsinglleft} +! \DeclareUnicodeCharacter{203A}{\guilsinglright} +! \DeclareUnicodeCharacter{20AC}{\euro} +! +! \DeclareUnicodeCharacter{2192}{\expansion} +! \DeclareUnicodeCharacter{21D2}{\result} +! +! \DeclareUnicodeCharacter{2212}{\minus} +! \DeclareUnicodeCharacter{2217}{\point} +! \DeclareUnicodeCharacter{2261}{\equiv} +! }% end of \utfeightchardefs + + + % US-ASCII character definitions. + \def\asciichardefs{% nothing need be done + \relax + } + +! % Make non-ASCII characters printable again for compatibility with +! % existing Texinfo documents that may use them, even without declaring a +! % document encoding. +! % +! \setnonasciicharscatcode \other + + + \message{formatting,} +--- 10675,11649 ---- + \catcode`\;=12 + \catcode`\!=12 + \catcode`\~=13 +! \gdef\DeclareUnicodeCharacterUTFviii#1#2{% + \countUTFz = "#1\relax + \begingroup + \parseXMLCharref +! % +! % Completely expand \UTFviiiTmp, which looks like: +! % 1. \UTFviiTwoOctetsName B1 B2 +! % 2. \csname u8:B1 \string B2 \endcsname +! % 3. \u8: B1 B2 (a single control sequence token) +! \xdef\UTFviiiTmp{\UTFviiiTmp}% +! % +! \ifpdf +! \toksA={#2}% +! \utfsixteentotoks\toksB{#1}% +! \expandafter\xdef\UTFviiiTmp{% +! \noexpand\ifutfbytespdf\noexpand\utfbytes{\the\toksB}% +! \noexpand\else\the\toksA\noexpand\fi}% +! \else +! \expandafter\gdef\UTFviiiTmp{#2}% +! \fi +! % +! \expandafter\ifx\csname uni:#1\endcsname \relax \else +! \message{Internal error, already defined: #1}% +! \fi +! % +! % define an additional control sequence for this code point. +! \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp + \endgroup} +! % +! % Given the value in \countUTFz as a Unicode code point, set +! % \UTFviiiTmp to one of the \UTVviii*OctetsName macros followed by +! % the corresponding UTF-8 sequence. + \gdef\parseXMLCharref{% +! \ifnum\countUTFz < "20\relax + \errhelp = \EMsimple +! \errmessage{Cannot define Unicode char value < 0020}% + \else\ifnum\countUTFz < "800\relax + \parseUTFviiiA,% +! \parseUTFviiiB C\UTFviiiTwoOctetsName.,% + \else\ifnum\countUTFz < "10000\relax + \parseUTFviiiA;% + \parseUTFviiiA,% +! \parseUTFviiiB E\UTFviiiThreeOctetsName.{,;}% + \else + \parseUTFviiiA;% + \parseUTFviiiA,% + \parseUTFviiiA!% +! \parseUTFviiiB F\UTFviiiFourOctetsName.{!,;}% + \fi\fi\fi + } + ++ % Extract a byte from the end of the UTF-8 representation of \countUTFx. ++ % It must be a non-initial byte in the sequence. ++ % Change \uccode of #1 for it to be used in \parseUTFviiiB as one ++ % of the bytes. + \gdef\parseUTFviiiA#1{% + \countUTFx = \countUTFz + \divide\countUTFz by 64 +! \countUTFy = \countUTFz % Save to be the future value of \countUTFz. + \multiply\countUTFz by 64 ++ ++ % \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract ++ % in order to get the last five bits. + \advance\countUTFx by -\countUTFz ++ ++ % Convert this to the byte in the UTF-8 sequence. + \advance\countUTFx by 128 + \uccode `#1\countUTFx + \countUTFz = \countUTFy} + ++ % Used to put a UTF-8 byte sequence into \UTFviiiTmp ++ % #1 is the increment for \countUTFz to yield a the first byte of the UTF-8 ++ % sequence. ++ % #2 is one of the \UTFviii*OctetsName macros. ++ % #3 is always a full stop (.) ++ % #4 is a template for the other bytes in the sequence. The values for these ++ % bytes is substituted in here with \uppercase using the \uccode's. + \gdef\parseUTFviiiB#1#2#3#4{% + \advance\countUTFz by "#10\relax + \uccode `#3\countUTFz + \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} + \endgroup + ++ % For native Unicode handling (XeTeX and LuaTeX), ++ % provide a definition macro that sets a catcode to `other' non-globally ++ % ++ \def\DeclareUnicodeCharacterNativeOther#1#2{% ++ \catcode"#1=\other ++ } ++ ++ % Suppress ligature creation from adjacent characters. ++ \ifluatex ++ % Braces do not suppress ligature creation in LuaTeX, e.g. in of{}fice ++ % to suppress the "ff" ligature. Using a kern appears to be the only ++ % workaround. ++ \def\nolig{\kern0pt{}} ++ \else ++ \def\nolig{{}} ++ \fi ++ ++ % https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M ++ % U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block) ++ % U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) ++ % U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A ++ % U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B ++ % ++ % Many of our renditions are less than wonderful, and all the missing ++ % characters are available somewhere. Loading the necessary fonts ++ % awaits user request. We can't truly support Unicode without ++ % reimplementing everything that's been done in LaTeX for many years, ++ % plus probably using luatex or xetex, and who knows what else. ++ % We won't be doing that here in this simple file. But we can try to at ++ % least make most of the characters not bomb out. ++ % ++ \def\unicodechardefs{% ++ \DeclareUnicodeCharacter{0020}{ } % space ++ \DeclareUnicodeCharacter{0021}{\char"21 }% % space to terminate number ++ \DeclareUnicodeCharacter{0022}{\char"22 }% ++ \DeclareUnicodeCharacter{0023}{\char"23 }% ++ \DeclareUnicodeCharacter{0024}{\char"24 }% ++ \DeclareUnicodeCharacter{0025}{\char"25 }% ++ \DeclareUnicodeCharacter{0026}{\char"26 }% ++ \DeclareUnicodeCharacter{0027}{\char"27 }% ++ \DeclareUnicodeCharacter{0028}{\char"28 }% ++ \DeclareUnicodeCharacter{0029}{\char"29 }% ++ \DeclareUnicodeCharacter{002A}{\char"2A }% ++ \DeclareUnicodeCharacter{002B}{\char"2B }% ++ \DeclareUnicodeCharacter{002C}{\char"2C }% ++ \DeclareUnicodeCharacter{002D}{\char"2D }% ++ \DeclareUnicodeCharacter{002E}{\char"2E }% ++ \DeclareUnicodeCharacter{002F}{\char"2F }% ++ \DeclareUnicodeCharacter{0030}{0}% ++ \DeclareUnicodeCharacter{0031}{1}% ++ \DeclareUnicodeCharacter{0032}{2}% ++ \DeclareUnicodeCharacter{0033}{3}% ++ \DeclareUnicodeCharacter{0034}{4}% ++ \DeclareUnicodeCharacter{0035}{5}% ++ \DeclareUnicodeCharacter{0036}{6}% ++ \DeclareUnicodeCharacter{0037}{7}% ++ \DeclareUnicodeCharacter{0038}{8}% ++ \DeclareUnicodeCharacter{0039}{9}% ++ \DeclareUnicodeCharacter{003A}{\char"3A }% ++ \DeclareUnicodeCharacter{003B}{\char"3B }% ++ \DeclareUnicodeCharacter{003C}{\char"3C }% ++ \DeclareUnicodeCharacter{003D}{\char"3D }% ++ \DeclareUnicodeCharacter{003E}{\char"3E }% ++ \DeclareUnicodeCharacter{003F}{\char"3F }% ++ \DeclareUnicodeCharacter{0040}{\char"40 }% ++ \DeclareUnicodeCharacter{0041}{A}% ++ \DeclareUnicodeCharacter{0042}{B}% ++ \DeclareUnicodeCharacter{0043}{C}% ++ \DeclareUnicodeCharacter{0044}{D}% ++ \DeclareUnicodeCharacter{0045}{E}% ++ \DeclareUnicodeCharacter{0046}{F}% ++ \DeclareUnicodeCharacter{0047}{G}% ++ \DeclareUnicodeCharacter{0048}{H}% ++ \DeclareUnicodeCharacter{0049}{I}% ++ \DeclareUnicodeCharacter{004A}{J}% ++ \DeclareUnicodeCharacter{004B}{K}% ++ \DeclareUnicodeCharacter{004C}{L}% ++ \DeclareUnicodeCharacter{004D}{M}% ++ \DeclareUnicodeCharacter{004E}{N}% ++ \DeclareUnicodeCharacter{004F}{O}% ++ \DeclareUnicodeCharacter{0050}{P}% ++ \DeclareUnicodeCharacter{0051}{Q}% ++ \DeclareUnicodeCharacter{0052}{R}% ++ \DeclareUnicodeCharacter{0053}{S}% ++ \DeclareUnicodeCharacter{0054}{T}% ++ \DeclareUnicodeCharacter{0055}{U}% ++ \DeclareUnicodeCharacter{0056}{V}% ++ \DeclareUnicodeCharacter{0057}{W}% ++ \DeclareUnicodeCharacter{0058}{X}% ++ \DeclareUnicodeCharacter{0059}{Y}% ++ \DeclareUnicodeCharacter{005A}{Z}% ++ \DeclareUnicodeCharacter{005B}{\char"5B }% ++ \DeclareUnicodeCharacter{005C}{\char"5C }% ++ \DeclareUnicodeCharacter{005D}{\char"5D }% ++ \DeclareUnicodeCharacter{005E}{\char"5E }% ++ \DeclareUnicodeCharacter{005F}{\char"5F }% ++ \DeclareUnicodeCharacter{0060}{\char"60 }% ++ \DeclareUnicodeCharacter{0061}{a}% ++ \DeclareUnicodeCharacter{0062}{b}% ++ \DeclareUnicodeCharacter{0063}{c}% ++ \DeclareUnicodeCharacter{0064}{d}% ++ \DeclareUnicodeCharacter{0065}{e}% ++ \DeclareUnicodeCharacter{0066}{f}% ++ \DeclareUnicodeCharacter{0067}{g}% ++ \DeclareUnicodeCharacter{0068}{h}% ++ \DeclareUnicodeCharacter{0069}{i}% ++ \DeclareUnicodeCharacter{006A}{j}% ++ \DeclareUnicodeCharacter{006B}{k}% ++ \DeclareUnicodeCharacter{006C}{l}% ++ \DeclareUnicodeCharacter{006D}{m}% ++ \DeclareUnicodeCharacter{006E}{n}% ++ \DeclareUnicodeCharacter{006F}{o}% ++ \DeclareUnicodeCharacter{0070}{p}% ++ \DeclareUnicodeCharacter{0071}{q}% ++ \DeclareUnicodeCharacter{0072}{r}% ++ \DeclareUnicodeCharacter{0073}{s}% ++ \DeclareUnicodeCharacter{0074}{t}% ++ \DeclareUnicodeCharacter{0075}{u}% ++ \DeclareUnicodeCharacter{0076}{v}% ++ \DeclareUnicodeCharacter{0077}{w}% ++ \DeclareUnicodeCharacter{0078}{x}% ++ \DeclareUnicodeCharacter{0079}{y}% ++ \DeclareUnicodeCharacter{007A}{z}% ++ \DeclareUnicodeCharacter{007B}{\char"7B }% ++ \DeclareUnicodeCharacter{007C}{\char"7C }% ++ \DeclareUnicodeCharacter{007D}{\char"7D }% ++ \DeclareUnicodeCharacter{007E}{\char"7E }% ++ % \DeclareUnicodeCharacter{007F}{} % DEL ++ % ++ \DeclareUnicodeCharacter{00A0}{\tie}% ++ \DeclareUnicodeCharacter{00A1}{\exclamdown}% ++ \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent ++ \DeclareUnicodeCharacter{00A3}{\pounds{}}% ++ \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency ++ \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen ++ \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar ++ \DeclareUnicodeCharacter{00A7}{\S}% ++ \DeclareUnicodeCharacter{00A8}{\"{ }}% ++ \DeclareUnicodeCharacter{00A9}{\copyright{}}% ++ \DeclareUnicodeCharacter{00AA}{\ordf}% ++ \DeclareUnicodeCharacter{00AB}{\guillemetleft{}}% ++ \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}% ++ \DeclareUnicodeCharacter{00AD}{\-}% ++ \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}% ++ \DeclareUnicodeCharacter{00AF}{\={ }}% ++ % ++ \DeclareUnicodeCharacter{00B0}{\textdegree}% ++ \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}% ++ \DeclareUnicodeCharacter{00B2}{$^2$}% ++ \DeclareUnicodeCharacter{00B3}{$^3$}% ++ \DeclareUnicodeCharacter{00B4}{\'{ }}% ++ \DeclareUnicodeCharacter{00B5}{$\mu$}% ++ \DeclareUnicodeCharacter{00B6}{\P}% ++ \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot}% ++ \DeclareUnicodeCharacter{00B8}{\cedilla{ }}% ++ \DeclareUnicodeCharacter{00B9}{$^1$}% ++ \DeclareUnicodeCharacter{00BA}{\ordm}% ++ \DeclareUnicodeCharacter{00BB}{\guillemetright{}}% ++ \DeclareUnicodeCharacter{00BC}{$1\over4$}% ++ \DeclareUnicodeCharacter{00BD}{$1\over2$}% ++ \DeclareUnicodeCharacter{00BE}{$3\over4$}% ++ \DeclareUnicodeCharacter{00BF}{\questiondown}% ++ % ++ \DeclareUnicodeCharacter{00C0}{\`A}% ++ \DeclareUnicodeCharacter{00C1}{\'A}% ++ \DeclareUnicodeCharacter{00C2}{\^A}% ++ \DeclareUnicodeCharacter{00C3}{\~A}% ++ \DeclareUnicodeCharacter{00C4}{\"A}% ++ \DeclareUnicodeCharacter{00C5}{\AA}% ++ \DeclareUnicodeCharacter{00C6}{\AE}% ++ \DeclareUnicodeCharacter{00C7}{\cedilla{C}}% ++ \DeclareUnicodeCharacter{00C8}{\`E}% ++ \DeclareUnicodeCharacter{00C9}{\'E}% ++ \DeclareUnicodeCharacter{00CA}{\^E}% ++ \DeclareUnicodeCharacter{00CB}{\"E}% ++ \DeclareUnicodeCharacter{00CC}{\`I}% ++ \DeclareUnicodeCharacter{00CD}{\'I}% ++ \DeclareUnicodeCharacter{00CE}{\^I}% ++ \DeclareUnicodeCharacter{00CF}{\"I}% ++ % ++ \DeclareUnicodeCharacter{00D0}{\DH}% ++ \DeclareUnicodeCharacter{00D1}{\~N}% ++ \DeclareUnicodeCharacter{00D2}{\`O}% ++ \DeclareUnicodeCharacter{00D3}{\'O}% ++ \DeclareUnicodeCharacter{00D4}{\^O}% ++ \DeclareUnicodeCharacter{00D5}{\~O}% ++ \DeclareUnicodeCharacter{00D6}{\"O}% ++ \DeclareUnicodeCharacter{00D7}{\ensuremath\times}% ++ \DeclareUnicodeCharacter{00D8}{\O}% ++ \DeclareUnicodeCharacter{00D9}{\`U}% ++ \DeclareUnicodeCharacter{00DA}{\'U}% ++ \DeclareUnicodeCharacter{00DB}{\^U}% ++ \DeclareUnicodeCharacter{00DC}{\"U}% ++ \DeclareUnicodeCharacter{00DD}{\'Y}% ++ \DeclareUnicodeCharacter{00DE}{\TH}% ++ \DeclareUnicodeCharacter{00DF}{\ss}% ++ % ++ \DeclareUnicodeCharacter{00E0}{\`a}% ++ \DeclareUnicodeCharacter{00E1}{\'a}% ++ \DeclareUnicodeCharacter{00E2}{\^a}% ++ \DeclareUnicodeCharacter{00E3}{\~a}% ++ \DeclareUnicodeCharacter{00E4}{\"a}% ++ \DeclareUnicodeCharacter{00E5}{\aa}% ++ \DeclareUnicodeCharacter{00E6}{\ae}% ++ \DeclareUnicodeCharacter{00E7}{\cedilla{c}}% ++ \DeclareUnicodeCharacter{00E8}{\`e}% ++ \DeclareUnicodeCharacter{00E9}{\'e}% ++ \DeclareUnicodeCharacter{00EA}{\^e}% ++ \DeclareUnicodeCharacter{00EB}{\"e}% ++ \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}% ++ \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}% ++ \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}% ++ \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}% ++ % ++ \DeclareUnicodeCharacter{00F0}{\dh}% ++ \DeclareUnicodeCharacter{00F1}{\~n}% ++ \DeclareUnicodeCharacter{00F2}{\`o}% ++ \DeclareUnicodeCharacter{00F3}{\'o}% ++ \DeclareUnicodeCharacter{00F4}{\^o}% ++ \DeclareUnicodeCharacter{00F5}{\~o}% ++ \DeclareUnicodeCharacter{00F6}{\"o}% ++ \DeclareUnicodeCharacter{00F7}{\ensuremath\div}% ++ \DeclareUnicodeCharacter{00F8}{\o}% ++ \DeclareUnicodeCharacter{00F9}{\`u}% ++ \DeclareUnicodeCharacter{00FA}{\'u}% ++ \DeclareUnicodeCharacter{00FB}{\^u}% ++ \DeclareUnicodeCharacter{00FC}{\"u}% ++ \DeclareUnicodeCharacter{00FD}{\'y}% ++ \DeclareUnicodeCharacter{00FE}{\th}% ++ \DeclareUnicodeCharacter{00FF}{\"y}% ++ % ++ \DeclareUnicodeCharacter{0100}{\=A}% ++ \DeclareUnicodeCharacter{0101}{\=a}% ++ \DeclareUnicodeCharacter{0102}{\u{A}}% ++ \DeclareUnicodeCharacter{0103}{\u{a}}% ++ \DeclareUnicodeCharacter{0104}{\ogonek{A}}% ++ \DeclareUnicodeCharacter{0105}{\ogonek{a}}% ++ \DeclareUnicodeCharacter{0106}{\'C}% ++ \DeclareUnicodeCharacter{0107}{\'c}% ++ \DeclareUnicodeCharacter{0108}{\^C}% ++ \DeclareUnicodeCharacter{0109}{\^c}% ++ \DeclareUnicodeCharacter{010A}{\dotaccent{C}}% ++ \DeclareUnicodeCharacter{010B}{\dotaccent{c}}% ++ \DeclareUnicodeCharacter{010C}{\v{C}}% ++ \DeclareUnicodeCharacter{010D}{\v{c}}% ++ \DeclareUnicodeCharacter{010E}{\v{D}}% ++ \DeclareUnicodeCharacter{010F}{d'}% ++ % ++ \DeclareUnicodeCharacter{0110}{\DH}% ++ \DeclareUnicodeCharacter{0111}{\dh}% ++ \DeclareUnicodeCharacter{0112}{\=E}% ++ \DeclareUnicodeCharacter{0113}{\=e}% ++ \DeclareUnicodeCharacter{0114}{\u{E}}% ++ \DeclareUnicodeCharacter{0115}{\u{e}}% ++ \DeclareUnicodeCharacter{0116}{\dotaccent{E}}% ++ \DeclareUnicodeCharacter{0117}{\dotaccent{e}}% ++ \DeclareUnicodeCharacter{0118}{\ogonek{E}}% ++ \DeclareUnicodeCharacter{0119}{\ogonek{e}}% ++ \DeclareUnicodeCharacter{011A}{\v{E}}% ++ \DeclareUnicodeCharacter{011B}{\v{e}}% ++ \DeclareUnicodeCharacter{011C}{\^G}% ++ \DeclareUnicodeCharacter{011D}{\^g}% ++ \DeclareUnicodeCharacter{011E}{\u{G}}% ++ \DeclareUnicodeCharacter{011F}{\u{g}}% ++ % ++ \DeclareUnicodeCharacter{0120}{\dotaccent{G}}% ++ \DeclareUnicodeCharacter{0121}{\dotaccent{g}}% ++ \DeclareUnicodeCharacter{0122}{\cedilla{G}}% ++ \DeclareUnicodeCharacter{0123}{\cedilla{g}}% ++ \DeclareUnicodeCharacter{0124}{\^H}% ++ \DeclareUnicodeCharacter{0125}{\^h}% ++ \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}}% ++ \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}}% ++ \DeclareUnicodeCharacter{0128}{\~I}% ++ \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}% ++ \DeclareUnicodeCharacter{012A}{\=I}% ++ \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}% ++ \DeclareUnicodeCharacter{012C}{\u{I}}% ++ \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}% ++ \DeclareUnicodeCharacter{012E}{\ogonek{I}}% ++ \DeclareUnicodeCharacter{012F}{\ogonek{i}}% ++ % ++ \DeclareUnicodeCharacter{0130}{\dotaccent{I}}% ++ \DeclareUnicodeCharacter{0131}{\dotless{i}}% ++ \DeclareUnicodeCharacter{0132}{IJ}% ++ \DeclareUnicodeCharacter{0133}{ij}% ++ \DeclareUnicodeCharacter{0134}{\^J}% ++ \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}% ++ \DeclareUnicodeCharacter{0136}{\cedilla{K}}% ++ \DeclareUnicodeCharacter{0137}{\cedilla{k}}% ++ \DeclareUnicodeCharacter{0138}{\ensuremath\kappa}% ++ \DeclareUnicodeCharacter{0139}{\'L}% ++ \DeclareUnicodeCharacter{013A}{\'l}% ++ \DeclareUnicodeCharacter{013B}{\cedilla{L}}% ++ \DeclareUnicodeCharacter{013C}{\cedilla{l}}% ++ \DeclareUnicodeCharacter{013D}{L'}% should kern ++ \DeclareUnicodeCharacter{013E}{l'}% should kern ++ \DeclareUnicodeCharacter{013F}{L\U{00B7}}% ++ % ++ \DeclareUnicodeCharacter{0140}{l\U{00B7}}% ++ \DeclareUnicodeCharacter{0141}{\L}% ++ \DeclareUnicodeCharacter{0142}{\l}% ++ \DeclareUnicodeCharacter{0143}{\'N}% ++ \DeclareUnicodeCharacter{0144}{\'n}% ++ \DeclareUnicodeCharacter{0145}{\cedilla{N}}% ++ \DeclareUnicodeCharacter{0146}{\cedilla{n}}% ++ \DeclareUnicodeCharacter{0147}{\v{N}}% ++ \DeclareUnicodeCharacter{0148}{\v{n}}% ++ \DeclareUnicodeCharacter{0149}{'n}% ++ \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}}% ++ \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}}% ++ \DeclareUnicodeCharacter{014C}{\=O}% ++ \DeclareUnicodeCharacter{014D}{\=o}% ++ \DeclareUnicodeCharacter{014E}{\u{O}}% ++ \DeclareUnicodeCharacter{014F}{\u{o}}% ++ % ++ \DeclareUnicodeCharacter{0150}{\H{O}}% ++ \DeclareUnicodeCharacter{0151}{\H{o}}% ++ \DeclareUnicodeCharacter{0152}{\OE}% ++ \DeclareUnicodeCharacter{0153}{\oe}% ++ \DeclareUnicodeCharacter{0154}{\'R}% ++ \DeclareUnicodeCharacter{0155}{\'r}% ++ \DeclareUnicodeCharacter{0156}{\cedilla{R}}% ++ \DeclareUnicodeCharacter{0157}{\cedilla{r}}% ++ \DeclareUnicodeCharacter{0158}{\v{R}}% ++ \DeclareUnicodeCharacter{0159}{\v{r}}% ++ \DeclareUnicodeCharacter{015A}{\'S}% ++ \DeclareUnicodeCharacter{015B}{\'s}% ++ \DeclareUnicodeCharacter{015C}{\^S}% ++ \DeclareUnicodeCharacter{015D}{\^s}% ++ \DeclareUnicodeCharacter{015E}{\cedilla{S}}% ++ \DeclareUnicodeCharacter{015F}{\cedilla{s}}% ++ % ++ \DeclareUnicodeCharacter{0160}{\v{S}}% ++ \DeclareUnicodeCharacter{0161}{\v{s}}% ++ \DeclareUnicodeCharacter{0162}{\cedilla{T}}% ++ \DeclareUnicodeCharacter{0163}{\cedilla{t}}% ++ \DeclareUnicodeCharacter{0164}{\v{T}}% ++ \DeclareUnicodeCharacter{0165}{\v{t}}% ++ \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}}% ++ \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}}% ++ \DeclareUnicodeCharacter{0168}{\~U}% ++ \DeclareUnicodeCharacter{0169}{\~u}% ++ \DeclareUnicodeCharacter{016A}{\=U}% ++ \DeclareUnicodeCharacter{016B}{\=u}% ++ \DeclareUnicodeCharacter{016C}{\u{U}}% ++ \DeclareUnicodeCharacter{016D}{\u{u}}% ++ \DeclareUnicodeCharacter{016E}{\ringaccent{U}}% ++ \DeclareUnicodeCharacter{016F}{\ringaccent{u}}% ++ % ++ \DeclareUnicodeCharacter{0170}{\H{U}}% ++ \DeclareUnicodeCharacter{0171}{\H{u}}% ++ \DeclareUnicodeCharacter{0172}{\ogonek{U}}% ++ \DeclareUnicodeCharacter{0173}{\ogonek{u}}% ++ \DeclareUnicodeCharacter{0174}{\^W}% ++ \DeclareUnicodeCharacter{0175}{\^w}% ++ \DeclareUnicodeCharacter{0176}{\^Y}% ++ \DeclareUnicodeCharacter{0177}{\^y}% ++ \DeclareUnicodeCharacter{0178}{\"Y}% ++ \DeclareUnicodeCharacter{0179}{\'Z}% ++ \DeclareUnicodeCharacter{017A}{\'z}% ++ \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}% ++ \DeclareUnicodeCharacter{017C}{\dotaccent{z}}% ++ \DeclareUnicodeCharacter{017D}{\v{Z}}% ++ \DeclareUnicodeCharacter{017E}{\v{z}}% ++ \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}}% ++ % ++ \DeclareUnicodeCharacter{01C4}{D\v{Z}}% ++ \DeclareUnicodeCharacter{01C5}{D\v{z}}% ++ \DeclareUnicodeCharacter{01C6}{d\v{z}}% ++ \DeclareUnicodeCharacter{01C7}{LJ}% ++ \DeclareUnicodeCharacter{01C8}{Lj}% ++ \DeclareUnicodeCharacter{01C9}{lj}% ++ \DeclareUnicodeCharacter{01CA}{NJ}% ++ \DeclareUnicodeCharacter{01CB}{Nj}% ++ \DeclareUnicodeCharacter{01CC}{nj}% ++ \DeclareUnicodeCharacter{01CD}{\v{A}}% ++ \DeclareUnicodeCharacter{01CE}{\v{a}}% ++ \DeclareUnicodeCharacter{01CF}{\v{I}}% ++ % ++ \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}% ++ \DeclareUnicodeCharacter{01D1}{\v{O}}% ++ \DeclareUnicodeCharacter{01D2}{\v{o}}% ++ \DeclareUnicodeCharacter{01D3}{\v{U}}% ++ \DeclareUnicodeCharacter{01D4}{\v{u}}% ++ % ++ \DeclareUnicodeCharacter{01E2}{\={\AE}}% ++ \DeclareUnicodeCharacter{01E3}{\={\ae}}% ++ \DeclareUnicodeCharacter{01E6}{\v{G}}% ++ \DeclareUnicodeCharacter{01E7}{\v{g}}% ++ \DeclareUnicodeCharacter{01E8}{\v{K}}% ++ \DeclareUnicodeCharacter{01E9}{\v{k}}% ++ % ++ \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}% ++ \DeclareUnicodeCharacter{01F1}{DZ}% ++ \DeclareUnicodeCharacter{01F2}{Dz}% ++ \DeclareUnicodeCharacter{01F3}{dz}% ++ \DeclareUnicodeCharacter{01F4}{\'G}% ++ \DeclareUnicodeCharacter{01F5}{\'g}% ++ \DeclareUnicodeCharacter{01F8}{\`N}% ++ \DeclareUnicodeCharacter{01F9}{\`n}% ++ \DeclareUnicodeCharacter{01FC}{\'{\AE}}% ++ \DeclareUnicodeCharacter{01FD}{\'{\ae}}% ++ \DeclareUnicodeCharacter{01FE}{\'{\O}}% ++ \DeclareUnicodeCharacter{01FF}{\'{\o}}% ++ % ++ \DeclareUnicodeCharacter{021E}{\v{H}}% ++ \DeclareUnicodeCharacter{021F}{\v{h}}% ++ % ++ \DeclareUnicodeCharacter{0226}{\dotaccent{A}}% ++ \DeclareUnicodeCharacter{0227}{\dotaccent{a}}% ++ \DeclareUnicodeCharacter{0228}{\cedilla{E}}% ++ \DeclareUnicodeCharacter{0229}{\cedilla{e}}% ++ \DeclareUnicodeCharacter{022E}{\dotaccent{O}}% ++ \DeclareUnicodeCharacter{022F}{\dotaccent{o}}% ++ % ++ \DeclareUnicodeCharacter{0232}{\=Y}% ++ \DeclareUnicodeCharacter{0233}{\=y}% ++ \DeclareUnicodeCharacter{0237}{\dotless{j}}% ++ % ++ \DeclareUnicodeCharacter{02BC}{'}% ++ % ++ \DeclareUnicodeCharacter{02DB}{\ogonek{ }}% ++ % ++ % Greek letters upper case ++ \DeclareUnicodeCharacter{0391}{{\it A}}% ++ \DeclareUnicodeCharacter{0392}{{\it B}}% ++ \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}}% ++ \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}}% ++ \DeclareUnicodeCharacter{0395}{{\it E}}% ++ \DeclareUnicodeCharacter{0396}{{\it Z}}% ++ \DeclareUnicodeCharacter{0397}{{\it H}}% ++ \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}}% ++ \DeclareUnicodeCharacter{0399}{{\it I}}% ++ \DeclareUnicodeCharacter{039A}{{\it K}}% ++ \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}}% ++ \DeclareUnicodeCharacter{039C}{{\it M}}% ++ \DeclareUnicodeCharacter{039D}{{\it N}}% ++ \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}}% ++ \DeclareUnicodeCharacter{039F}{{\it O}}% ++ \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}}% ++ \DeclareUnicodeCharacter{03A1}{{\it P}}% ++ %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma ++ \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}}% ++ \DeclareUnicodeCharacter{03A4}{{\it T}}% ++ \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}}% ++ \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}}% ++ \DeclareUnicodeCharacter{03A7}{{\it X}}% ++ \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}}% ++ \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}}% ++ % ++ % Vowels with accents ++ \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}}% ++ \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}}% ++ \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}}% ++ \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}}% ++ \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}}% ++ \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}}% ++ % ++ % Standalone accent ++ \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}}% ++ % ++ % Greek letters lower case ++ \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha}% ++ \DeclareUnicodeCharacter{03B2}{\ensuremath\beta}% ++ \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma}% ++ \DeclareUnicodeCharacter{03B4}{\ensuremath\delta}% ++ \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon}% ++ \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta}% ++ \DeclareUnicodeCharacter{03B7}{\ensuremath\eta}% ++ \DeclareUnicodeCharacter{03B8}{\ensuremath\theta}% ++ \DeclareUnicodeCharacter{03B9}{\ensuremath\iota}% ++ \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa}% ++ \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda}% ++ \DeclareUnicodeCharacter{03BC}{\ensuremath\mu}% ++ \DeclareUnicodeCharacter{03BD}{\ensuremath\nu}% ++ \DeclareUnicodeCharacter{03BE}{\ensuremath\xi}% ++ \DeclareUnicodeCharacter{03BF}{{\it o}}% omicron ++ \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}% ++ \DeclareUnicodeCharacter{03C1}{\ensuremath\rho}% ++ \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma}% ++ \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma}% ++ \DeclareUnicodeCharacter{03C4}{\ensuremath\tau}% ++ \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon}% ++ \DeclareUnicodeCharacter{03C6}{\ensuremath\phi}% ++ \DeclareUnicodeCharacter{03C7}{\ensuremath\chi}% ++ \DeclareUnicodeCharacter{03C8}{\ensuremath\psi}% ++ \DeclareUnicodeCharacter{03C9}{\ensuremath\omega}% ++ % ++ % More Greek vowels with accents ++ \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}}% ++ \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}}% ++ \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}}% ++ \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}}% ++ \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}}% ++ % ++ % Variant Greek letters ++ \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta}% ++ \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi}% ++ \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho}% ++ % ++ \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}% ++ \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}% ++ \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}% ++ \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}% ++ \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}% ++ \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}% ++ \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}% ++ \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}% ++ \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}% ++ \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}% ++ \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}% ++ \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}% ++ % ++ \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}% ++ \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}% ++ % ++ \DeclareUnicodeCharacter{1E20}{\=G}% ++ \DeclareUnicodeCharacter{1E21}{\=g}% ++ \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}% ++ \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}% ++ \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}% ++ \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}% ++ \DeclareUnicodeCharacter{1E26}{\"H}% ++ \DeclareUnicodeCharacter{1E27}{\"h}% ++ % ++ \DeclareUnicodeCharacter{1E30}{\'K}% ++ \DeclareUnicodeCharacter{1E31}{\'k}% ++ \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}% ++ \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}% ++ \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}% ++ \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}% ++ \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}% ++ \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}% ++ \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}% ++ \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}% ++ \DeclareUnicodeCharacter{1E3E}{\'M}% ++ \DeclareUnicodeCharacter{1E3F}{\'m}% ++ % ++ \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}% ++ \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}% ++ \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}% ++ \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}% ++ \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}% ++ \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}% ++ \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}% ++ \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}% ++ \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}% ++ \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}% ++ % ++ \DeclareUnicodeCharacter{1E54}{\'P}% ++ \DeclareUnicodeCharacter{1E55}{\'p}% ++ \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}% ++ \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}% ++ \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}% ++ \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}% ++ \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}% ++ \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}% ++ \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}% ++ \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}% ++ % ++ \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}% ++ \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}% ++ \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}% ++ \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}% ++ \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}% ++ \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}% ++ \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}% ++ \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}% ++ \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}% ++ \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}% ++ % ++ \DeclareUnicodeCharacter{1E7C}{\~V}% ++ \DeclareUnicodeCharacter{1E7D}{\~v}% ++ \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}% ++ \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}% ++ % ++ \DeclareUnicodeCharacter{1E80}{\`W}% ++ \DeclareUnicodeCharacter{1E81}{\`w}% ++ \DeclareUnicodeCharacter{1E82}{\'W}% ++ \DeclareUnicodeCharacter{1E83}{\'w}% ++ \DeclareUnicodeCharacter{1E84}{\"W}% ++ \DeclareUnicodeCharacter{1E85}{\"w}% ++ \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}% ++ \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}% ++ \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}% ++ \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}% ++ \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}% ++ \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}% ++ \DeclareUnicodeCharacter{1E8C}{\"X}% ++ \DeclareUnicodeCharacter{1E8D}{\"x}% ++ \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}% ++ \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}% ++ % ++ \DeclareUnicodeCharacter{1E90}{\^Z}% ++ \DeclareUnicodeCharacter{1E91}{\^z}% ++ \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}% ++ \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}% ++ \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}% ++ \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}% ++ \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}% ++ \DeclareUnicodeCharacter{1E97}{\"t}% ++ \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}% ++ \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}% ++ % ++ \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}% ++ \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}% ++ % ++ \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}% ++ \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}% ++ \DeclareUnicodeCharacter{1EBC}{\~E}% ++ \DeclareUnicodeCharacter{1EBD}{\~e}% ++ % ++ \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}% ++ \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}% ++ \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}% ++ \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}% ++ % ++ \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}% ++ \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}% ++ % ++ \DeclareUnicodeCharacter{1EF2}{\`Y}% ++ \DeclareUnicodeCharacter{1EF3}{\`y}% ++ \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}% ++ % ++ \DeclareUnicodeCharacter{1EF8}{\~Y}% ++ \DeclareUnicodeCharacter{1EF9}{\~y}% ++ % ++ % Exotic spaces ++ \DeclareUnicodeCharacter{2007}{\hphantom{0}}% ++ % ++ % Punctuation ++ \DeclareUnicodeCharacter{2013}{--}% ++ \DeclareUnicodeCharacter{2014}{---}% ++ \DeclareUnicodeCharacter{2018}{\quoteleft\nolig}% ++ \DeclareUnicodeCharacter{2019}{\quoteright\nolig}% ++ \DeclareUnicodeCharacter{201A}{\quotesinglbase{}}% ++ \DeclareUnicodeCharacter{201C}{\quotedblleft{}}% ++ \DeclareUnicodeCharacter{201D}{\quotedblright{}}% ++ \DeclareUnicodeCharacter{201E}{\quotedblbase{}}% ++ \DeclareUnicodeCharacter{2020}{\ensuremath\dagger}% ++ \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}% ++ \DeclareUnicodeCharacter{2022}{\bullet{}}% ++ \DeclareUnicodeCharacter{202F}{\thinspace}% ++ \DeclareUnicodeCharacter{2026}{\dots{}}% ++ \DeclareUnicodeCharacter{2039}{\guilsinglleft{}}% ++ \DeclareUnicodeCharacter{203A}{\guilsinglright{}}% ++ % ++ \DeclareUnicodeCharacter{20AC}{\euro{}}% ++ % ++ \DeclareUnicodeCharacter{2192}{\arrow}% ++ \DeclareUnicodeCharacter{21D2}{\result{}}% ++ % ++ % Mathematical symbols ++ \DeclareUnicodeCharacter{2200}{\ensuremath\forall}% ++ \DeclareUnicodeCharacter{2203}{\ensuremath\exists}% ++ \DeclareUnicodeCharacter{2208}{\ensuremath\in}% ++ \DeclareUnicodeCharacter{2212}{\minus{}}% ++ \DeclareUnicodeCharacter{2217}{\ast}% ++ \DeclareUnicodeCharacter{221E}{\ensuremath\infty}% ++ \DeclareUnicodeCharacter{2225}{\ensuremath\parallel}% ++ \DeclareUnicodeCharacter{2227}{\ensuremath\wedge}% ++ \DeclareUnicodeCharacter{2229}{\ensuremath\cap}% ++ \DeclareUnicodeCharacter{2261}{\equiv{}}% ++ \DeclareUnicodeCharacter{2264}{\ensuremath\leq}% ++ \DeclareUnicodeCharacter{2265}{\ensuremath\geq}% ++ \DeclareUnicodeCharacter{2282}{\ensuremath\subset}% ++ \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}% ++ % ++ \DeclareUnicodeCharacter{2016}{\ensuremath\Vert}% ++ \DeclareUnicodeCharacter{2032}{\ensuremath{^\prime}}% ++ \DeclareUnicodeCharacter{210F}{\ensuremath\hbar}% ++ \DeclareUnicodeCharacter{2111}{\ensuremath\Im}% ++ \DeclareUnicodeCharacter{2113}{\ensuremath\ell}% ++ \DeclareUnicodeCharacter{2118}{\ensuremath\wp}% ++ \DeclareUnicodeCharacter{211C}{\ensuremath\Re}% ++ \DeclareUnicodeCharacter{2135}{\ensuremath\aleph}% ++ \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}% ++ \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}% ++ \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow}% ++ \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow}% ++ \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow}% ++ \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow}% ++ \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow}% ++ \DeclareUnicodeCharacter{2198}{\ensuremath\searrow}% ++ \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow}% ++ \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto}% ++ \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow}% ++ \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}% ++ \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}% ++ \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}% ++ \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}% ++ \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}% ++ \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}% ++ \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow}% ++ \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow}% ++ \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}% ++ \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}% ++ \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}% ++ \DeclareUnicodeCharacter{2202}{\ensuremath\partial}% ++ \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}% ++ \DeclareUnicodeCharacter{2207}{\ensuremath\nabla}% ++ \DeclareUnicodeCharacter{2209}{\ensuremath\notin}% ++ \DeclareUnicodeCharacter{220B}{\ensuremath\owns}% ++ \DeclareUnicodeCharacter{220F}{\ensuremath\prod}% ++ \DeclareUnicodeCharacter{2210}{\ensuremath\coprod}% ++ \DeclareUnicodeCharacter{2211}{\ensuremath\sum}% ++ \DeclareUnicodeCharacter{2213}{\ensuremath\mp}% ++ \DeclareUnicodeCharacter{2218}{\ensuremath\circ}% ++ \DeclareUnicodeCharacter{221A}{\ensuremath\surd}% ++ \DeclareUnicodeCharacter{221D}{\ensuremath\propto}% ++ \DeclareUnicodeCharacter{2220}{\ensuremath\angle}% ++ \DeclareUnicodeCharacter{2223}{\ensuremath\mid}% ++ \DeclareUnicodeCharacter{2228}{\ensuremath\vee}% ++ \DeclareUnicodeCharacter{222A}{\ensuremath\cup}% ++ \DeclareUnicodeCharacter{222B}{\ensuremath\smallint}% ++ \DeclareUnicodeCharacter{222E}{\ensuremath\oint}% ++ \DeclareUnicodeCharacter{223C}{\ensuremath\sim}% ++ \DeclareUnicodeCharacter{2240}{\ensuremath\wr}% ++ \DeclareUnicodeCharacter{2243}{\ensuremath\simeq}% ++ \DeclareUnicodeCharacter{2245}{\ensuremath\cong}% ++ \DeclareUnicodeCharacter{2248}{\ensuremath\approx}% ++ \DeclareUnicodeCharacter{224D}{\ensuremath\asymp}% ++ \DeclareUnicodeCharacter{2250}{\ensuremath\doteq}% ++ \DeclareUnicodeCharacter{2260}{\ensuremath\neq}% ++ \DeclareUnicodeCharacter{226A}{\ensuremath\ll}% ++ \DeclareUnicodeCharacter{226B}{\ensuremath\gg}% ++ \DeclareUnicodeCharacter{227A}{\ensuremath\prec}% ++ \DeclareUnicodeCharacter{227B}{\ensuremath\succ}% ++ \DeclareUnicodeCharacter{2283}{\ensuremath\supset}% ++ \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}% ++ \DeclareUnicodeCharacter{228E}{\ensuremath\uplus}% ++ \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}% ++ \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}% ++ \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}% ++ \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup}% ++ \DeclareUnicodeCharacter{2295}{\ensuremath\oplus}% ++ \DeclareUnicodeCharacter{2296}{\ensuremath\ominus}% ++ \DeclareUnicodeCharacter{2297}{\ensuremath\otimes}% ++ \DeclareUnicodeCharacter{2298}{\ensuremath\oslash}% ++ \DeclareUnicodeCharacter{2299}{\ensuremath\odot}% ++ \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash}% ++ \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv}% ++ \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}% ++ \DeclareUnicodeCharacter{22A5}{\ensuremath\bot}% ++ \DeclareUnicodeCharacter{22A8}{\ensuremath\models}% ++ \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}% ++ \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}% ++ \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}% ++ \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup}% ++ \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond}% ++ \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot}% ++ \DeclareUnicodeCharacter{22C6}{\ensuremath\star}% ++ \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie}% ++ \DeclareUnicodeCharacter{2308}{\ensuremath\lceil}% ++ \DeclareUnicodeCharacter{2309}{\ensuremath\rceil}% ++ \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor}% ++ \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor}% ++ \DeclareUnicodeCharacter{2322}{\ensuremath\frown}% ++ \DeclareUnicodeCharacter{2323}{\ensuremath\smile}% ++ % ++ \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}% ++ \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}% ++ \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}% ++ \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}% ++ \DeclareUnicodeCharacter{25C7}{\ensuremath\diamond}% ++ \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}% ++ \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}% ++ \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}% ++ \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit}% ++ \DeclareUnicodeCharacter{266D}{\ensuremath\flat}% ++ \DeclareUnicodeCharacter{266E}{\ensuremath\natural}% ++ \DeclareUnicodeCharacter{266F}{\ensuremath\sharp}% ++ \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc}% ++ \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle}% ++ \DeclareUnicodeCharacter{27C2}{\ensuremath\perp}% ++ \DeclareUnicodeCharacter{27E8}{\ensuremath\langle}% ++ \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow}% ++ \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow}% ++ \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow}% ++ \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto}% ++ \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus}% ++ \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot}% ++ \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus}% ++ \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}% ++ \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}% ++ \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}% ++ \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}% ++ \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}% ++ \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}% ++ % ++ \global\mathchardef\checkmark="1370% actually the square root sign ++ \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}% ++ % ++ % These are all the combining accents. We need these empty definitions ++ % at present for the sake of PDF outlines. ++ \DeclareUnicodeCharacter{0300}{}% ++ \DeclareUnicodeCharacter{0301}{}% ++ \DeclareUnicodeCharacter{0302}{}% ++ \DeclareUnicodeCharacter{0303}{}% ++ \DeclareUnicodeCharacter{0305}{}% ++ \DeclareUnicodeCharacter{0306}{}% ++ \DeclareUnicodeCharacter{0307}{}% ++ \DeclareUnicodeCharacter{0308}{}% ++ \DeclareUnicodeCharacter{030A}{}% ++ \DeclareUnicodeCharacter{030B}{}% ++ \DeclareUnicodeCharacter{030C}{}% ++ \DeclareUnicodeCharacter{0323}{}% ++ \DeclareUnicodeCharacter{0327}{}% ++ \DeclareUnicodeCharacter{0328}{}% ++ \DeclareUnicodeCharacter{0331}{}% ++ \DeclareUnicodeCharacter{0361}{}% ++ }% end of \unicodechardefs ++ ++ % UTF-8 byte sequence (pdfTeX) definitions (replacing and @U command) ++ % It makes the setting that replace UTF-8 byte sequence. + \def\utfeightchardefs{% +! \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterUTFviii +! \unicodechardefs +! } +! +! % Whether the active definitions of non-ASCII characters expand to +! % non-active tokens with the same character code. This is used to +! % write characters literally, instead of using active definitions for +! % printing the correct glyphs. +! \newif\ifpassthroughchars +! \passthroughcharsfalse +! +! % For native Unicode handling (XeTeX and LuaTeX), +! % provide a definition macro to replace/pass-through a Unicode character +! % +! \def\DeclareUnicodeCharacterNative#1#2{% +! \ifnum"#1>"7F % only make non-ASCII chars active +! \catcode"#1=\active +! \def\dodeclareunicodecharacternative##1##2##3{% +! \begingroup +! \uccode`\~="##2\relax +! \uppercase{\gdef~}{% +! \ifpassthroughchars +! ##1% +! \else +! ##3% +! \fi +! } +! \endgroup +! } +! \begingroup +! \uccode`\.="#1\relax +! \uppercase{\def\UTFNativeTmp{.}}% +! \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}% +! \endgroup +! \fi +! } + ++ % Native Unicode handling (XeTeX and LuaTeX) character replacing definition. ++ % It activates the setting that replaces Unicode characters. ++ \def\nativeunicodechardefs{% ++ \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNative ++ \unicodechardefs ++ } ++ ++ % For native Unicode handling (XeTeX and LuaTeX), ++ % make the character token expand ++ % to the sequences given in \unicodechardefs for printing. ++ \def\DeclareUnicodeCharacterNativeAtU#1#2{% ++ \def\UTFAtUTmp{#2} ++ \expandafter\globallet\csname uni:#1\endcsname \UTFAtUTmp ++ } ++ ++ % @U command definitions for native Unicode handling (XeTeX and LuaTeX). ++ \def\nativeunicodechardefsatu{% ++ \let\DeclareUnicodeCharacter\DeclareUnicodeCharacterNativeAtU ++ \unicodechardefs ++ } + + % US-ASCII character definitions. + \def\asciichardefs{% nothing need be done + \relax + } + +! % Define all Unicode characters we know about +! \iftxinativeunicodecapable +! \nativeunicodechardefsatu +! \else +! \utfeightchardefs +! \fi + + + \message{formatting,} +*************** +*** 9706,9719 **** + % + \vsize = #1\relax + \advance\vsize by \topskip +! \outervsize = \vsize +! \advance\outervsize by 2\topandbottommargin +! \pageheight = \vsize + % + \hsize = #2\relax +! \outerhsize = \hsize +! \advance\outerhsize by 0.5in +! \pagewidth = \hsize + % + \normaloffset = #4\relax + \bindingoffset = #5\relax +--- 11692,11701 ---- + % + \vsize = #1\relax + \advance\vsize by \topskip +! \txipageheight = \vsize + % + \hsize = #2\relax +! \txipagewidth = \hsize + % + \normaloffset = #4\relax + \bindingoffset = #5\relax +*************** +*** 9725,9730 **** +--- 11707,11720 ---- + % whatever layout pdftex was dumped with. + \pdfhorigin = 1 true in + \pdfvorigin = 1 true in ++ \else ++ \ifxetex ++ \pdfpageheight #7\relax ++ \pdfpagewidth #8\relax ++ % XeTeX does not have \pdfhorigin and \pdfvorigin. ++ \else ++ \special{papersize=#8,#7}% ++ \fi + \fi + % + \setleading{\textleading} +*************** +*** 9757,9785 **** + % + \lispnarrowing = 0.3in + \tolerance = 700 +- \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = .5cm + }} + +- % Use @smallerbook to reset parameters for 6x9 trim size. +- % (Just testing, parameters still in flux.) +- \def\smallerbook{{\globaldefs = 1 +- \parskip = 1.5pt plus 1pt +- \textleading = 12pt +- % +- \internalpagesizes{7.4in}{4.8in}% +- {-.2in}{-.4in}% +- {0pt}{14pt}% +- {9in}{6in}% +- % +- \lispnarrowing = 0.25in +- \tolerance = 700 +- \hfuzz = 1pt +- \contentsrightmargin = 0pt +- \defbodyindent = .4cm +- }} +- + % Use @afourpaper to print on European A4 paper. + \def\afourpaper{{\globaldefs = 1 + \parskip = 3pt plus 2pt minus 1pt +--- 11747,11756 ---- +*************** +*** 9801,9807 **** + {297mm}{210mm}% + % + \tolerance = 700 +- \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = 5mm + }} +--- 11772,11777 ---- +*************** +*** 9814,9826 **** + \textleading = 12.5pt + % + \internalpagesizes{160mm}{120mm}% +! {\voffset}{\hoffset}% + {\bindingoffset}{8pt}% + {210mm}{148mm}% + % + \lispnarrowing = 0.2in + \tolerance = 800 +- \hfuzz = 1.2pt + \contentsrightmargin = 0pt + \defbodyindent = 2mm + \tableindent = 12mm +--- 11784,11795 ---- + \textleading = 12.5pt + % + \internalpagesizes{160mm}{120mm}% +! {\voffset}{-11.4mm}% + {\bindingoffset}{8pt}% + {210mm}{148mm}% + % + \lispnarrowing = 0.2in + \tolerance = 800 + \contentsrightmargin = 0pt + \defbodyindent = 2mm + \tableindent = 12mm +*************** +*** 9848,9853 **** +--- 11817,11834 ---- + \globaldefs = 0 + }} + ++ \def\bsixpaper{{\globaldefs = 1 ++ \afourpaper ++ \internalpagesizes{140mm}{100mm}% ++ {-6.35mm}{-12.7mm}% ++ {\bindingoffset}{14pt}% ++ {176mm}{125mm}% ++ \let\SETdispenvsize=\smallword ++ \lispnarrowing = 0.2in ++ \globaldefs = 0 ++ }} ++ ++ + % @pagesizes TEXTHEIGHT[,TEXTWIDTH] + % Perhaps we should allow setting the margins, \topskip, \parskip, + % and/or leading, also. Or perhaps we should compute them somehow. +*************** +*** 9861,9870 **** + \setleading{\textleading}% + % + \dimen0 = #1\relax +! \advance\dimen0 by \voffset + % + \dimen2 = \hsize +! \advance\dimen2 by \normaloffset + % + \internalpagesizes{#1}{\hsize}% + {\voffset}{\normaloffset}% +--- 11842,11853 ---- + \setleading{\textleading}% + % + \dimen0 = #1\relax +! \advance\dimen0 by 2.5in % default 1in margin above heading line +! % and 1.5in to include heading, footing and +! % bottom margin + % + \dimen2 = \hsize +! \advance\dimen2 by 2in % default to 1 inch margin on each side + % + \internalpagesizes{#1}{\hsize}% + {\voffset}{\normaloffset}% +*************** +*** 9876,9885 **** +--- 11859,12000 ---- + % + \letterpaper + ++ % Default value of \hfuzz, for suppressing warnings about overfull hboxes. ++ \hfuzz = 1pt ++ ++ ++ \message{microtype,} ++ ++ % protrusion, from Thanh's protcode.tex. ++ \def\mtsetprotcode#1{% ++ \rpcode#1`\!=200 \rpcode#1`\,=700 \rpcode#1`\-=700 \rpcode#1`\.=700 ++ \rpcode#1`\;=500 \rpcode#1`\:=500 \rpcode#1`\?=200 ++ \rpcode#1`\'=700 ++ \rpcode#1 34=500 % '' ++ \rpcode#1 123=300 % -- ++ \rpcode#1 124=200 % --- ++ \rpcode#1`\)=50 \rpcode#1`\A=50 \rpcode#1`\F=50 \rpcode#1`\K=50 ++ \rpcode#1`\L=50 \rpcode#1`\T=50 \rpcode#1`\V=50 \rpcode#1`\W=50 ++ \rpcode#1`\X=50 \rpcode#1`\Y=50 \rpcode#1`\k=50 \rpcode#1`\r=50 ++ \rpcode#1`\t=50 \rpcode#1`\v=50 \rpcode#1`\w=50 \rpcode#1`\x=50 ++ \rpcode#1`\y=50 ++ % ++ \lpcode#1`\`=700 ++ \lpcode#1 92=500 % `` ++ \lpcode#1`\(=50 \lpcode#1`\A=50 \lpcode#1`\J=50 \lpcode#1`\T=50 ++ \lpcode#1`\V=50 \lpcode#1`\W=50 \lpcode#1`\X=50 \lpcode#1`\Y=50 ++ \lpcode#1`\v=50 \lpcode#1`\w=50 \lpcode#1`\x=50 \lpcode#1`\y=0 ++ % ++ \mtadjustprotcode#1\relax ++ } ++ ++ \newcount\countC ++ \def\mtadjustprotcode#1{% ++ \countC=0 ++ \loop ++ \ifcase\lpcode#1\countC\else ++ \mtadjustcp\lpcode#1\countC ++ \fi ++ \ifcase\rpcode#1\countC\else ++ \mtadjustcp\rpcode#1\countC ++ \fi ++ \advance\countC 1 ++ \ifnum\countC < 256 \repeat ++ } ++ ++ \newcount\countB ++ \def\mtadjustcp#1#2#3{% ++ \setbox\boxA=\hbox{% ++ \ifx#2\font\else#2\fi ++ \char#3}% ++ \countB=\wd\boxA ++ \multiply\countB #1#2#3\relax ++ \divide\countB \fontdimen6 #2\relax ++ #1#2#3=\countB\relax ++ } ++ ++ \ifxetex % XeTeX ++ \mtsetprotcode\textrm ++ \def\mtfontexpand#1{} ++ \else ++ \ifluatex % LuaTeX ++ \mtsetprotcode\textrm ++ \def\mtfontexpand#1{\expandglyphsinfont#1 20 20 1\relax} ++ \else ++ \ifpdf % pdfTeX ++ \mtsetprotcode\textrm ++ \def\mtfontexpand#1{\pdffontexpand#1 20 20 1 autoexpand\relax} ++ \else % TeX ++ \def\mtfontexpand#1{} ++ \fi ++ \fi ++ \fi ++ ++ ++ \newif\ifmicrotype ++ ++ \def\microtypeON{% ++ \microtypetrue ++ % ++ \ifxetex % XeTeX ++ \XeTeXprotrudechars=2 ++ \else ++ \ifluatex % LuaTeX ++ \adjustspacing=2 ++ \protrudechars=2 ++ \else ++ \ifpdf % pdfTeX ++ \pdfadjustspacing=2 ++ \pdfprotrudechars=2 ++ \fi ++ \fi ++ \fi ++ % ++ \mtfontexpand\textrm ++ \mtfontexpand\textsl ++ \mtfontexpand\textbf ++ } ++ ++ \def\microtypeOFF{% ++ \microtypefalse ++ % ++ \ifxetex % XeTeX ++ \XeTeXprotrudechars=0 ++ \else ++ \ifluatex % LuaTeX ++ \adjustspacing=0 ++ \protrudechars=0 ++ \else ++ \ifpdf % pdfTeX ++ \pdfadjustspacing=0 ++ \pdfprotrudechars=0 ++ \fi ++ \fi ++ \fi ++ } ++ ++ \microtypeOFF ++ ++ \parseargdef\microtype{% ++ \def\txiarg{#1}% ++ \ifx\txiarg\onword ++ \microtypeON ++ \else\ifx\txiarg\offword ++ \microtypeOFF ++ \else ++ \errhelp = \EMsimple ++ \errmessage{Unknown @microtype option `\txiarg', must be on|off}% ++ \fi\fi ++ } ++ + + \message{and turning on texinfo input format.} + ++ % Make UTF-8 the default encoding. ++ \documentencodingzzz{UTF-8} ++ + \def^^L{\par} % remove \outer, so ^L can appear in an @comment ++ \catcode`\^^K = 10 % treat vertical tab as whitespace + + % DEL is a comment character, in case @c does not suffice. + \catcode`\^^? = 14 +*************** +*** 9895,10052 **** + \catcode`\|=\other \def\normalverticalbar{|} + \catcode`\~=\other \def\normaltilde{~} + +! % This macro is used to make a character print one way in \tt +! % (where it can probably be output as-is), and another way in other fonts, +! % where something hairier probably needs to be done. +! % +! % #1 is what to print if we are indeed using \tt; #2 is what to print +! % otherwise. Since all the Computer Modern typewriter fonts have zero +! % interword stretch (and shrink), and it is reasonable to expect all +! % typewriter fonts to have this, we can check that font parameter. +! % +! \def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} + +! % Same as above, but check for italic font. Actually this also catches +! % non-italic slanted fonts since it is impossible to distinguish them from +! % italic fonts. But since this is only used by $ and it uses \sl anyway +! % this is not a problem. +! \def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} +! +! % Turn off all special characters except @ +! % (and those which the user can use as if they were ordinary). + % Most of these we simply print from the \tt font, but for some, we can + % use math or other variants that look better in normal text. +! + \catcode`\"=\active + \def\activedoublequote{{\tt\char34}} + \let"=\activedoublequote +! \catcode`\~=\active +! \def~{{\tt\char126}} +! \chardef\hat=`\^ +! \catcode`\^=\active +! \def^{{\tt \hat}} + + \catcode`\_=\active + \def_{\ifusingtt\normalunderscore\_} +- \let\realunder=_ +- % Subroutine for the previous macro. + \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } + +- \catcode`\|=\active +- \def|{{\tt\char124}} + \chardef \less=`\< +! \catcode`\<=\active +! \def<{{\tt \less}} + \chardef \gtr=`\> +! \catcode`\>=\active +! \def>{{\tt \gtr}} +! \catcode`\+=\active +! \def+{{\tt \char 43}} +! \catcode`\$=\active +! \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix +! +! % If a .fmt file is being used, characters that might appear in a file +! % name cannot be active until we have parsed the command line. +! % So turn them off again, and have \everyjob (or @setfilename) turn them on. +! % \otherifyactive is called near the end of this file. +! \def\otherifyactive{\catcode`+=\other \catcode`\_=\other} + + % Used sometimes to turn off (effectively) the active characters even after + % parsing them. + \def\turnoffactive{% +! \normalturnoffactive + \otherbackslash + } + +! \catcode`\@=0 + + % \backslashcurfont outputs one backslash character in current font, + % as in \char`\\. + \global\chardef\backslashcurfont=`\\ +- \global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work + +! % \realbackslash is an actual character `\' with catcode other, and +! % \doublebackslash is two of them (for the pdf outlines). +! {\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} + +! % In texinfo, backslash is an active character; it prints the backslash + % in fixed width font. + \catcode`\\=\active % @ for escape char from now on. + +! % The story here is that in math mode, the \char of \backslashcurfont +! % ends up printing the roman \ from the math symbol font (because \char +! % in math mode uses the \mathcode, and plain.tex sets +! % \mathcode`\\="026E). It seems better for @backslashchar{} to always +! % print a typewriter backslash, hence we use an explicit \mathchar, +! % which is the decimal equivalent of "715c (class 7, e.g., use \fam; +! % ignored family value; char position "5C). We can't use " for the +! % usual hex value because it has already been made active. +! @def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} +! @let@backslashchar = @normalbackslash % @backslashchar{} is for user documents. + +- % On startup, @fixbackslash assigns: +- % @let \ = @normalbackslash +- % \rawbackslash defines an active \ to do \backslashcurfont. + % \otherbackslash defines an active \ to be a literal `\' character with +! % catcode other. We switch back and forth between these. +! @gdef@rawbackslash{@let\=@backslashcurfont} + @gdef@otherbackslash{@let\=@realbackslash} + + % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +! % the literal character `\'. Also revert - to its normal character, in +! % case the active - from code has slipped in. + % + {@catcode`- = @active + @gdef@normalturnoffactive{% +! @let-=@normaldash +! @let"=@normaldoublequote +! @let$=@normaldollar %$ font-lock fix +! @let+=@normalplus +! @let<=@normalless +! @let>=@normalgreater +! @let\=@normalbackslash +! @let^=@normalcaret +! @let_=@normalunderscore +! @let|=@normalverticalbar +! @let~=@normaltilde +! @markupsetuplqdefault +! @markupsetuprqdefault +! @unsepspaces + } + } + +- % Make _ and + \other characters, temporarily. +- % This is canceled by @fixbackslash. +- @otherifyactive +- +- % If a .fmt file is being used, we don't want the `\input texinfo' to show up. +- % That is what \eatinput is for; after that, the `\' should revert to printing +- % a backslash. +- % +- @gdef@eatinput input texinfo{@fixbackslash} +- @global@let\ = @eatinput +- +- % On the other hand, perhaps the file did not have a `\input texinfo'. Then +- % the first `\' in the file would cause an error. This macro tries to fix +- % that, assuming it is called before the first `\' could plausibly occur. +- % Also turn back on active characters that might appear in the input +- % file name, in case not using a pre-dumped format. +- % +- @gdef@fixbackslash{% +- @ifx\@eatinput @let\ = @normalbackslash @fi +- @catcode`+=@active +- @catcode`@_=@active +- } +- + % Say @foo, not \foo, in error messages. + @escapechar = `@@ + +- % These (along with & and #) are made active for url-breaking, so need +- % active definitions as the normal characters. +- @def@normaldot{.} +- @def@normalquest{?} +- @def@normalslash{/} +- + % These look ok in all fonts, so just make them not special. + % @hashchar{} gets its own user-level command, because of #line. + @catcode`@& = @other @def@normalamp{&} +--- 12010,12214 ---- + \catcode`\|=\other \def\normalverticalbar{|} + \catcode`\~=\other \def\normaltilde{~} + +! % Set catcodes for Texinfo file + +! % Active characters for printing the wanted glyph. + % Most of these we simply print from the \tt font, but for some, we can + % use math or other variants that look better in normal text. +! % + \catcode`\"=\active + \def\activedoublequote{{\tt\char34}} + \let"=\activedoublequote +! \catcode`\~=\active \def\activetilde{{\tt\char126}} \let~ = \activetilde +! \chardef\hatchar=`\^ +! \catcode`\^=\active \def\activehat{{\tt \hatchar}} \let^ = \activehat + + \catcode`\_=\active + \def_{\ifusingtt\normalunderscore\_} + \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } ++ \let\realunder=_ ++ ++ \catcode`\|=\active \def|{{\tt\char124}} + + \chardef \less=`\< +! \catcode`\<=\active \def\activeless{{\tt \less}}\let< = \activeless + \chardef \gtr=`\> +! \catcode`\>=\active \def\activegtr{{\tt \gtr}}\let> = \activegtr +! \catcode`\+=\active \def+{{\tt \char 43}} +! \catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix +! \catcode`\-=\active \let-=\normaldash +! +! +! % used for headline/footline in the output routine, in case the page +! % breaks in the middle of an @tex block. +! \def\texinfochars{% +! \let< = \activeless +! \let> = \activegtr +! \let~ = \activetilde +! \let^ = \activehat +! \setregularquotes +! \let\b = \strong +! \let\i = \smartitalic +! % in principle, all other definitions in \tex have to be undone too. +! } + + % Used sometimes to turn off (effectively) the active characters even after + % parsing them. + \def\turnoffactive{% +! \passthroughcharstrue +! \let-=\normaldash +! \let"=\normaldoublequote +! \let$=\normaldollar %$ font-lock fix +! \let+=\normalplus +! \let<=\normalless +! \let>=\normalgreater +! \let^=\normalcaret +! \let_=\normalunderscore +! \let|=\normalverticalbar +! \let~=\normaltilde + \otherbackslash ++ \setregularquotes ++ \unsepspaces + } + +! % If a .fmt file is being used, characters that might appear in a file +! % name cannot be active until we have parsed the command line. +! % So turn them off again, and have \loadconf turn them back on. +! \catcode`+=\other \catcode`\_=\other +! + + % \backslashcurfont outputs one backslash character in current font, + % as in \char`\\. + \global\chardef\backslashcurfont=`\\ + +! % Print a typewriter backslash. For math mode, we can't simply use +! % \backslashcurfont: the story here is that in math mode, the \char +! % of \backslashcurfont ends up printing the roman \ from the math symbol +! % font (because \char in math mode uses the \mathcode, and plain.tex +! % sets \mathcode`\\="026E). Hence we use an explicit \mathchar, +! % which is the decimal equivalent of "715c (class 7, e.g., use \fam; +! % ignored family value; char position "5C). We can't use " for the +! % usual hex value because it has already been made active. +! +! \def\ttbackslash{{\tt \ifmmode \mathchar29020 \else \backslashcurfont \fi}} +! \let\backslashchar = \ttbackslash % \backslashchar{} is for user documents. +! +! % These are made active for url-breaking, so need +! % active definitions as the normal characters. +! \def\normaldot{.} +! \def\normalquest{?} +! \def\normalslash{/} +! +! % \newlinesloadsconf - call \loadconf as soon as possible in the +! % file, e.g. at the first newline. +! % +! {\catcode`\^=7 +! \catcode`\^^M=13 +! \gdef\newlineloadsconf{% +! \catcode`\^^M=13 % +! \newlineloadsconfzz% +! } +! \gdef\newlineloadsconfzz#1^^M{% +! \def\c{\loadconf\c}% +! % Definition for the first newline read in the file +! \def ^^M{\loadconf}% +! % In case the first line has a whole-line or environment command on it +! \let\originalparsearg\parsearg% +! \def\parsearg{\loadconf\originalparsearg}% +! % +! % \startenvironment is in the expansion of commands defined with \envdef +! \let\originalstartenvironment\startenvironment% +! \def\startenvironment{\loadconf\startenvironment}% +! }} +! +! +! % Emergency active definition of newline, in case an active newline token +! % appears by mistake. +! {\catcode`\^=7 \catcode13=13% +! \gdef\enableemergencynewline{% +! \gdef^^M{% +! \par% +! %\par% +! }}} +! +! +! % \loadconf gets called at the beginning of every Texinfo file. +! % If texinfo.cnf is present on the system, read it. Useful for site-wide +! % @afourpaper, etc. Not opening texinfo.cnf directly in texinfo.tex +! % makes it possible to make a format file for Texinfo. +! % +! \gdef\loadconf{% +! \relax % Terminate the filename if running as "tex '&texinfo' FILE.texi". +! % +! % Turn off the definitions that trigger \loadconf +! \everyjobreset +! \catcode13=5 % regular end of line +! \enableemergencynewline +! \let\c=\comment +! \let\parsearg\originalparsearg +! \let\startenvironment\originalstartenvironment +! % +! % Also turn back on active characters that might appear in the input +! % file name, in case not using a pre-dumped format. +! \catcode`+=\active +! \catcode`\_=\active +! % +! \openin 1 texinfo.cnf +! \ifeof 1 \else \input texinfo.cnf \fi +! \closein 1 +! } +! +! % Redefine some control sequences to be controlled by the \ifdummies +! % and \ifindexnofonts switches. Do this at the end so that the control +! % sequences are all defined. +! \definedummies +! + +! +! +! \catcode`\@=0 +! +! % \realbackslash is an actual character `\' with catcode other. +! {\catcode`\\=\other @gdef@realbackslash{\}} +! +! % In Texinfo, backslash is an active character; it prints the backslash + % in fixed width font. + \catcode`\\=\active % @ for escape char from now on. + +! @let\ = @ttbackslash +! +! % If in a .fmt file, print the version number. +! % \eatinput stops the `\input texinfo' from showing up. +! % After that, `\' should revert to printing a backslash. +! % Turn on active characters that we couldn't do earlier because +! % they might have appeared in the input file name. +! % +! @everyjob{@message{[Texinfo version @texinfoversion]}% +! @global@let\ = @eatinput +! @catcode`+=@active @catcode`@_=@active} +! +! {@catcode`@^=7 @catcode`@^^M=13% +! @gdef@eatinput input texinfo#1^^M{@loadconf}} +! +! @def@everyjobreset{@ifx\@eatinput @let\ = @ttbackslash @fi} + + % \otherbackslash defines an active \ to be a literal `\' character with +! % catcode other. + @gdef@otherbackslash{@let\=@realbackslash} + + % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +! % the literal character `\'. + % + {@catcode`- = @active + @gdef@normalturnoffactive{% +! @turnoffactive +! @let\=@ttbackslash + } + } + + % Say @foo, not \foo, in error messages. + @escapechar = `@@ + + % These look ok in all fonts, so just make them not special. + % @hashchar{} gets its own user-level command, because of #line. + @catcode`@& = @other @def@normalamp{&} +*************** +*** 10061,10079 **** + @c Do this last of all since we use ` in the previous @catcode assignments. + @catcode`@'=@active + @catcode`@`=@active +- @markupsetuplqdefault +- @markupsetuprqdefault + + @c Local variables: +! @c eval: (add-hook 'write-file-hooks 'time-stamp) + @c page-delimiter: "^\\\\message" +- @c time-stamp-start: "def\\\\texinfoversion{" +- @c time-stamp-format: "%:y-%02m-%02d.%02H" +- @c time-stamp-end: "}" + @c End: + +! @c vim:sw=2: +! +! @ignore +! arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 +! @end ignore +--- 12223,12233 ---- + @c Do this last of all since we use ` in the previous @catcode assignments. + @catcode`@'=@active + @catcode`@`=@active + + @c Local variables: +! @c eval: (add-hook 'before-save-hook 'time-stamp nil t) +! @c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}" + @c page-delimiter: "^\\\\message" + @c End: + +! @newlineloadsconf +diff -crB gmp-6.3.0-orig/INSTALL gmp-6.3.0/INSTALL +*** gmp-6.3.0-orig/INSTALL 2023-07-29 16:42:16.000000000 +0300 +--- gmp-6.3.0/INSTALL 2025-08-28 16:19:50.857126192 +0300 +*************** +*** 1,80 **** +! Copyright 1996, 1997, 1999-2002, 2006 Free Software Foundation, Inc. + +! This file is part of the GNU MP Library. + +! The GNU MP Library is free software; you can redistribute it and/or modify +! it under the terms of either: + +! * the GNU Lesser General Public License as published by the Free +! Software Foundation; either version 3 of the License, or (at your +! option) any later version. +! +! or +! +! * the GNU General Public License as published by the Free Software +! Foundation; either version 2 of the License, or (at your option) any +! later version. +! +! or both in parallel, as here. +! +! The GNU MP Library is distributed in the hope that it will be useful, but +! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +! for more details. +! +! You should have received copies of the GNU General Public License and the +! GNU Lesser General Public License along with the GNU MP Library. If not, +! see https://www.gnu.org/licenses/. +! +! +! +! +! +! INSTALLING GNU MP +! ================= +! +! +! These instructions are only for the impatient. Others should read the install +! instructions in gmp.info. Use +! +! info -f doc/gmp.info +! +! from the gmp source directory. +! +! Here are some brief instructions on how to install GMP. First you need to +! compile. Since you're impatient, try this +! +! ./configure +! make +! make check <= VERY IMPORTANT!! +! +! If that fails, or you care about the performance of GMP, you need to read the +! full instructions in the chapter "Installing GMP" in the manual. +! +! You should not skip the "make check" part; the risk that the GMP sources are +! miscompiled are unfortunately quite high. And if they indeed are, "make check" +! is very likely to trigger the compiler-introduced bug. +! +! Optionally, you can install the library with the following command. This will +! be to /usr/local by default, and you'll probably need to be "root" to be able +! to write there. +! +! make install +! +! To create the printable documentation from the texinfo source, type "make +! gmp.dvi" or "make gmp.ps". This requires various "tex" commands. +! +! If you are new to GMP, it is a good idea you at least read the chapter "GMP +! Basics" in the manual. +! +! Some known build problems are noted in the "Installing GMP" chapter of +! the manual. Please report other problems to gmp-bugs@gmplib.org. +! +! The GMP web site is located here: https://gmplib.org/. +! +! +! ---------------- +! Local variables: +! mode: text +! fill-column: 78 +! End: +--- 1,380 ---- +! Installation Instructions +! ************************* + +! Basic Installation +! ================== + +! The following shell commands: + +! test -f configure || ./bootstrap +! ./configure +! make +! make install +! +! should configure, build, and install this package. The first line, +! which bootstraps, is intended for developers; when building from +! distribution tarballs it does nothing and can be skipped. A package +! might name the bootstrapping script differently; if the name is +! ‘autogen.sh’, for example, the first line should say ‘./autogen.sh’ +! instead of ‘./bootstrap’. +! +! The following more-detailed instructions are generic; see the +! ‘README’ file for instructions specific to this package. Some packages +! provide this ‘INSTALL’ file but do not implement all of the features +! documented below. The lack of an optional feature in a given package is +! not necessarily a bug. More recommendations for GNU packages can be +! found in the GNU Coding Standards. +! +! Many packages have scripts meant for developers instead of ordinary +! builders, as they may use developer tools that are less commonly +! installed, or they may access the network, which has privacy +! implications. These scripts attempt to bootstrap by building the +! ‘configure’ script and related files, possibly using developer tools or +! the network. Because the output of bootstrapping is system-independent, +! it is normally run by a package developer so that its output can be put +! into the distribution tarball and ordinary builders and users need not +! bootstrap. Some packages have commands like ‘./autopull.sh’ and +! ‘./autogen.sh’ that you can run instead of ‘./bootstrap’, for more +! fine-grained control over bootstrapping. +! +! The ‘configure’ script attempts to guess correct values for various +! system-dependent variables used during compilation. It uses those +! values to create a ‘Makefile’ in each directory of the package. It may +! also create one or more ‘.h’ files containing system-dependent +! definitions. Finally, it creates a script ‘config.status’ that you can +! run in the future to recreate the current configuration, and a file +! ‘config.log’ containing output useful for debugging ‘configure’. +! +! It can also use an optional file (typically called ‘config.cache’ and +! enabled with ‘--cache-file=config.cache’ or simply ‘-C’) that saves the +! results of its tests to speed up reconfiguring. Caching is disabled by +! default to prevent problems with accidental use of stale cache files. +! +! If you need to do unusual things to compile the package, please try +! to figure out how ‘configure’ could check whether to do them, and mail +! diffs or instructions to the address given in the ‘README’ so they can +! be considered for the next release. If you are using the cache, and at +! some point ‘config.cache’ contains results you don’t want to keep, you +! may remove or edit it. +! +! The ‘autoconf’ program generates ‘configure’ from the file +! ‘configure.ac’. Normally you should edit ‘configure.ac’ instead of +! editing ‘configure’ directly. +! +! The simplest way to compile this package is: +! +! 1. ‘cd’ to the directory containing the package’s source code. +! +! 2. If this is a developer checkout and file ‘configure’ does not yet +! exist, run the bootstrapping script (typically ‘./bootstrap’ or +! ‘./autogen.sh’) to bootstrap and create the file. You may need +! special developer tools and network access to bootstrap, and the +! network access may have privacy implications. +! +! 3. Type ‘./configure’ to configure the package for your system. This +! might take a while. While running, ‘configure’ prints messages +! telling which features it is checking for. +! +! 4. Type ‘make’ to compile the package. +! +! 5. Optionally, type ‘make check’ to run any self-tests that come with +! the package, generally using the just-built uninstalled binaries. +! +! 6. Type ‘make install’ to install the programs and any data files and +! documentation. When installing into a prefix owned by root, it is +! recommended that the package be configured and built as a regular +! user, and only the ‘make install’ phase executed with root +! privileges. +! +! 7. Optionally, type ‘make installcheck’ to repeat any self-tests, but +! this time using the binaries in their final installed location. +! This target does not install anything. Running this target as a +! regular user, particularly if the prior ‘make install’ required +! root privileges, verifies that the installation completed +! correctly. +! +! 8. You can remove the program binaries and object files from the +! source code directory by typing ‘make clean’. To also remove the +! files that ‘configure’ created (so you can compile the package for +! a different kind of computer), type ‘make distclean’. There is +! also a ‘make maintainer-clean’ target, but that is intended mainly +! for the package’s developers. If you use it, you may have to +! bootstrap again. +! +! 9. If the package follows the GNU Coding Standards, you can type ‘make +! uninstall’ to remove the installed files. +! +! Installation Prerequisites +! ========================== +! +! Installation requires a POSIX-like environment with a shell and at +! least the following standard utilities: +! +! awk cat cp diff echo expr false ls mkdir mv printf pwd rm rmdir sed +! sort test tr +! +! This package’s installation may need other standard utilities such as +! ‘grep’, ‘make’, ‘sleep’ and ‘touch’, along with compilers like ‘gcc’. +! +! Compilers and Options +! ===================== +! +! Some systems require unusual options for compilation or linking that +! the ‘configure’ script does not know about. Run ‘./configure --help’ +! for details on some of the pertinent environment variables. +! +! You can give ‘configure’ initial values for configuration parameters +! by setting variables in the command line or in the environment. Here is +! an example: +! +! ./configure CC=gcc CFLAGS=-g LIBS=-lposix +! +! See “Defining Variables” for more details. +! +! Compiling For Multiple Architectures +! ==================================== +! +! You can compile the package for more than one kind of computer at the +! same time, by placing the object files for each system in their own +! directory. To do this, you can use GNU ‘make’. ‘cd’ to the directory +! where you want the object files and executables to go and run the +! ‘configure’ script. ‘configure’ automatically checks for the source +! code in the directory that ‘configure’ is in and in ‘..’. This is known +! as a “VPATH” build. +! +! With a non-GNU ‘make’, it is safer to compile the package for one +! system at a time in the source code directory. After you have installed +! the package for one system, use ‘make distclean’ before reconfiguring +! for another system. +! +! Some platforms, notably macOS, support “fat” or “universal” binaries, +! where a single binary can execute on different architectures. On these +! platforms you can configure and compile just once, with options specific +! to that platform. +! +! Installation Names +! ================== +! +! By default, ‘make install’ installs the package’s commands under +! ‘/usr/local/bin’, include files under ‘/usr/local/include’, etc. You +! can specify an installation prefix other than ‘/usr/local’ by giving +! ‘configure’ the option ‘--prefix=PREFIX’, where PREFIX must be an +! absolute file name. +! +! You can specify separate installation prefixes for +! architecture-specific files and architecture-independent files. If you +! pass the option ‘--exec-prefix=PREFIX’ to ‘configure’, the package uses +! PREFIX as the prefix for installing programs and libraries. +! Documentation and other data files still use the regular prefix. +! +! In addition, if you use an unusual directory layout you can give +! options like ‘--bindir=DIR’ to specify different values for particular +! kinds of files. Run ‘configure --help’ for a list of the directories +! you can set and what kinds of files go in them. In general, the default +! for these options is expressed in terms of ‘${prefix}’, so that +! specifying just ‘--prefix’ will affect all of the other directory +! specifications that were not explicitly provided. +! +! The most portable way to affect installation locations is to pass the +! correct locations to ‘configure’; however, many packages provide one or +! both of the following shortcuts of passing variable assignments to the +! ‘make install’ command line to change installation locations without +! having to reconfigure or recompile. +! +! The first method involves providing an override variable for each +! affected directory. For example, ‘make install +! prefix=/alternate/directory’ will choose an alternate location for all +! directory configuration variables that were expressed in terms of +! ‘${prefix}’. Any directories that were specified during ‘configure’, +! but not in terms of ‘${prefix}’, must each be overridden at install time +! for the entire installation to be relocated. The approach of makefile +! variable overrides for each directory variable is required by the GNU +! Coding Standards, and ideally causes no recompilation. However, some +! platforms have known limitations with the semantics of shared libraries +! that end up requiring recompilation when using this method, particularly +! noticeable in packages that use GNU Libtool. +! +! The second method involves providing the ‘DESTDIR’ variable. For +! example, ‘make install DESTDIR=/alternate/directory’ will prepend +! ‘/alternate/directory’ before all installation names. The approach of +! ‘DESTDIR’ overrides is not required by the GNU Coding Standards, and +! does not work on platforms that have drive letters. On the other hand, +! it does better at avoiding recompilation issues, and works well even +! when some directory options were not specified in terms of ‘${prefix}’ +! at ‘configure’ time. +! +! Optional Features +! ================= +! +! If the package supports it, you can cause programs to be installed +! with an extra prefix or suffix on their names by giving ‘configure’ the +! option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. +! +! Some packages pay attention to ‘--enable-FEATURE’ and +! ‘--disable-FEATURE’ options to ‘configure’, where FEATURE indicates an +! optional part of the package. They may also pay attention to +! ‘--with-PACKAGE’ and ‘--without-PACKAGE’ options, where PACKAGE is +! something like ‘gnu-ld’. ‘./configure --help’ should mention the +! ‘--enable-...’ and ‘--with-...’ options that the package recognizes. +! +! Some packages offer the ability to configure how verbose the +! execution of ‘make’ will be. For these packages, running ‘./configure +! --enable-silent-rules’ sets the default to minimal output, which can be +! overridden with ‘make V=1’; while running ‘./configure +! --disable-silent-rules’ sets the default to verbose, which can be +! overridden with ‘make V=0’. +! +! Specifying a System Type +! ======================== +! +! By default ‘configure’ builds for the current system. To create +! binaries that can run on a different system type, specify a +! ‘--host=TYPE’ option along with compiler variables that specify how to +! generate object code for TYPE. For example, to create binaries intended +! to run on a 64-bit ARM processor: +! +! ./configure --host=aarch64-linux-gnu \ +! CC=aarch64-linux-gnu-gcc \ +! CXX=aarch64-linux-gnu-g++ +! +! If done on a machine that can execute these binaries (e.g., via +! ‘qemu-aarch64’, ‘$QEMU_LD_PREFIX’, and Linux’s ‘binfmt_misc’ +! capability), the build behaves like a native build. Otherwise it is a +! cross-build: ‘configure’ will make cross-compilation guesses instead of +! running test programs, and ‘make check’ will not work. +! +! A system type can either be a short name like ‘mingw64’, or a +! canonical name like ‘x86_64-pc-linux-gnu’. Canonical names have the +! form CPU-COMPANY-SYSTEM where SYSTEM is either OS or KERNEL-OS. To +! canonicalize and validate a system type, you can run the command +! ‘config.sub’, which is often squirreled away in a subdirectory like +! ‘build-aux’. For example: +! +! $ build-aux/config.sub arm64-linux +! aarch64-unknown-linux-gnu +! $ build-aux/config.sub riscv-lnx +! Invalid configuration 'riscv-lnx': OS 'lnx' not recognized +! +! You can look at the ‘config.sub’ file to see which types are recognized. +! If the file is absent, this package does not need the system type. +! +! If ‘configure’ fails with the diagnostic “cannot guess build type”. +! ‘config.sub’ did not recognize your system’s type. In this case, first +! fetch the newest versions of these files from the GNU config package +! (https://savannah.gnu.org/projects/config). If that fixes things, +! please report it to the maintainers of the package containing +! ‘configure’. Otherwise, you can try the configure option ‘--build=TYPE’ +! where TYPE comes close to your system type; also, please report the +! problem to . +! +! For more details about configuring system types, see the Autoconf +! documentation. +! +! Sharing Defaults +! ================ +! +! If you want to set default values for ‘configure’ scripts to share, +! you can create a site shell script called ‘config.site’ that gives +! default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. +! ‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then +! ‘PREFIX/etc/config.site’ if it exists. Or, you can set the +! ‘CONFIG_SITE’ environment variable to the location of the site script. +! A warning: not all ‘configure’ scripts look for a site script. +! +! Defining Variables +! ================== +! +! Variables not defined in a site shell script can be set in the +! environment passed to ‘configure’. However, some packages may run +! configure again during the build, and the customized values of these +! variables may be lost. In order to avoid this problem, you should set +! them in the ‘configure’ command line, using ‘VAR=value’. For example: +! +! ./configure CC=/usr/local2/bin/gcc +! +! causes the specified ‘gcc’ to be used as the C compiler (unless it is +! overridden in the site shell script). +! +! Unfortunately, this technique does not work for ‘CONFIG_SHELL’ due to an +! Autoconf limitation. Until the limitation is lifted, you can use this +! workaround: +! +! CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash +! +! ‘configure’ Invocation +! ====================== +! +! ‘configure’ recognizes the following options to control how it +! operates. +! +! ‘--help’ +! ‘-h’ +! Print a summary of all of the options to ‘configure’, and exit. +! +! ‘--help=short’ +! ‘--help=recursive’ +! Print a summary of the options unique to this package’s +! ‘configure’, and exit. The ‘short’ variant lists options used only +! in the top level, while the ‘recursive’ variant lists options also +! present in any nested packages. +! +! ‘--version’ +! ‘-V’ +! Print the version of Autoconf used to generate the ‘configure’ +! script, and exit. +! +! ‘--cache-file=FILE’ +! Enable the cache: use and save the results of the tests in FILE, +! traditionally ‘config.cache’. FILE defaults to ‘/dev/null’ to +! disable caching. +! +! ‘--config-cache’ +! ‘-C’ +! Alias for ‘--cache-file=config.cache’. +! +! ‘--srcdir=DIR’ +! Look for the package’s source code in directory DIR. Usually +! ‘configure’ can determine that directory automatically. +! +! ‘--prefix=DIR’ +! Use DIR as the installation prefix. See “Installation Names” for +! more details, including other options available for fine-tuning the +! installation locations. +! +! ‘--host=TYPE’ +! Build binaries for system TYPE. See “Specifying a System Type”. +! +! ‘--enable-FEATURE’ +! ‘--disable-FEATURE’ +! Enable or disable the optional FEATURE. See “Optional Features”. +! +! ‘--with-PACKAGE’ +! ‘--without-PACKAGE’ +! Use or omit PACKAGE when building. See “Optional Features”. +! +! ‘--quiet’ +! ‘--silent’ +! ‘-q’ +! Do not print messages saying which checks are being made. To +! suppress all normal output, redirect it to ‘/dev/null’ (any error +! messages will still be shown). +! +! ‘--no-create’ +! ‘-n’ +! Run the configure checks, but stop before creating any output +! files. +! +! ‘configure’ also recognizes several environment variables, and accepts +! some other, less widely useful, options. Run ‘configure --help’ for +! more details. +! +! Copyright notice +! ================ +! +! Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2025 Free Software +! Foundation, Inc. +! +! Copying and distribution of this file, with or without modification, +! are permitted in any medium without royalty provided the copyright +! notice and this notice are preserved. This file is offered as-is, +! without warranty of any kind. +diff -crB gmp-6.3.0-orig/install-sh gmp-6.3.0/install-sh +*** gmp-6.3.0-orig/install-sh 2023-07-29 16:42:25.000000000 +0300 +--- gmp-6.3.0/install-sh 2025-08-28 16:19:50.851193245 +0300 +*************** +*** 1,7 **** + #!/bin/sh + # install - install a program, script, or datafile + +! scriptversion=2013-12-25.23; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +--- 1,7 ---- + #!/bin/sh + # install - install a program, script, or datafile + +! scriptversion=2025-06-18.21; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +*************** +*** 69,74 **** +--- 69,79 ---- + # Desired mode of installed file. + mode=0755 + ++ # Create dirs (including intermediate dirs) using mode 755. ++ # This is like GNU 'install' as of coreutils 8.32 (2020). ++ mkdir_umask=22 ++ ++ backupsuffix= + chgrpcmd= + chmodcmd=$chmodprog + chowncmd= +*************** +*** 99,117 **** + --version display version info and exit. + + -c (ignored) +! -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + + Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +! " + + while test $# -ne 0; do + case $1 in +--- 104,132 ---- + --version display version info and exit. + + -c (ignored) +! -C install only if different (preserve data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. ++ -p pass -p to $cpprog. + -s $stripprog installed files. ++ -S SUFFIX attempt to back up existing files, with suffix SUFFIX. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + + Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +! +! By default, rm is invoked with -f; when overridden with RMPROG, +! it's up to you to specify -f if you want it. +! +! If -S is not specified, no backups are attempted. +! +! Report bugs to . +! GNU Automake home page: . +! General help using GNU software: ." + + while test $# -ne 0; do + case $1 in +*************** +*** 137,144 **** +--- 152,164 ---- + -o) chowncmd="$chownprog $2" + shift;; + ++ -p) cpprog="$cpprog -p";; ++ + -s) stripcmd=$stripprog;; + ++ -S) backupsuffix="$2" ++ shift;; ++ + -t) + is_target_a_directory=always + dst_arg=$2 +*************** +*** 150,156 **** + + -T) is_target_a_directory=never;; + +! --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; +--- 170,176 ---- + + -T) is_target_a_directory=never;; + +! --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;; + + --) shift + break;; +*************** +*** 255,260 **** +--- 275,284 ---- + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? ++ # Don't chown directories that already exist. ++ if test $dstdir_status = 0; then ++ chowncmd="" ++ fi + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command +*************** +*** 271,285 **** + fi + dst=$dst_arg + +! # If destination is a directory, append the input filename; won't work +! # if double slashes aren't ignored. + if test -d "$dst"; then + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst +! dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + dstdir=`dirname "$dst"` +--- 295,312 ---- + fi + dst=$dst_arg + +! # If destination is a directory, append the input filename. + if test -d "$dst"; then + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst +! dstbase=`basename "$src"` +! case $dst in +! */) dst=$dst$dstbase;; +! *) dst=$dst/$dstbase;; +! esac + dstdir_status=0 + else + dstdir=`dirname "$dst"` +*************** +*** 288,314 **** + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') +- # Create intermediate dirs using mode 755 as modified by the umask. +- # This is like FreeBSD 'install' as of 1997-10-28. +- umask=`umask` +- case $stripcmd.$umask in +- # Optimize common cases. +- *[2367][2367]) mkdir_umask=$umask;; +- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; +- +- *[0-7]) +- mkdir_umask=`expr $umask + 22 \ +- - $umask % 100 % 40 + $umask % 20 \ +- - $umask % 10 % 4 + $umask % 2 +- `;; +- *) mkdir_umask=$umask,go-w;; +- esac +- + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then +--- 315,330 ---- + fi + fi + ++ case $dstdir in ++ */) dstdirslash=$dstdir;; ++ *) dstdirslash=$dstdir/;; ++ esac ++ + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then +*************** +*** 318,360 **** + fi + + posix_mkdir=false +! case $umask in +! *[123567][0-7][0-7]) +! # POSIX mkdir -p sets u+wx bits regardless of umask, which +! # is incompatible with FreeBSD 'install' when (umask & 300) != 0. +! ;; +! *) +! tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +! trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 +! +! if (umask $mkdir_umask && +! exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 +! then +! if test -z "$dir_arg" || { +! # Check for POSIX incompatibilities with -m. +! # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or +! # other-writable bit of parent directory when it shouldn't. +! # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +! ls_ld_tmpdir=`ls -ld "$tmpdir"` +! case $ls_ld_tmpdir in +! d????-?r-*) different_mode=700;; +! d????-?--*) different_mode=755;; +! *) false;; +! esac && +! $mkdirprog -m$different_mode -p -- "$tmpdir" && { +! ls_ld_tmpdir_1=`ls -ld "$tmpdir"` +! test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" +! } +! } +! then posix_mkdir=: +! fi +! rmdir "$tmpdir/d" "$tmpdir" +! else +! # Remove any dirs left behind by ancient mkdir implementations. +! rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null +! fi +! trap '' 0;; +! esac;; + esac + + if +--- 334,382 ---- + fi + + posix_mkdir=false +! # The $RANDOM variable is not portable (e.g., dash). Use it +! # here however when possible just to lower collision chance. +! tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +! +! trap ' +! ret=$? +! rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null +! exit $ret +! ' 0 +! +! # Because "mkdir -p" follows existing symlinks and we likely work +! # directly in world-writable /tmp, make sure that the '$tmpdir' +! # directory is successfully created first before we actually test +! # 'mkdir -p'. +! if (umask $mkdir_umask && +! $mkdirprog $mkdir_mode "$tmpdir" && +! exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 +! then +! if test -z "$dir_arg" || { +! # Check for POSIX incompatibility with -m. +! # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or +! # other-writable bit of parent directory when it shouldn't. +! # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +! test_tmpdir="$tmpdir/a" +! ls_ld_tmpdir=`ls -ld "$test_tmpdir"` +! case $ls_ld_tmpdir in +! d????-?r-*) different_mode=700;; +! d????-?--*) different_mode=755;; +! *) false;; +! esac && +! $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { +! ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` +! test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" +! } +! } +! then posix_mkdir=: +! fi +! rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" +! else +! # Remove any dirs left behind by ancient mkdir implementations. +! rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null +! fi +! trap '' 0;; + esac + + if +*************** +*** 365,371 **** + then : + else + +! # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + +--- 387,393 ---- + then : + else + +! # mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + +*************** +*** 394,400 **** + prefixes= + else + if $posix_mkdir; then +! (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 +--- 416,422 ---- + prefixes= + else + if $posix_mkdir; then +! (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 +*************** +*** 427,440 **** + else + + # Make a couple of temp file names in the proper directory. +! dsttmp=$dstdir/_inst.$$_ +! rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. +! (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # +--- 449,473 ---- + else + + # Make a couple of temp file names in the proper directory. +! dsttmp=${dstdirslash}_inst.$$_ +! rmtmp=${dstdirslash}_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. +! (umask $cp_umask && +! { test -z "$stripcmd" || { +! # Create $dsttmp read-write so that cp doesn't create it read-only, +! # which would cause strip to fail. +! if test -z "$doit"; then +! : >"$dsttmp" # No need to fork-exec 'touch'. +! else +! $doit touch "$dsttmp" +! fi +! } +! } && +! $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # +*************** +*** 460,465 **** +--- 493,505 ---- + then + rm -f "$dsttmp" + else ++ # If $backupsuffix is set, and the file being installed ++ # already exists, attempt a backup. Don't worry if it fails, ++ # e.g., if mv doesn't support -f. ++ if test -n "$backupsuffix" && test -f "$dst"; then ++ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null ++ fi ++ + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + +*************** +*** 474,482 **** + # file should still install successfully. + { + test ! -f "$dst" || +! $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && +! { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 +--- 514,522 ---- + # file should still install successfully. + { + test ! -f "$dst" || +! $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && +! { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 +*************** +*** 493,501 **** + done + + # Local variables: +! # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" +! # time-stamp-format: "%:y-%02m-%02d.%02H" +! # time-stamp-time-zone: "UTC" + # time-stamp-end: "; # UTC" + # End: +--- 533,541 ---- + done + + # Local variables: +! # eval: (add-hook 'before-save-hook 'time-stamp nil t) + # time-stamp-start: "scriptversion=" +! # time-stamp-format: "%Y-%02m-%02d.%02H" +! # time-stamp-time-zone: "UTC0" + # time-stamp-end: "; # UTC" + # End: +diff -crB gmp-6.3.0-orig/ltmain.sh gmp-6.3.0/ltmain.sh +*** gmp-6.3.0-orig/ltmain.sh 2023-07-29 16:42:25.000000000 +0300 +--- gmp-6.3.0/ltmain.sh 2025-08-28 16:19:48.942012924 +0300 +*************** +*** 1,12 **** +! #! /bin/sh + ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +! ## by inline-source v2014-01-03.01 + +! # libtool (GNU libtool) 2.4.6 + # Provide generalized library-building support services. + # Written by Gordon Matzigkeit , 1996 + +! # Copyright (C) 1996-2015 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +--- 1,12 ---- +! #! /usr/bin/env sh + ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +! ## by inline-source v2019-02-19.15 + +! # libtool (GNU libtool) 2.5.4.23-5b58 + # Provide generalized library-building support services. + # Written by Gordon Matzigkeit , 1996 + +! # Copyright (C) 1996-2019, 2021-2025 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +*************** +*** 31,38 **** + + PROGRAM=libtool + PACKAGE=libtool +! VERSION=2.4.6 +! package_revision=2.4.6 + + + ## ------ ## +--- 31,38 ---- + + PROGRAM=libtool + PACKAGE=libtool +! VERSION=2.5.4.23-5b58 +! package_revision=2.5.4.23 + + + ## ------ ## +*************** +*** 64,97 **** + # libraries, which are installed to $pkgauxdir. + + # Set a version string for this script. +! scriptversion=2015-01-20.17; # UTC + + # General shell script boiler plate, and helper functions. + # Written by Gary V. Vaughan, 2004 + +! # Copyright (C) 2004-2015 Free Software Foundation, Inc. +! # This is free software; see the source for copying conditions. There is NO +! # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! +! # This program is free software; you can redistribute it and/or modify +! # it under the terms of the GNU General Public License as published by +! # the Free Software Foundation; either version 3 of the License, or +! # (at your option) any later version. +! +! # As a special exception to the GNU General Public License, if you distribute +! # this file as part of a program or library that is built using GNU Libtool, +! # you may include this file under the same distribution terms that you use +! # for the rest of that program. +! +! # This program is distributed in the hope that it will be useful, +! # but WITHOUT ANY WARRANTY; without even the implied warranty of +! # MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +! # General Public License for more details. +! +! # You should have received a copy of the GNU General Public License +! # along with this program. If not, see . + +! # Please report bugs or propose patches to gary@gnu.org. + + + ## ------ ## +--- 64,88 ---- + # libraries, which are installed to $pkgauxdir. + + # Set a version string for this script. +! scriptversion=2019-02-19.15; # UTC + + # General shell script boiler plate, and helper functions. + # Written by Gary V. Vaughan, 2004 + +! # This is free software. There is NO warranty; not even for +! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! # +! # Copyright (C) 2004-2019, 2021, 2023-2024 Bootstrap Authors +! # +! # This file is dual licensed under the terms of the MIT license +! # , and GPL version 2 or later +! # . You must apply one of +! # these licenses when using or redistributing this software or any of +! # the files within it. See the URLs above, or the file `LICENSE` +! # included in the Bootstrap distribution for the full license texts. + +! # Please report bugs or propose patches to: +! # + + + ## ------ ## +*************** +*** 139,147 **** + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" + fi" + done +! +! # CDPATH. +! (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + # Make sure IFS has a sensible default + sp=' ' +--- 130,141 ---- + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" + fi" + done +! # These NLS vars are set unconditionally (bootstrap issue #24). Unset those +! # in case the environment reset is needed later and the $save_* variant is not +! # defined (see the code above). +! LC_ALL=C +! LANGUAGE=C +! export LANGUAGE LC_ALL + + # Make sure IFS has a sensible default + sp=' ' +*************** +*** 149,155 **** + ' + IFS="$sp $nl" + +! # There are apparently some retarded systems that use ';' as a PATH separator! + if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +--- 143,149 ---- + ' + IFS="$sp $nl" + +! # There are apparently some systems that use ';' as a PATH separator! + if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +*************** +*** 159,164 **** +--- 153,178 ---- + fi + + ++ # func_unset VAR ++ # -------------- ++ # Portably unset VAR. ++ # In some shells, an 'unset VAR' statement leaves a non-zero return ++ # status if VAR is already unset, which might be problematic if the ++ # statement is used at the end of a function (thus poisoning its return ++ # value) or when 'set -e' is active (causing even a spurious abort of ++ # the script in this case). ++ func_unset () ++ { ++ { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } ++ } ++ ++ ++ # Make sure CDPATH doesn't cause `cd` commands to output the target dir. ++ func_unset CDPATH ++ ++ # Make sure ${,E,F}GREP behave sanely. ++ func_unset GREP_OPTIONS ++ + + ## ------------------------- ## + ## Locate command utilities. ## +*************** +*** 259,265 **** + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + +! func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result + } +--- 273,279 ---- + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + +! func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" + rm -f conftest.sed + SED=$func_path_progs_result + } +*************** +*** 295,301 **** + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + +! func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result + } + +--- 309,315 ---- + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + +! func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" + GREP=$func_path_progs_result + } + +*************** +*** 360,365 **** +--- 374,408 ---- + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" + ++ # require_check_ifs_backslash ++ # --------------------------- ++ # Check if we can use backslash as IFS='\' separator, and set ++ # $check_ifs_backshlash_broken to ':' or 'false'. ++ require_check_ifs_backslash=func_require_check_ifs_backslash ++ func_require_check_ifs_backslash () ++ { ++ _G_save_IFS=$IFS ++ IFS='\' ++ _G_check_ifs_backshlash='a\\b' ++ for _G_i in $_G_check_ifs_backshlash ++ do ++ case $_G_i in ++ a) ++ check_ifs_backshlash_broken=false ++ ;; ++ '') ++ break ++ ;; ++ *) ++ check_ifs_backshlash_broken=: ++ break ++ ;; ++ esac ++ done ++ IFS=$_G_save_IFS ++ require_check_ifs_backslash=: ++ } ++ + + ## ----------------- ## + ## Global variables. ## +*************** +*** 546,552 **** + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is +! # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes +--- 589,595 ---- + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is +! # usable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes +*************** +*** 580,595 **** + { + $debug_cmd + +! func_quote_for_eval "$2" +! eval "$1+=\\ \$func_quote_for_eval_result" + }' + else + func_append_quoted () + { + $debug_cmd + +! func_quote_for_eval "$2" +! eval "$1=\$$1\\ \$func_quote_for_eval_result" + } + fi + +--- 623,638 ---- + { + $debug_cmd + +! func_quote_arg pretty "$2" +! eval "$1+=\\ \$func_quote_arg_result" + }' + else + func_append_quoted () + { + $debug_cmd + +! func_quote_arg pretty "$2" +! eval "$1=\$$1\\ \$func_quote_arg_result" + } + fi + +*************** +*** 696,702 **** + # to NONDIR_REPLACEMENT. + # value returned in "$func_dirname_result" + # basename: Compute filename of FILE. +! # value retuned in "$func_basename_result" + # For efficiency, we do not delegate to the functions above but instead + # duplicate the functionality here. + eval 'func_dirname_and_basename () +--- 739,745 ---- + # to NONDIR_REPLACEMENT. + # value returned in "$func_dirname_result" + # basename: Compute filename of FILE. +! # value returned in "$func_basename_result" + # For efficiency, we do not delegate to the functions above but instead + # duplicate the functionality here. + eval 'func_dirname_and_basename () +*************** +*** 854,860 **** + # While some portion of DIR does not yet exist... + while test ! -d "$_G_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited +! # list incase some portion of path contains whitespace. + _G_dir_list=$_G_directory_path:$_G_dir_list + + # If the last portion added has no slash in it, the list is done +--- 897,903 ---- + # While some portion of DIR does not yet exist... + while test ! -d "$_G_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited +! # list in case some portion of path contains whitespace. + _G_dir_list=$_G_directory_path:$_G_dir_list + + # If the last portion added has no slash in it, the list is done +*************** +*** 1091,1175 **** + } + + +! # func_quote_for_eval ARG... +! # -------------------------- +! # Aesthetically quote ARGs to be evaled later. +! # This function returns two values: +! # i) func_quote_for_eval_result +! # double-quoted, suitable for a subsequent eval +! # ii) func_quote_for_eval_unquoted_result +! # has all characters that are still active within double +! # quotes backslashified. +! func_quote_for_eval () + { + $debug_cmd + +! func_quote_for_eval_unquoted_result= +! func_quote_for_eval_result= +! while test 0 -lt $#; do +! case $1 in +! *[\\\`\"\$]*) +! _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; +! *) +! _G_unquoted_arg=$1 ;; +! esac +! if test -n "$func_quote_for_eval_unquoted_result"; then +! func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" +! else +! func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + +! case $_G_unquoted_arg in +! # Double-quote args containing shell metacharacters to delay +! # word splitting, command substitution and variable expansion +! # for a subsequent eval. +! # Many Bourne shells cannot handle close brackets correctly +! # in scan sets, so we specify it separately. +! *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +! _G_quoted_arg=\"$_G_unquoted_arg\" + ;; +! *) +! _G_quoted_arg=$_G_unquoted_arg +! ;; + esac +! +! if test -n "$func_quote_for_eval_result"; then +! func_append func_quote_for_eval_result " $_G_quoted_arg" +! else +! func_append func_quote_for_eval_result "$_G_quoted_arg" +! fi +! shift + done + } + + +! # func_quote_for_expand ARG +! # ------------------------- +! # Aesthetically quote ARG to be evaled later; same as above, +! # but do not quote variable references. +! func_quote_for_expand () +! { +! $debug_cmd + +! case $1 in +! *[\\\`\"]*) +! _G_arg=`$ECHO "$1" | $SED \ +! -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; +! *) +! _G_arg=$1 ;; + esac + +! case $_G_arg in +! # Double-quote args containing shell metacharacters to delay +! # word splitting and command substitution for a subsequent eval. +! # Many Bourne shells cannot handle close brackets correctly +! # in scan sets, so we specify it separately. +! *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +! _G_arg=\"$_G_arg\" + ;; + esac + +! func_quote_for_expand_result=$_G_arg + } + + +--- 1134,1336 ---- + } + + +! # func_quote_portable EVAL ARG +! # ---------------------------- +! # Internal function to portably implement func_quote_arg. Note that we still +! # keep attention to performance here so we as much as possible try to avoid +! # calling sed binary (so far O(N) complexity as long as func_append is O(1)). +! func_quote_portable () + { + $debug_cmd + +! $require_check_ifs_backslash +! +! func_quote_portable_result=$2 +! +! # one-time-loop (easy break) +! while true +! do +! if $1; then +! func_quote_portable_result=`$ECHO "$2" | $SED \ +! -e "$sed_double_quote_subst" -e "$sed_double_backslash"` +! break + fi + +! # Quote for eval. +! case $func_quote_portable_result in +! *[\\\`\"\$]*) +! # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string +! # contains the shell wildcard characters. +! case $check_ifs_backshlash_broken$func_quote_portable_result in +! :*|*[\[\*\?]*) +! func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ +! | $SED "$sed_quote_subst"` +! break +! ;; +! esac +! +! func_quote_portable_old_IFS=$IFS +! for _G_char in '\' '`' '"' '$' +! do +! # STATE($1) PREV($2) SEPARATOR($3) +! set start "" "" +! func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy +! IFS=$_G_char +! for _G_part in $func_quote_portable_result +! do +! case $1 in +! quote) +! func_append func_quote_portable_result "$3$2" +! set quote "$_G_part" "\\$_G_char" +! ;; +! start) +! set first "" "" +! func_quote_portable_result= +! ;; +! first) +! set quote "$_G_part" "" +! ;; +! esac +! done +! done +! IFS=$func_quote_portable_old_IFS + ;; +! *) ;; + esac +! break + done ++ ++ func_quote_portable_unquoted_result=$func_quote_portable_result ++ case $func_quote_portable_result in ++ # double-quote args containing shell metacharacters to delay ++ # word splitting, command substitution and variable expansion ++ # for a subsequent eval. ++ # many bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ func_quote_portable_result=\"$func_quote_portable_result\" ++ ;; ++ esac + } + + +! # func_quotefast_eval ARG +! # ----------------------- +! # Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +! # but optimized for speed. Result is stored in $func_quotefast_eval. +! if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then +! printf -v _GL_test_printf_tilde %q '~' +! if test '\~' = "$_GL_test_printf_tilde"; then +! func_quotefast_eval () +! { +! printf -v func_quotefast_eval_result %q "$1" +! } +! else +! # Broken older Bash implementations. Make those faster too if possible. +! func_quotefast_eval () +! { +! case $1 in +! '~'*) +! func_quote_portable false "$1" +! func_quotefast_eval_result=$func_quote_portable_result +! ;; +! *) +! printf -v func_quotefast_eval_result %q "$1" +! ;; +! esac +! } +! fi +! else +! func_quotefast_eval () +! { +! func_quote_portable false "$1" +! func_quotefast_eval_result=$func_quote_portable_result +! } +! fi + +! +! # func_quote_arg MODEs ARG +! # ------------------------ +! # Quote one ARG to be evaled later. MODEs argument may contain zero or more +! # specifiers listed below separated by ',' character. This function returns two +! # values: +! # i) func_quote_arg_result +! # double-quoted (when needed), suitable for a subsequent eval +! # ii) func_quote_arg_unquoted_result +! # has all characters that are still active within double +! # quotes backslashified. Available only if 'unquoted' is specified. +! # +! # Available modes: +! # ---------------- +! # 'eval' (default) +! # - escape shell special characters +! # 'expand' +! # - the same as 'eval'; but do not quote variable references +! # 'pretty' +! # - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +! # be used later in func_quote to get output like: 'echo "a b"' instead +! # of 'echo a\ b'. This is slower than default on some shells. +! # 'unquoted' +! # - produce also $func_quote_arg_unquoted_result which does not contain +! # wrapping double-quotes. +! # +! # Examples for 'func_quote_arg pretty,unquoted string': +! # +! # string | *_result | *_unquoted_result +! # ------------+-----------------------+------------------- +! # " | \" | \" +! # a b | "a b" | a b +! # "a b" | "\"a b\"" | \"a b\" +! # * | "*" | * +! # z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +! # +! # Examples for 'func_quote_arg pretty,unquoted,expand string': +! # +! # string | *_result | *_unquoted_result +! # --------------+---------------------+-------------------- +! # z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +! func_quote_arg () +! { +! _G_quote_expand=false +! case ,$1, in +! *,expand,*) +! _G_quote_expand=: +! ;; + esac + +! case ,$1, in +! *,pretty,*|*,expand,*|*,unquoted,*) +! func_quote_portable $_G_quote_expand "$2" +! func_quote_arg_result=$func_quote_portable_result +! func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result +! ;; +! *) +! # Faster quote-for-eval for some shells. +! func_quotefast_eval "$2" +! func_quote_arg_result=$func_quotefast_eval_result + ;; + esac ++ } ++ + +! # func_quote MODEs ARGs... +! # ------------------------ +! # Quote all ARGs to be evaled later and join them into single command. See +! # func_quote_arg's description for more info. +! func_quote () +! { +! $debug_cmd +! _G_func_quote_mode=$1 ; shift +! func_quote_result= +! while test 0 -lt $#; do +! func_quote_arg "$_G_func_quote_mode" "$1" +! if test -n "$func_quote_result"; then +! func_append func_quote_result " $func_quote_arg_result" +! else +! func_append func_quote_result "$func_quote_arg_result" +! fi +! shift +! done + } + + +*************** +*** 1215,1222 **** + _G_cmd=$1 + _G_fail_exp=${2-':'} + +! func_quote_for_expand "$_G_cmd" +! eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" +--- 1376,1383 ---- + _G_cmd=$1 + _G_fail_exp=${2-':'} + +! func_quote_arg pretty,expand "$_G_cmd" +! eval "func_notquiet $func_quote_arg_result" + + $opt_dry_run || { + eval "$_G_cmd" +*************** +*** 1241,1248 **** + _G_fail_exp=${2-':'} + + $opt_quiet || { +! func_quote_for_expand "$_G_cmd" +! eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { +--- 1402,1409 ---- + _G_fail_exp=${2-':'} + + $opt_quiet || { +! func_quote_arg expand,pretty "$_G_cmd" +! eval "func_echo $func_quote_arg_result" + } + + $opt_dry_run || { +*************** +*** 1369,1398 **** + # End: + #! /bin/sh + +- # Set a version string for this script. +- scriptversion=2014-01-07.03; # UTC +- + # A portable, pluggable option parser for Bourne shell. + # Written by Gary V. Vaughan, 2010 + +! # Copyright (C) 2010-2015 Free Software Foundation, Inc. +! # This is free software; see the source for copying conditions. There is NO +! # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! +! # This program is free software: you can redistribute it and/or modify +! # it under the terms of the GNU General Public License as published by +! # the Free Software Foundation, either version 3 of the License, or +! # (at your option) any later version. +! +! # This program is distributed in the hope that it will be useful, +! # but WITHOUT ANY WARRANTY; without even the implied warranty of +! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +! # GNU General Public License for more details. + +! # You should have received a copy of the GNU General Public License +! # along with this program. If not, see . + +! # Please report bugs or propose patches to gary@gnu.org. + + + ## ------ ## +--- 1530,1555 ---- + # End: + #! /bin/sh + + # A portable, pluggable option parser for Bourne shell. + # Written by Gary V. Vaughan, 2010 + +! # This is free software. There is NO warranty; not even for +! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +! # +! # Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors +! # +! # This file is dual licensed under the terms of the MIT license +! # , and GPL version 2 or later +! # . You must apply one of +! # these licenses when using or redistributing this software or any of +! # the files within it. See the URLs above, or the file `LICENSE` +! # included in the Bootstrap distribution for the full license texts. + +! # Please report bugs or propose patches to: +! # + +! # Set a version string for this script. +! scriptversion=2019-02-19.15; # UTC + + + ## ------ ## +*************** +*** 1415,1421 **** + # + # In order for the '--version' option to work, you will need to have a + # suitably formatted comment like the one at the top of this file +! # starting with '# Written by ' and ending with '# warranty; '. + # + # For '-h' and '--help' to work, you will also need a one line + # description of your script's purpose in a comment directly above the +--- 1572,1578 ---- + # + # In order for the '--version' option to work, you will need to have a + # suitably formatted comment like the one at the top of this file +! # starting with '# Written by ' and ending with '# Copyright'. + # + # For '-h' and '--help' to work, you will also need a one line + # description of your script's purpose in a comment directly above the +*************** +*** 1427,1433 **** + # to display verbose messages only when your user has specified + # '--verbose'. + # +! # After sourcing this file, you can plug processing for additional + # options by amending the variables from the 'Configuration' section + # below, and following the instructions in the 'Option parsing' + # section further down. +--- 1584,1590 ---- + # to display verbose messages only when your user has specified + # '--verbose'. + # +! # After sourcing this file, you can plug in processing for additional + # options by amending the variables from the 'Configuration' section + # below, and following the instructions in the 'Option parsing' + # section further down. +*************** +*** 1476,1483 **** + ## ------------------------- ## + + # This section contains functions for adding, removing, and running hooks +! # to the main code. A hook is just a named list of of function, that can +! # be run in order later on. + + # func_hookable FUNC_NAME + # ----------------------- +--- 1633,1640 ---- + ## ------------------------- ## + + # This section contains functions for adding, removing, and running hooks +! # in the main code. A hook is just a list of function names that can be +! # run in order later on. + + # func_hookable FUNC_NAME + # ----------------------- +*************** +*** 1510,1516 **** + + # func_remove_hook FUNC_NAME HOOK_FUNC + # ------------------------------------ +! # Remove HOOK_FUNC from the list of functions called by FUNC_NAME. + func_remove_hook () + { + $debug_cmd +--- 1667,1674 ---- + + # func_remove_hook FUNC_NAME HOOK_FUNC + # ------------------------------------ +! # Remove HOOK_FUNC from the list of hook functions to be called by +! # FUNC_NAME. + func_remove_hook () + { + $debug_cmd +*************** +*** 1519,1528 **** + } + + + # func_run_hooks FUNC_NAME [ARG]... + # --------------------------------- + # Run all hook functions registered to FUNC_NAME. +! # It is assumed that the list of hook functions contains nothing more + # than a whitespace-delimited list of legal shell function names, and + # no effort is wasted trying to catch shell meta-characters or preserve + # whitespace. +--- 1677,1704 ---- + } + + ++ # func_propagate_result FUNC_NAME_A FUNC_NAME_B ++ # --------------------------------------------- ++ # If the *_result variable of FUNC_NAME_A _is set_, assign its value to ++ # *_result variable of FUNC_NAME_B. ++ func_propagate_result () ++ { ++ $debug_cmd ++ ++ func_propagate_result_result=: ++ if eval "test \"\${${1}_result+set}\" = set" ++ then ++ eval "${2}_result=\$${1}_result" ++ else ++ func_propagate_result_result=false ++ fi ++ } ++ ++ + # func_run_hooks FUNC_NAME [ARG]... + # --------------------------------- + # Run all hook functions registered to FUNC_NAME. +! # It's assumed that the list of hook functions contains nothing more + # than a whitespace-delimited list of legal shell function names, and + # no effort is wasted trying to catch shell meta-characters or preserve + # whitespace. +*************** +*** 1532,1553 **** + + case " $hookable_fns " in + *" $1 "*) ;; +! *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do +! eval $_G_hook '"$@"' +! +! # store returned options list back into positional +! # parameters for next 'cmd' execution. +! eval _G_hook_result=\$${_G_hook}_result +! eval set dummy "$_G_hook_result"; shift + done +- +- func_quote_for_eval ${1+"$@"} +- func_run_hooks_result=$func_quote_for_eval_result + } + + +--- 1708,1726 ---- + + case " $hookable_fns " in + *" $1 "*) ;; +! *) func_fatal_error "'$1' does not support hook functions." ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do +! func_unset "${_G_hook}_result" +! eval $_G_hook '${1+"$@"}' +! func_propagate_result $_G_hook func_run_hooks +! if $func_propagate_result_result; then +! eval set dummy "$func_run_hooks_result"; shift +! fi + done + } + + +*************** +*** 1557,1566 **** + ## --------------- ## + + # In order to add your own option parsing hooks, you must accept the +! # full positional parameter list in your hook function, remove any +! # options that you action, and then pass back the remaining unprocessed +! # options in '_result', escaped suitably for +! # 'eval'. Like this: + # + # my_options_prep () + # { +--- 1730,1747 ---- + ## --------------- ## + + # In order to add your own option parsing hooks, you must accept the +! # full positional parameter list from your hook function. You may remove +! # or edit any options that you action, and then pass back the remaining +! # unprocessed options in '_result', escaped +! # suitably for 'eval'. +! # +! # The '_result' variable is automatically unset +! # before your hook gets called; for best performance, only set the +! # *_result variable when necessary (i.e. don't call the 'func_quote' +! # function unnecessarily because it can be an expensive operation on some +! # machines). +! # +! # Like this: + # + # my_options_prep () + # { +*************** +*** 1570,1578 **** + # usage_message=$usage_message' + # -s, --silent don'\''t print informational messages + # ' +! # +! # func_quote_for_eval ${1+"$@"} +! # my_options_prep_result=$func_quote_for_eval_result + # } + # func_add_hook func_options_prep my_options_prep + # +--- 1751,1758 ---- + # usage_message=$usage_message' + # -s, --silent don'\''t print informational messages + # ' +! # # No change in '$@' (ignored completely by this hook). Leave +! # # my_options_prep_result variable intact. + # } + # func_add_hook func_options_prep my_options_prep + # +*************** +*** 1581,1605 **** + # { + # $debug_cmd + # +! # # Note that for efficiency, we parse as many options as we can + # # recognise in a loop before passing the remainder back to the + # # caller on the first unrecognised argument we encounter. + # while test $# -gt 0; do + # opt=$1; shift + # case $opt in +! # --silent|-s) opt_silent=: ;; + # # Separate non-argument short options: + # -s*) func_split_short_opt "$_G_opt" + # set dummy "$func_split_short_opt_name" \ + # "-$func_split_short_opt_arg" ${1+"$@"} + # shift + # ;; +! # *) set dummy "$_G_opt" "$*"; shift; break ;; + # esac + # done + # +! # func_quote_for_eval ${1+"$@"} +! # my_silent_option_result=$func_quote_for_eval_result + # } + # func_add_hook func_parse_options my_silent_option + # +--- 1761,1796 ---- + # { + # $debug_cmd + # +! # args_changed=false +! # +! # # Note that, for efficiency, we parse as many options as we can + # # recognise in a loop before passing the remainder back to the + # # caller on the first unrecognised argument we encounter. + # while test $# -gt 0; do + # opt=$1; shift + # case $opt in +! # --silent|-s) opt_silent=: +! # args_changed=: +! # ;; + # # Separate non-argument short options: + # -s*) func_split_short_opt "$_G_opt" + # set dummy "$func_split_short_opt_name" \ + # "-$func_split_short_opt_arg" ${1+"$@"} + # shift ++ # args_changed=: + # ;; +! # *) # Make sure the first unrecognised option "$_G_opt" +! # # is added back to "$@" in case we need it later, +! # # if $args_changed was set to 'true'. +! # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # esac + # done + # +! # # Only call 'func_quote' here if we processed at least one argument. +! # if $args_changed; then +! # func_quote eval ${1+"$@"} +! # my_silent_option_result=$func_quote_result +! # fi + # } + # func_add_hook func_parse_options my_silent_option + # +*************** +*** 1610,1626 **** + # + # $opt_silent && $opt_verbose && func_fatal_help "\ + # '--silent' and '--verbose' options are mutually exclusive." +- # +- # func_quote_for_eval ${1+"$@"} +- # my_option_validation_result=$func_quote_for_eval_result + # } + # func_add_hook func_validate_options my_option_validation + # +! # You'll alse need to manually amend $usage_message to reflect the extra + # options you parse. It's preferable to append if you can, so that + # multiple option parsing hooks can be added safely. + + + # func_options [ARG]... + # --------------------- + # All the functions called inside func_options are hookable. See the +--- 1801,1826 ---- + # + # $opt_silent && $opt_verbose && func_fatal_help "\ + # '--silent' and '--verbose' options are mutually exclusive." + # } + # func_add_hook func_validate_options my_option_validation + # +! # You'll also need to manually amend $usage_message to reflect the extra + # options you parse. It's preferable to append if you can, so that + # multiple option parsing hooks can be added safely. + + ++ # func_options_finish [ARG]... ++ # ---------------------------- ++ # Finishing the option parse loop (call 'func_options' hooks ATM). ++ func_options_finish () ++ { ++ $debug_cmd ++ ++ func_run_hooks func_options ${1+"$@"} ++ func_propagate_result func_run_hooks func_options_finish ++ } ++ ++ + # func_options [ARG]... + # --------------------- + # All the functions called inside func_options are hookable. See the +*************** +*** 1630,1646 **** + { + $debug_cmd + +! func_options_prep ${1+"$@"} +! eval func_parse_options \ +! ${func_options_prep_result+"$func_options_prep_result"} +! eval func_validate_options \ +! ${func_parse_options_result+"$func_parse_options_result"} + +! eval func_run_hooks func_options \ +! ${func_validate_options_result+"$func_validate_options_result"} + +! # save modified positional parameters for caller +! func_options_result=$func_run_hooks_result + } + + +--- 1830,1856 ---- + { + $debug_cmd + +! _G_options_quoted=false + +! for my_func in options_prep parse_options validate_options options_finish +! do +! func_unset func_${my_func}_result +! func_unset func_run_hooks_result +! eval func_$my_func '${1+"$@"}' +! func_propagate_result func_$my_func func_options +! if $func_propagate_result_result; then +! eval set dummy "$func_options_result"; shift +! _G_options_quoted=: +! fi +! done + +! $_G_options_quoted || { +! # As we (func_options) are top-level options-parser function and +! # nobody quoted "$@" for us yet, we need to do it explicitly for +! # caller. +! func_quote eval ${1+"$@"} +! func_options_result=$func_quote_result +! } + } + + +*************** +*** 1649,1657 **** + # All initialisations required before starting the option parse loop. + # Note that when calling hook functions, we pass through the list of + # positional parameters. If a hook function modifies that list, and +! # needs to propogate that back to rest of this script, then the complete +! # modified list must be put in 'func_run_hooks_result' before +! # returning. + func_hookable func_options_prep + func_options_prep () + { +--- 1859,1866 ---- + # All initialisations required before starting the option parse loop. + # Note that when calling hook functions, we pass through the list of + # positional parameters. If a hook function modifies that list, and +! # needs to propagate that back to rest of this script, then the complete +! # modified list must be put in 'func_run_hooks_result' before returning. + func_hookable func_options_prep + func_options_prep () + { +*************** +*** 1662,1670 **** + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} +! +! # save modified positional parameters for caller +! func_options_prep_result=$func_run_hooks_result + } + + +--- 1871,1877 ---- + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} +! func_propagate_result func_run_hooks func_options_prep + } + + +*************** +*** 1676,1700 **** + { + $debug_cmd + +! func_parse_options_result= +! + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} +! +! # Adjust func_parse_options positional parameters to match +! eval set dummy "$func_run_hooks_result"; shift + + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break + + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' +! func_echo "enabling shell trace mode" + $debug_cmd + ;; + +--- 1883,1914 ---- + { + $debug_cmd + +! _G_parse_options_requote=false + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} +! func_propagate_result func_run_hooks func_parse_options +! if $func_propagate_result_result; then +! eval set dummy "$func_parse_options_result"; shift +! # Even though we may have changed "$@", we passed the "$@" array +! # down into the hook and it quoted it for us (because we are in +! # this if-branch). No need to quote it again. +! _G_parse_options_requote=false +! fi + + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break + ++ # We expect that one of the options parsed in this function matches ++ # and thus we remove _G_opt from "$@" and need to re-quote. ++ _G_match_parse_options=: + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' +! func_echo "enabling shell trace mode" >&2 + $debug_cmd + ;; + +*************** +*** 1704,1710 **** + ;; + + --warnings|--warning|-W) +! test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above +--- 1918,1927 ---- + ;; + + --warnings|--warning|-W) +! if test $# = 0 && func_missing_arg $_G_opt; then +! _G_parse_options_requote=: +! break +! fi + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above +*************** +*** 1757,1771 **** + shift + ;; + +! --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; +! *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + +! # save modified positional parameters for caller +! func_quote_for_eval ${1+"$@"} +! func_parse_options_result=$func_quote_for_eval_result + } + + +--- 1974,1997 ---- + shift + ;; + +! --) _G_parse_options_requote=: ; break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; +! *) set dummy "$_G_opt" ${1+"$@"}; shift +! _G_match_parse_options=false +! break +! ;; + esac ++ ++ if $_G_match_parse_options; then ++ _G_parse_options_requote=: ++ fi + done + +! if $_G_parse_options_requote; then +! # save modified positional parameters for caller +! func_quote eval ${1+"$@"} +! func_parse_options_result=$func_quote_result +! fi + } + + +*************** +*** 1782,1793 **** + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + func_run_hooks func_validate_options ${1+"$@"} + + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE +- +- # save modified positional parameters for caller +- func_validate_options_result=$func_run_hooks_result + } + + +--- 2008,2017 ---- + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + func_run_hooks func_validate_options ${1+"$@"} ++ func_propagate_result func_run_hooks func_validate_options + + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + } + + +*************** +*** 1843,1850 **** + + # func_split_equals STRING + # ------------------------ +! # Set func_split_equals_lhs and func_split_equals_rhs shell variables after +! # splitting STRING at the '=' sign. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ +--- 2067,2074 ---- + + # func_split_equals STRING + # ------------------------ +! # Set func_split_equals_lhs and func_split_equals_rhs shell variables +! # after splitting STRING at the '=' sign. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ +*************** +*** 1859,1866 **** + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} +! test "x$func_split_equals_lhs" = "x$1" \ +! && func_split_equals_rhs= + }' + else + # ...otherwise fall back to using expr, which is often a shell builtin. +--- 2083,2091 ---- + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} +! if test "x$func_split_equals_lhs" = "x$1"; then +! func_split_equals_rhs= +! fi + }' + else + # ...otherwise fall back to using expr, which is often a shell builtin. +*************** +*** 1870,1876 **** + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= +! test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } + fi #func_split_equals +--- 2095,2101 ---- + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= +! test "x$func_split_equals_lhs=" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } + fi #func_split_equals +*************** +*** 1896,1902 **** + { + $debug_cmd + +! func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } + fi #func_split_short_opt +--- 2121,2127 ---- + { + $debug_cmd + +! func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } + fi #func_split_short_opt +*************** +*** 1938,1968 **** + # func_version + # ------------ + # Echo version message to standard output and exit. + func_version () + { + $debug_cmd + + printf '%s\n' "$progname $scriptversion" + $SED -n ' +! /(C)/!b go +! :more +! /\./!{ +! N +! s|\n# | | +! b more +! } +! :go +! /^# Written by /,/# warranty; / { +! s|^# || +! s|^# *$|| +! s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| +! p + } +! /^# Written by / { +! s|^# || +! p + } +! /^warranty; /q' < "$progpath" + + exit $? + } +--- 2163,2206 ---- + # func_version + # ------------ + # Echo version message to standard output and exit. ++ # The version message is extracted from the calling file's header ++ # comments, with leading '# ' stripped: ++ # 1. First display the progname and version ++ # 2. Followed by the header comment line matching /^# Written by / ++ # 3. Then a blank line followed by the first following line matching ++ # /^# Copyright / ++ # 4. Immediately followed by any lines between the previous matches, ++ # except lines preceding the intervening completely blank line. ++ # For example, see the header comments of this file. + func_version () + { + $debug_cmd + + printf '%s\n' "$progname $scriptversion" + $SED -n ' +! /^# Written by /!b +! s|^# ||; p; n +! +! :fwd2blnk +! /./ { +! n +! b fwd2blnk + } +! p; n +! +! :holdwrnt +! s|^# || +! s|^# *$|| +! /^Copyright /!{ +! /./H +! n +! b holdwrnt + } +! +! s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| +! G +! s|\(\n\)\n*|\1|g +! p; q' < "$progpath" + + exit $? + } +*************** +*** 1972,1983 **** + # mode: shell-script + # sh-indentation: 2 + # eval: (add-hook 'before-save-hook 'time-stamp) +! # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" + # time-stamp-time-zone: "UTC" + # End: + + # Set a version string. +! scriptversion='(GNU libtool) 2.4.6' + + + # func_echo ARG... +--- 2210,2244 ---- + # mode: shell-script + # sh-indentation: 2 + # eval: (add-hook 'before-save-hook 'time-stamp) +! # time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" + # time-stamp-time-zone: "UTC" + # End: + + # Set a version string. +! scriptversion='(GNU libtool) 2.5.4.23-5b58' +! +! # func_version +! # ------------ +! # Echo version message to standard output and exit. +! func_version () +! { +! $debug_cmd +! +! year=`date +%Y` +! +! cat < +! This is free software: you are free to change and redistribute it. +! There is NO WARRANTY, to the extent permitted by law. +! +! Originally written by Gordon Matzigkeit, 1996 +! (See AUTHORS for complete contributor listing) +! EOF +! +! exit $? +! } + + + # func_echo ARG... +*************** +*** 2000,2017 **** + } + + +- # func_warning ARG... +- # ------------------- +- # Libtool warnings are not categorized, so override funclib.sh +- # func_warning with this simpler definition. +- func_warning () +- { +- $debug_cmd +- +- $warning_func ${1+"$@"} +- } +- +- + ## ---------------- ## + ## Options parsing. ## + ## ---------------- ## +--- 2261,2266 ---- +*************** +*** 2023,2041 **** + + # Short help message in response to '-h'. + usage_message="Options: +! --config show all configuration variables +! --debug enable verbose shell tracing +! -n, --dry-run display commands without modifying any files +! --features display basic configuration information and exit +! --mode=MODE use operation mode MODE +! --no-warnings equivalent to '-Wnone' +! --preserve-dup-deps don't remove duplicate dependency libraries +! --quiet, --silent don't print informational messages +! --tag=TAG use configuration variables from tag TAG +! -v, --verbose print more informational messages than default +! --version print version information +! -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] +! -h, --help, --help-all print short, long, or detailed help message + " + + # Additional text appended to 'usage_message' in response to '--help'. +--- 2272,2294 ---- + + # Short help message in response to '-h'. + usage_message="Options: +! --config show all configuration variables +! --debug enable verbose shell tracing +! -n, --dry-run display commands without modifying any files +! --features display basic configuration information +! --finish use operation '--mode=finish' +! --mode=MODE use operation mode MODE +! --no-finish don't update shared library cache +! --no-quiet, --no-silent print default informational messages +! --no-warnings equivalent to '-Wnone' +! --preserve-dup-deps don't remove duplicate dependency libraries +! --quiet, --silent don't print informational messages +! --reorder-cache=DIRS reorder shared library cache for preferred DIRS +! --tag=TAG use configuration variables from tag TAG +! -v, --verbose print more informational messages than default +! --version print version information +! -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] +! -h, --help, --help-all print short, long, or detailed help message + " + + # Additional text appended to 'usage_message' in response to '--help'. +*************** +*** 2046,2051 **** +--- 2299,2320 ---- + func_usage_message + $ECHO "$long_help_message + ++ If a TAG is supplied, it must use one of the tag names below: ++ ++ Tag Name Language Name ++ CC C ++ CXX C++ ++ OBJC Objective-C ++ OBJCXX Objective-C++ ++ GCJ Java ++ F77 Fortran 77 ++ FC Fortran ++ GO Go ++ RC Windows Resource ++ ++ If you do not see a tag name associated with your programming language, then ++ you are using a compiler that $progname does not support. ++ + MODE must be one of the following: + + clean remove files from the build directory +*************** +*** 2068,2080 **** + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) +! version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + + Report bugs to . +! GNU libtool home page: . +! General help using GNU software: ." + exit 0 + } + +--- 2337,2349 ---- + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) +! version: $progname $scriptversion + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + + Report bugs to . +! GNU libtool home page: . +! General help using GNU software: ." + exit 0 + } + +*************** +*** 2124,2130 **** + # a configuration failure hint, and exit. + func_fatal_configuration () + { +! func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." + } +--- 2393,2399 ---- + # a configuration failure hint, and exit. + func_fatal_configuration () + { +! func_fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." + } +*************** +*** 2264,2275 **** +--- 2533,2549 ---- + opt_dry_run=false + opt_help=false + opt_mode= ++ opt_reorder_cache=false + opt_preserve_dup_deps=false + opt_quiet=false ++ opt_finishing=true ++ opt_warning= + + nonopt= + preserve_args= + ++ _G_rc_lt_options_prep=: ++ + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) +*************** +*** 2293,2303 **** + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + +! # Pass back the list of options. +! func_quote_for_eval ${1+"$@"} +! libtool_options_prep_result=$func_quote_for_eval_result + } + func_add_hook func_options_prep libtool_options_prep + +--- 2567,2582 ---- + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; ++ *) ++ _G_rc_lt_options_prep=false ++ ;; + esac + +! if $_G_rc_lt_options_prep; then +! # Pass back the list of options. +! func_quote eval ${1+"$@"} +! libtool_options_prep_result=$func_quote_result +! fi + } + func_add_hook func_options_prep libtool_options_prep + +*************** +*** 2309,2317 **** +--- 2588,2599 ---- + { + $debug_cmd + ++ _G_rc_lt_parse_options=false ++ + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do ++ _G_match_lt_parse_options=: + _G_opt=$1 + shift + case $_G_opt in +*************** +*** 2345,2358 **** + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error +! *) func_error "invalid argument for $_G_opt" + exit_cmd=exit +- break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" +--- 2627,2644 ---- + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error +! *) func_error "invalid argument '$1' for $_G_opt" + exit_cmd=exit + ;; + esac + shift + ;; + ++ --no-finish) ++ opt_finishing=false ++ func_append preserve_args " $_G_opt" ++ ;; ++ + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" +*************** +*** 2368,2373 **** +--- 2654,2677 ---- + func_append preserve_args " $_G_opt" + ;; + ++ --reorder-cache) ++ opt_reorder_cache=true ++ shared_lib_dirs=$1 ++ if test -n "$shared_lib_dirs"; then ++ case $1 in ++ # Must begin with /: ++ /*) ;; ++ ++ # Catch anything else as an error (relative paths) ++ *) func_error "invalid argument '$1' for $_G_opt" ++ func_error "absolute paths are required for $_G_opt" ++ exit_cmd=exit ++ ;; ++ esac ++ fi ++ shift ++ ;; ++ + --silent|--quiet) + opt_quiet=: + opt_verbose=false +*************** +*** 2386,2404 **** + func_append preserve_args " $_G_opt" + ;; + +! # An option not handled by this hook function: +! *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + +! +! # save modified positional parameters for caller +! func_quote_for_eval ${1+"$@"} +! libtool_parse_options_result=$func_quote_for_eval_result + } + func_add_hook func_parse_options libtool_parse_options + + + + # libtool_validate_options [ARG]... + # --------------------------------- +--- 2690,2725 ---- + func_append preserve_args " $_G_opt" + ;; + +! # An option not handled by this hook function: +! *) set dummy "$_G_opt" ${1+"$@"} ; shift +! _G_match_lt_parse_options=false +! break +! ;; + esac ++ $_G_match_lt_parse_options && _G_rc_lt_parse_options=: + done + +! if $_G_rc_lt_parse_options; then +! # save modified positional parameters for caller +! func_quote eval ${1+"$@"} +! libtool_parse_options_result=$func_quote_result +! fi + } + func_add_hook func_parse_options libtool_parse_options + + ++ # func_warning ARG... ++ # ------------------- ++ # Libtool warnings are not categorized, so override funclib.sh ++ # func_warning with this simpler definition. ++ func_warning () ++ { ++ if $opt_warning; then ++ $debug_cmd ++ $warning_func ${1+"$@"} ++ fi ++ } ++ + + # libtool_validate_options [ARG]... + # --------------------------------- +*************** +*** 2415,2424 **** + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + +! case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 +! *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; +--- 2736,2745 ---- + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + +! case $host_os in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 +! cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2* | *linux*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; +*************** +*** 2451,2458 **** + } + + # Pass back the unparsed argument list +! func_quote_for_eval ${1+"$@"} +! libtool_validate_options_result=$func_quote_for_eval_result + } + func_add_hook func_validate_options libtool_validate_options + +--- 2772,2779 ---- + } + + # Pass back the unparsed argument list +! func_quote eval ${1+"$@"} +! libtool_validate_options_result=$func_quote_result + } + func_add_hook func_validate_options libtool_validate_options + +*************** +*** 2694,2701 **** + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then +! func_echo "unable to infer tagged configuration" +! func_fatal_error "specify a tag with '--tag'" + # else + # func_verbose "using $tagname tagged configuration" + fi +--- 3015,3023 ---- + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then +! func_echo "unable to infer tagged configuration with compiler." +! func_echo "Possible use of unsupported compiler." +! func_fatal_error "specify a tag with '--tag'. For more information, try '$progname --help'." + # else + # func_verbose "using $tagname tagged configuration" + fi +*************** +*** 2750,2756 **** + + # func_convert_core_file_wine_to_w32 ARG + # Helper function used by file name conversion functions when $build is *nix, +! # and $host is mingw, cygwin, or some other w32 environment. Relies on a + # correctly configured wine environment available, with the winepath program + # in $build's $PATH. + # +--- 3072,3078 ---- + + # func_convert_core_file_wine_to_w32 ARG + # Helper function used by file name conversion functions when $build is *nix, +! # and $host is mingw, windows, cygwin, or some other w32 environment. Relies on a + # correctly configured wine environment available, with the winepath program + # in $build's $PATH. + # +*************** +*** 2782,2790 **** + + # func_convert_core_path_wine_to_w32 ARG + # Helper function used by path conversion functions when $build is *nix, and +! # $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +! # configured wine environment available, with the winepath program in $build's +! # $PATH. Assumes ARG has no leading or trailing path separator characters. + # + # ARG is path to be converted from $build format to win32. + # Result is available in $func_convert_core_path_wine_to_w32_result. +--- 3104,3113 ---- + + # func_convert_core_path_wine_to_w32 ARG + # Helper function used by path conversion functions when $build is *nix, and +! # $host is mingw, windows, cygwin, or some other w32 environment. Relies on a +! # correctly configured wine environment available, with the winepath program +! # in $build's $PATH. Assumes ARG has no leading or trailing path separator +! # characters. + # + # ARG is path to be converted from $build format to win32. + # Result is available in $func_convert_core_path_wine_to_w32_result. +*************** +*** 2927,2932 **** +--- 3250,3264 ---- + # end func_convert_path_front_back_pathsep + + ++ # func_convert_delimited_path PATH ORIG_DELIMITER NEW_DELIMITER ++ # Replaces a delimiter for a given path. ++ func_convert_delimited_path () ++ { ++ converted_path=`$ECHO "$1" | $SED "s#$2#$3#g"` ++ } ++ # end func_convert_delimited_path ++ ++ + ################################################## + # $build to $host FILE NAME CONVERSION FUNCTIONS # + ################################################## +*************** +*** 3261,3266 **** +--- 3593,3657 ---- + } + + ++ # func_reorder_shared_lib_cache DIRS ++ # Reorder the shared library cache by unconfiguring previous shared library cache ++ # and configuring preferred search directories before previous search directories. ++ # Previous shared library cache: /usr/lib /usr/local/lib ++ # Preferred search directories: /tmp/testing ++ # Reordered shared library cache: /tmp/testing /usr/lib /usr/local/lib ++ func_reorder_shared_lib_cache () ++ { ++ $debug_cmd ++ ++ case $host_os in ++ openbsd*) ++ get_search_directories=`PATH="$PATH:/sbin" ldconfig -r | $GREP "search directories" | $SED "s#.*search directories:\ ##g"` ++ func_convert_delimited_path "$get_search_directories" ':' '\ ' ++ save_search_directories=$converted_path ++ func_convert_delimited_path "$1" ':' '\ ' ++ ++ # Ensure directories exist ++ for dir in $converted_path; do ++ # Ensure each directory is an absolute path ++ case $dir in ++ /*) ;; ++ *) func_error "Directory '$dir' is not an absolute path" ++ exit $EXIT_FAILURE ;; ++ esac ++ # Ensure no trailing slashes ++ func_stripname '' '/' "$dir" ++ dir=$func_stripname_result ++ if test -d "$dir"; then ++ if test -n "$preferred_search_directories"; then ++ preferred_search_directories="$preferred_search_directories $dir" ++ else ++ preferred_search_directories=$dir ++ fi ++ else ++ func_error "Directory '$dir' does not exist" ++ exit $EXIT_FAILURE ++ fi ++ done ++ ++ PATH="$PATH:/sbin" ldconfig -U $save_search_directories ++ PATH="$PATH:/sbin" ldconfig -m $preferred_search_directories $save_search_directories ++ get_search_directories=`PATH="$PATH:/sbin" ldconfig -r | $GREP "search directories" | $SED "s#.*search directories:\ ##g"` ++ func_convert_delimited_path "$get_search_directories" ':' '\ ' ++ reordered_search_directories=$converted_path ++ ++ $ECHO "Original: $save_search_directories" ++ $ECHO "Reordered: $reordered_search_directories" ++ exit $EXIT_SUCCESS ++ ;; ++ *) ++ func_error "--reorder-cache is not supported for host_os=$host_os." ++ exit $EXIT_FAILURE ++ ;; ++ esac ++ } ++ # end func_reorder_shared_lib_cache ++ ++ + # func_mode_compile arg... + func_mode_compile () + { +*************** +*** 3418,3425 **** + esac + done + +! func_quote_for_eval "$libobj" +! test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name '$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" +--- 3809,3816 ---- + esac + done + +! func_quote_arg pretty "$libobj" +! test "X$libobj" != "X$func_quote_arg_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name '$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" +*************** +*** 3439,3445 **** + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +! cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac +--- 3830,3836 ---- + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +! cygwin* | mingw* | windows* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac +*************** +*** 3492,3499 **** + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result +! func_quote_for_eval "$srcfile" +! qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. + if test yes = "$build_libtool_libs"; then +--- 3883,3890 ---- + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result +! func_quote_arg pretty "$srcfile" +! qsrcfile=$func_quote_arg_result + + # Only build a PIC object if we are building libtool libraries. + if test yes = "$build_libtool_libs"; then +*************** +*** 3648,3654 **** + -prefer-non-pic try to build non-PIC objects only + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking +! -Wc,FLAG pass FLAG directly to the compiler + + COMPILE-COMMAND is a command to be used in creating a 'standard' object file + from the given SOURCEFILE. +--- 4039,4046 ---- + -prefer-non-pic try to build non-PIC objects only + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking +! -Wc,FLAG +! -Xcompiler FLAG pass FLAG directly to the compiler + + COMPILE-COMMAND is a command to be used in creating a 'standard' object file + from the given SOURCEFILE. +*************** +*** 3754,3759 **** +--- 4146,4153 ---- + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler ++ -Wa,FLAG ++ -Xassembler FLAG pass linker-specific FLAG directly to the assembler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) +*************** +*** 3830,3835 **** +--- 4224,4235 ---- + fi + + ++ # If option '--reorder-cache', reorder the shared library cache and exit. ++ if $opt_reorder_cache; then ++ func_reorder_shared_lib_cache $shared_lib_dirs ++ fi ++ ++ + # func_mode_execute arg... + func_mode_execute () + { +*************** +*** 4014,4020 **** + fi + fi + +! if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +--- 4414,4420 ---- + fi + fi + +! if test -n "$finish_cmds$finish_eval" && test -n "$libdirs" && $opt_finishing; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. +*************** +*** 4039,4044 **** +--- 4439,4450 ---- + for libdir in $libdirs; do + $ECHO " $libdir" + done ++ if test "false" = "$opt_finishing"; then ++ echo ++ echo "NOTE: finish_cmds were not executed during testing, so you must" ++ echo "manually run ldconfig to add a given test directory, LIBDIR, to" ++ echo "the search path for generated executables." ++ fi + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" +*************** +*** 4096,4103 **** + case $nonopt in *shtool*) :;; *) false;; esac + then + # Aesthetically quote it. +! func_quote_for_eval "$nonopt" +! install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else +--- 4502,4509 ---- + case $nonopt in *shtool*) :;; *) false;; esac + then + # Aesthetically quote it. +! func_quote_arg pretty "$nonopt" +! install_prog="$func_quote_arg_result " + arg=$1 + shift + else +*************** +*** 4107,4114 **** + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. +! func_quote_for_eval "$arg" +! func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +--- 4513,4520 ---- + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. +! func_quote_arg pretty "$arg" +! func_append install_prog "$func_quote_arg_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; +*************** +*** 4140,4146 **** + prev=$arg + fi + ;; +! -g | -m | -o) + prev=$arg + ;; + -s) +--- 4546,4552 ---- + prev=$arg + fi + ;; +! -g | -m | -o | -S | -t) + prev=$arg + ;; + -s) +*************** +*** 4165,4176 **** + esac + + # Aesthetically quote the argument. +! func_quote_for_eval "$arg" +! func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then +! func_quote_for_eval "$arg2" + fi +! func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ +--- 4571,4582 ---- + esac + + # Aesthetically quote the argument. +! func_quote_arg pretty "$arg" +! func_append install_prog " $func_quote_arg_result" + if test -n "$arg2"; then +! func_quote_arg pretty "$arg2" + fi +! func_append install_shared_prog " $func_quote_arg_result" + done + + test -z "$install_prog" && \ +*************** +*** 4181,4188 **** + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else +! func_quote_for_eval "$install_override_mode" +! func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + +--- 4587,4594 ---- + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else +! func_quote_arg pretty "$install_override_mode" +! func_append install_shared_prog " -m $func_quote_arg_result" + fi + fi + +*************** +*** 4275,4282 **** + func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. +! inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +--- 4681,4695 ---- + func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +! inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +*************** +*** 4313,4319 **** + 'exit $?' + tstripme=$stripme + case $host_os in +! cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme= +--- 4726,4732 ---- + 'exit $?' + tstripme=$stripme + case $host_os in +! cygwin* | mingw* | windows* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme= +*************** +*** 4426,4432 **** + + # Do a test to see if this is really a libtool program. + case $host in +! *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result +--- 4839,4845 ---- + + # Do a test to see if this is really a libtool program. + case $host in +! *cygwin* | *mingw* | *windows*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result +*************** +*** 4478,4485 **** + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_quiet || { +! func_quote_for_expand "$relink_command" +! eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else +--- 4891,4898 ---- + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_quiet || { +! func_quote_arg expand,pretty "$relink_command" +! eval "func_echo $func_quote_arg_result" + } + if eval "$relink_command"; then : + else +*************** +*** 4654,4660 **** + $RM $export_symbols + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in +! *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; +--- 5067,5073 ---- + $RM $export_symbols + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in +! *cygwin* | *mingw* | *windows* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; +*************** +*** 4666,4672 **** + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in +! *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; +--- 5079,5085 ---- + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in +! *cygwin* | *mingw* | *windows* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; +*************** +*** 4680,4686 **** + func_basename "$dlprefile" + name=$func_basename_result + case $host in +! *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" +--- 5093,5099 ---- + func_basename "$dlprefile" + name=$func_basename_result + case $host in +! *cygwin* | *mingw* | *windows* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" +*************** +*** 4706,4713 **** + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 +! eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | +! $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { +--- 5119,5134 ---- + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 +! case $host in +! i[3456]86-*-mingw32*) +! eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | +! $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" +! ;; +! *) +! eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | +! $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/__nm_//' >> '$nlist'" +! ;; +! esac + } + else # not an import lib + $opt_dry_run || { +*************** +*** 4855,4861 **** + # Transform the symbol file into the correct name. + symfileobj=$output_objdir/${my_outputname}S.$objext + case $host in +! *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` +--- 5276,5282 ---- + # Transform the symbol file into the correct name. + symfileobj=$output_objdir/${my_outputname}S.$objext + case $host in +! *cygwin* | *mingw* | *windows* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` +*************** +*** 4931,4937 **** + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | +! $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || +--- 5352,5358 ---- + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | +! $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || +*************** +*** 5198,5204 **** + # + # Emit a libtool wrapper script on stdout. + # Don't directly open a file because we may want to +! # incorporate the script contents within a cygwin/mingw + # wrapper executable. Must ONLY be called from within + # func_mode_link because it depends on a number of variables + # set therein. +--- 5619,5625 ---- + # + # Emit a libtool wrapper script on stdout. + # Don't directly open a file because we may want to +! # incorporate the script contents within a cygwin/mingw/windows + # wrapper executable. Must ONLY be called from within + # func_mode_link because it depends on a number of variables + # set therein. +*************** +*** 5206,5212 **** + # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR + # variable will take. If 'yes', then the emitted script + # will assume that the directory where it is stored is +! # the $objdir directory. This is a cygwin/mingw-specific + # behavior. + func_emit_wrapper () + { +--- 5627,5633 ---- + # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR + # variable will take. If 'yes', then the emitted script + # will assume that the directory where it is stored is +! # the $objdir directory. This is a cygwin/mingw/windows-specific + # behavior. + func_emit_wrapper () + { +*************** +*** 5258,5264 **** + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + +! qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + + # A function that is used when there is no print builtin or printf. +--- 5679,5686 ---- + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + +! func_quote_arg pretty "$ECHO" +! qECHO=$func_quote_arg_result + $ECHO "\ + + # A function that is used when there is no print builtin or printf. +*************** +*** 5268,5274 **** + \$1 + _LTECHO_EOF' + } +! ECHO=\"$qECHO\" + fi + + # Very basic option parsing. These options are (a) specific to +--- 5690,5696 ---- + \$1 + _LTECHO_EOF' + } +! ECHO=$qECHO + fi + + # Very basic option parsing. These options are (a) specific to +*************** +*** 5330,5336 **** + " + case $host in + # Backslashes separate directories on plain windows +! *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 +--- 5752,5758 ---- + " + case $host in + # Backslashes separate directories on plain windows +! *-*-mingw* | *-*-windows* | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 +*************** +*** 5398,5404 **** + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + +! # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then +--- 5820,5826 ---- + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + +! # Usually 'no', except on cygwin/mingw/windows when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then +*************** +*** 5530,5536 **** + #endif + #include + #include +! #ifdef _MSC_VER + # include + # include + # include +--- 5952,5958 ---- + #endif + #include + #include +! #if defined _WIN32 && !defined __GNUC__ + # include + # include + # include +*************** +*** 5555,5561 **** + /* declarations of non-ANSI functions */ + #if defined __MINGW32__ + # ifdef __STRICT_ANSI__ +! int _putenv (const char *); + # endif + #elif defined __CYGWIN__ + # ifdef __STRICT_ANSI__ +--- 5977,5983 ---- + /* declarations of non-ANSI functions */ + #if defined __MINGW32__ + # ifdef __STRICT_ANSI__ +! _CRTIMP int __cdecl _putenv (const char *); + # endif + #elif defined __CYGWIN__ + # ifdef __STRICT_ANSI__ +*************** +*** 5753,5759 **** + { + EOF + case $host in +! *mingw* | *cygwin* ) + # make stdout use "unix" line endings + echo " setmode(1,_O_BINARY);" + ;; +--- 6175,6181 ---- + { + EOF + case $host in +! *mingw* | *windows* | *cygwin* ) + # make stdout use "unix" line endings + echo " setmode(1,_O_BINARY);" + ;; +*************** +*** 5772,5778 **** + { + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX + namespace, but it is not one of the ones we know about and +! have already dealt with, above (inluding dump-script), then + report an error. Otherwise, targets might begin to believe + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX + namespace. The first time any user complains about this, we'll +--- 6194,6200 ---- + { + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX + namespace, but it is not one of the ones we know about and +! have already dealt with, above (including dump-script), then + report an error. Otherwise, targets might begin to believe + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX + namespace. The first time any user complains about this, we'll +*************** +*** 5856,5862 **** + EOF + + case $host_os in +! mingw*) + cat <<"EOF" + { + char* p; +--- 6278,6284 ---- + EOF + + case $host_os in +! mingw* | windows*) + cat <<"EOF" + { + char* p; +*************** +*** 5898,5904 **** + EOF + + case $host_os in +! mingw*) + cat <<"EOF" + /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); +--- 6320,6326 ---- + EOF + + case $host_os in +! mingw* | windows*) + cat <<"EOF" + /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); +*************** +*** 5969,5975 **** + if ((!path) || (!*path)) + return 0; + +! if ((stat (path, &st) >= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else +--- 6391,6397 ---- + if ((!path) || (!*path)) + return 0; + +! if ((stat (path, &st) >= 0) && !S_ISDIR (st.st_mode) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else +*************** +*** 6317,6323 **** + + EOF + case $host_os in +! mingw*) + cat <<"EOF" + + /* Prepares an argument vector before calling spawn(). +--- 6739,6745 ---- + + EOF + case $host_os in +! mingw* | windows*) + cat <<"EOF" + + /* Prepares an argument vector before calling spawn(). +*************** +*** 6492,6498 **** + $debug_cmd + + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # what system we are compiling for in order to pass an extra +--- 6914,6920 ---- + $debug_cmd + + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # what system we are compiling for in order to pass an extra +*************** +*** 6516,6521 **** +--- 6938,6944 ---- + finalize_command=$nonopt + + compile_rpath= ++ compile_rpath_tail= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= +*************** +*** 6556,6565 **** +--- 6979,6990 ---- + xrpath= + perm_rpath= + temp_rpath= ++ temp_rpath_tail= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= ++ rpath_arg= + single_module=$wl-single_module + func_infer_tag $base_compile + +*************** +*** 6611,6619 **** + while test "$#" -gt 0; do + arg=$1 + shift +! func_quote_for_eval "$arg" +! qarg=$func_quote_for_eval_unquoted_result +! func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then +--- 7036,7044 ---- + while test "$#" -gt 0; do + arg=$1 + shift +! func_quote_arg pretty,unquoted "$arg" +! qarg=$func_quote_arg_unquoted_result +! func_append libtool_args " $func_quote_arg_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then +*************** +*** 6822,6828 **** + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) +! func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test rpath = "$prev"; then +--- 7247,7253 ---- + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) +! func_fatal_error "argument to -rpath is not absolute: $arg" + ;; + esac + if test rpath = "$prev"; then +*************** +*** 6849,6854 **** +--- 7274,7286 ---- + prev= + continue + ;; ++ xassembler) ++ func_append compiler_flags " -Xassembler $qarg" ++ prev= ++ func_append compile_command " -Xassembler $qarg" ++ func_append finalize_command " -Xassembler $qarg" ++ continue ++ ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" +*************** +*** 6991,6997 **** + ;; + esac + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; +--- 7423,7429 ---- + ;; + esac + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; +*************** +*** 7011,7017 **** + -l*) + if test X-lc = "X$arg" || test X-lm = "X$arg"; then + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; +--- 7443,7449 ---- + -l*) + if test X-lc = "X$arg" || test X-lm = "X$arg"; then + case $host in +! *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; +*************** +*** 7019,7025 **** + # These systems don't actually have a C library (as such) + test X-lc = "X$arg" && continue + ;; +! *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc due to us having libc/libc_r. + test X-lc = "X$arg" && continue + ;; +--- 7451,7457 ---- + # These systems don't actually have a C library (as such) + test X-lc = "X$arg" && continue + ;; +! *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) + # Do not include libc due to us having libc/libc_r. + test X-lc = "X$arg" && continue + ;; +*************** +*** 7039,7045 **** + esac + elif test X-lc_r = "X$arg"; then + case $host in +! *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +--- 7471,7477 ---- + esac + elif test X-lc_r = "X$arg"; then + case $host in +! *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +*************** +*** 7062,7077 **** + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +! -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; +! +! -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ +! |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" +--- 7494,7522 ---- + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. +! # -q