external/liborcus/UnpackedTarball_liborcus.mk | 1 external/liborcus/boost_system.patch.1 |14378 ++++++++++++++++++++++++++ 2 files changed, 14379 insertions(+)
New commits: commit 14db52add73b6bcbfd142032eabbc2a8336ce064 Author: Thorsten Behrens <[email protected]> AuthorDate: Sat Nov 8 14:54:35 2025 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Wed Nov 12 03:42:00 2025 +0100 Fix liborcus build against newer (>=1.89) system boost Pulled in updated m4/boost.m4 and re-ran autoconf. Change-Id: I3f5ee4b883e872e8c5d424ec69475fadb159b45f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193631 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Kohei Yoshida <[email protected]> diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index bb399826c358..7e6a2acc6edb 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ external/liborcus/libtool.patch.0 \ + external/liborcus/boost_system.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/boost_system.patch.1 b/external/liborcus/boost_system.patch.1 new file mode 100644 index 000000000000..7a4316ad2848 --- /dev/null +++ b/external/liborcus/boost_system.patch.1 @@ -0,0 +1,14378 @@ +diff -ur liborcus.org/configure liborcus/configure +--- liborcus.org/configure 2025-11-08 14:20:44.934846921 +0100 ++++ liborcus/configure 2025-11-08 14:21:16.950341095 +0100 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.71 for liborcus 0.19.2. ++# Generated by GNU Autoconf 2.72 for liborcus 0.19.2. + # + # +-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, ++# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, + # Inc. + # + # +@@ -15,7 +15,6 @@ + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-as_nop=: + if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + then : + emulate sh +@@ -24,12 +23,13 @@ + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +-else $as_nop +- case `(set -o) 2>/dev/null` in #( ++else case e in #( ++ e) case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; ++esac ;; + esac + fi + +@@ -101,7 +101,7 @@ + + ;; + esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' ++# 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 +@@ -131,15 +131,14 @@ + 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'. ++# out after a failed 'exec'. + printf "%s " "$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="as_nop=: +-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 ++ as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + then : + emulate sh + NULLCMD=: +@@ -147,12 +146,13 @@ + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +-else \$as_nop +- case \`(set -o) 2>/dev/null\` in #( ++else case e in #( ++ e) case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; ++esac ;; + esac + fi + " +@@ -170,8 +170,9 @@ + if ( set x; as_fn_ret_success y && test x = \"\$1\" ) + then : + +-else \$as_nop +- exitcode=1; echo positional parameters were not saved. ++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)) +@@ -193,14 +194,15 @@ + if (eval "$as_required") 2>/dev/null + then : + as_have_required=yes +-else $as_nop +- as_have_required=no ++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 $as_nop +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++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 +@@ -233,12 +235,13 @@ + if $as_found + then : + +-else $as_nop +- if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++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 ++fi ;; ++esac + fi + + +@@ -260,7 +263,7 @@ + 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'. ++# out after a failed 'exec'. + printf "%s " "$0: could not re-execute with $CONFIG_SHELL" >&2 + exit 255 + fi +@@ -279,7 +282,8 @@ + $0: the script under such a shell if you do have one." + fi + exit 1 +-fi ++fi ;; ++esac + fi + fi + SHELL=${CONFIG_SHELL-/bin/sh} +@@ -318,14 +322,6 @@ + as_fn_set_status $1 + exit $1 + } # as_fn_exit +-# as_fn_nop +-# --------- +-# Do nothing but, unlike ":", preserve the value of $?. +-as_fn_nop () +-{ +- return $? +-} +-as_nop=as_fn_nop + + # as_fn_mkdir_p + # ------------- +@@ -394,11 +390,12 @@ + { + eval $1+=\$2 + }' +-else $as_nop +- as_fn_append () ++else case e in #( ++ e) as_fn_append () + { + eval $1=\$$1\$2 +- } ++ } ;; ++esac + fi # as_fn_append + + # as_fn_arith ARG... +@@ -412,21 +409,14 @@ + { + as_val=$(( $* )) + }' +-else $as_nop +- as_fn_arith () ++else case e in #( ++ e) as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` +- } ++ } ;; ++esac + fi # as_fn_arith + +-# as_fn_nop +-# --------- +-# Do nothing but, unlike ":", preserve the value of $?. +-as_fn_nop () +-{ +- return $? +-} +-as_nop=as_fn_nop + + # as_fn_error STATUS ERROR [LINENO LOG_FD] + # ---------------------------------------- +@@ -500,6 +490,8 @@ + /[$]LINENO/= + ' <$as_myself | + sed ' ++ t clear ++ :clear + s/[$]LINENO.*/&-/ + t lineno + b +@@ -548,7 +540,6 @@ + as_echo='printf %s ' + as_echo_n='printf %s' + +- + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +@@ -560,9 +551,9 @@ + 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'. ++ # 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,10 +578,12 @@ + 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'" ++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_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++as_tr_sh="eval sed '$as_sed_sh'" # deprecated + + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -764,6 +757,7 @@ + RANLIB + ac_ct_AR + AR ++FILECMD + LN_S + NM + ac_ct_DUMPBIN +@@ -809,6 +803,8 @@ + LDFLAGS + CXXFLAGS + CXX ++am__xargs_n ++am__rm_f_notfound + AM_BACKSLASH + AM_DEFAULT_VERBOSITY + AM_DEFAULT_V +@@ -885,9 +881,11 @@ + enable_silent_rules + enable_dependency_tracking + enable_static ++enable_pic + with_pic + enable_shared + enable_fast_install ++enable_aix_soname + with_aix_soname + with_gnu_ld + with_sysroot +@@ -1054,7 +1052,7 @@ + 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'" ++ as_fn_error $? "invalid feature name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s " "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1080,7 +1078,7 @@ + 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'" ++ as_fn_error $? "invalid feature name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s " "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1293,7 +1291,7 @@ + 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'" ++ as_fn_error $? "invalid package name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s " "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1309,7 +1307,7 @@ + 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'" ++ as_fn_error $? "invalid package name: '$ac_useropt'" + ac_useropt_orig=$ac_useropt + ac_useropt=`printf "%s " "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1339,8 +1337,8 @@ + | --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" ++ -*) as_fn_error $? "unrecognized option: '$ac_option' ++Try '$0 --help' for more information" + ;; + + *=*) +@@ -1348,7 +1346,7 @@ + # 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'" ;; ++ as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; +@@ -1398,7 +1396,7 @@ + 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' ++# 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 +@@ -1466,7 +1464,7 @@ + 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_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)` +@@ -1494,7 +1492,7 @@ + # 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 liborcus 0.19.2 to adapt to many kinds of systems. ++'configure' configures liborcus 0.19.2 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1508,11 +1506,11 @@ + --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 ++ -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' ++ -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 \`..'] ++ --srcdir=DIR find the sources in DIR [configure dir or '..'] + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +@@ -1520,10 +1518,10 @@ + --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'. ++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. + +@@ -1580,9 +1578,14 @@ + --disable-dependency-tracking + speeds up one-time build + --enable-static[=PKGS] build static libraries [default=no] ++ --enable-pic[=PKGS] try to use only PIC/non-PIC objects [default=use ++ both] + --enable-shared[=PKGS] build shared libraries [default=yes] + --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) + --enable-static-boost Prefer the static boost libraries over the shared + ones [no] +@@ -1607,11 +1610,6 @@ + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --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). +@@ -1674,7 +1672,7 @@ + C compiler flags for PYTHON, overriding pkg-config + PYTHON_LIBS linker flags for PYTHON, overriding pkg-config + +-Use these variables to override the choices made by `configure' or to help ++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 the package provider. +@@ -1742,9 +1740,9 @@ + if $ac_init_version; then + cat <<\_ACEOF + liborcus configure 0.19.2 +-generated by GNU Autoconf 2.71 ++generated by GNU Autoconf 2.72 + +-Copyright (C) 2021 Free Software Foundation, Inc. ++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. + _ACEOF +@@ -1783,11 +1781,12 @@ + } && test -s conftest.$ac_objext + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ ac_retval=1 ;; ++esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +@@ -1822,11 +1821,12 @@ + } && test -s conftest.$ac_objext + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ ac_retval=1 ;; ++esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +@@ -1860,11 +1860,12 @@ + } + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ ac_retval=1 ;; ++esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +@@ -1902,11 +1903,12 @@ + } + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ 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 +@@ -1930,8 +1932,8 @@ + if eval test \${$3+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> +@@ -1939,10 +1941,12 @@ + if ac_fn_c_try_compile "$LINENO" + then : + eval "$3=yes" +-else $as_nop +- eval "$3=no" ++else case e in #( ++ e) eval "$3=no" ;; ++esac + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; ++esac + fi + eval ac_res=\$$3 + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +@@ -1962,15 +1966,15 @@ + if eval test \${$3+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + /* Define $2 to an innocuous variant, in case <limits.h> declares $2. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ + #define $2 innocuous_$2 + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $2 (); below. */ ++ which can conflict with char $2 (void); below. */ + + #include <limits.h> + #undef $2 +@@ -1981,7 +1985,7 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $2 (); ++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. */ +@@ -2000,11 +2004,13 @@ + if ac_fn_c_try_link "$LINENO" + then : + eval "$3=yes" +-else $as_nop +- eval "$3=no" ++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 ++ conftest$ac_exeext conftest.$ac_ext ;; ++esac + fi + eval ac_res=\$$3 + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +@@ -2040,11 +2046,12 @@ + } + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ ac_retval=1 ;; ++esac + fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval +@@ -2082,11 +2089,12 @@ + } + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 ++ 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 +@@ -2110,8 +2118,8 @@ + if eval test \${$3+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + #include <$2> +@@ -2119,10 +2127,12 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + eval "$3=yes" +-else $as_nop +- eval "$3=no" ++else case e in #( ++ e) eval "$3=no" ;; ++esac + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; ++esac + fi + eval ac_res=\$$3 + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +@@ -2143,8 +2153,8 @@ + if eval test \${$3+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- eval "$3=no" ++else case e in #( ++ e) eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 +@@ -2174,12 +2184,14 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + +-else $as_nop +- eval "$3=yes" ++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 ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; ++esac + fi + eval ac_res=\$$3 + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +@@ -2218,12 +2230,13 @@ + test $ac_status = 0; }; } + then : + ac_retval=0 +-else $as_nop +- printf "%s " "$as_me: program exited with status $ac_status" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: program exited with status $ac_status" >&5 + printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=$ac_status ++ ac_retval=$ac_status ;; ++esac + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +@@ -2276,18 +2289,19 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_hi=$ac_mid; break +-else $as_nop +- as_fn_arith $ac_mid + 1 && ac_lo=$as_val ++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 ++ 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 $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +@@ -2322,20 +2336,23 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_lo=$ac_mid; break +-else $as_nop +- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val ++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 ++ 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 $as_nop +- ac_lo= ac_hi= ++else case e in #( ++ e) ac_lo= ac_hi= ;; ++esac + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++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. +@@ -2358,8 +2375,9 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_hi=$ac_mid +-else $as_nop +- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ++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 +@@ -2407,8 +2425,9 @@ + if ac_fn_cxx_try_run "$LINENO" + then : + echo >>conftest.val; read $3 <conftest.val; ac_retval=0 +-else $as_nop +- ac_retval=1 ++else case e in #( ++ e) ac_retval=1 ;; ++esac + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +@@ -2431,15 +2450,15 @@ + if eval test \${$3+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + /* Define $2 to an innocuous variant, in case <limits.h> declares $2. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ + #define $2 innocuous_$2 + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $2 (); below. */ ++ which can conflict with char $2 (void); below. */ + + #include <limits.h> + #undef $2 +@@ -2450,7 +2469,7 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $2 (); ++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. */ +@@ -2469,11 +2488,13 @@ + if ac_fn_cxx_try_link "$LINENO" + then : + eval "$3=yes" +-else $as_nop +- eval "$3=no" ++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 ++ conftest$ac_exeext conftest.$ac_ext ;; ++esac + fi + eval ac_res=\$$3 + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +@@ -2506,7 +2527,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by liborcus $as_me 0.19.2, which was +-generated by GNU Autoconf 2.71. Invocation command line was ++generated by GNU Autoconf 2.72. Invocation command line was + + $ $0$ac_configure_args_raw + +@@ -2752,10 +2773,10 @@ + printf "%s " "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ +- || { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++ || { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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; } ++See 'config.log' for more details" "$LINENO" 5; } + fi + done + +@@ -3007,9 +3028,7 @@ + /* 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 (p, i) +- char **p; +- int i; ++static char *e (char **p, int i) + { + return p[i]; + } +@@ -3023,6 +3042,21 @@ + 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 +@@ -3050,16 +3084,19 @@ + + # Test code for whether the C compiler supports C99 (global declarations) + ac_c_conftest_c99_globals=' +-// Does the compiler advertise C99 conformance? ++/* 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 <stdbool.h> + 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 +@@ -3109,7 +3146,6 @@ + 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) != '\'' +@@ -3175,6 +3211,8 @@ + 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 = { +@@ -3196,7 +3234,7 @@ + + # Test code for whether the C compiler supports C11 (global declarations) + ac_c_conftest_c11_globals=' +-// Does the compiler advertise C11 conformance? ++/* Does the compiler advertise C11 conformance? */ + #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L + # error "Compiler does not advertise C11 conformance" + #endif +@@ -3388,8 +3426,9 @@ + if $as_found + then : + +-else $as_nop +- as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ++else case e in #( ++ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;; ++esac + fi + + +@@ -3417,12 +3456,12 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { printf "%s " "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-printf "%s " "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 ++printf "%s " "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { printf "%s " "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +-printf "%s " "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 ++printf "%s " "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) +@@ -3431,18 +3470,18 @@ + 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 " "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +-printf "%s " "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 ++printf "%s " "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else +- { printf "%s " "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-printf "%s " "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 ++printf "%s " "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi +- { printf "%s " "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +-printf "%s " "$as_me: former value: \`$ac_old_val'" >&2;} +- { printf "%s " "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +-printf "%s " "$as_me: current value: \`$ac_new_val'" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 ++printf "%s " "$as_me: former value: '$ac_old_val'" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 ++printf "%s " "$as_me: current value: '$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. +@@ -3458,11 +3497,11 @@ + fi + done + if $ac_cache_corrupted; then +- { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s " "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 + printf "%s " "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' ++ as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + and start over" "$LINENO" 5 + fi + ## -------------------- ## +@@ -3480,7 +3519,7 @@ + + ac_config_headers="$ac_config_headers config.h" + +-am__api_version='1.16' ++am__api_version='1.18' + + + +@@ -3504,8 +3543,8 @@ + if test ${ac_cv_path_install+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++else case e in #( ++ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS +@@ -3559,7 +3598,8 @@ + 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 +@@ -3582,6 +3622,165 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + ++{ printf "%s " "$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 " "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5 ++printf "%s " "$am_cv_sleep_fractional_seconds" >&6; } ++ ++{ printf "%s " "$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 ++# <dollar><star>; 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 " ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5 ++ { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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 " "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5 ++printf "%s " "$am_cv_filesystem_timestamp_resolution" >&6; } ++ ++# This check should not be cached, as it may vary across builds of ++# different projects. + { printf "%s " "$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 +@@ -3590,10 +3789,14 @@ + ' + case `pwd` in + *[\\"\#\$\&\'\`$am_lf]*) ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s " "no" >&6; } + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\"\#\$\&\'\`$am_lf\ \ ]*) ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s " "no" >&6; } + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; + esac + +@@ -3602,49 +3805,45 @@ + # 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 ++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 + +- # 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! ++{ printf "%s " "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5 ++printf "%s " "$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 +-{ printf "%s " "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s " "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 ) & ++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 +@@ -3655,7 +3854,7 @@ + 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. ++# By default was 's,x,x', remove it if useless. + ac_script='s/[\$]/&&/g;s/;s,x,x,$//' + program_transform_name=`printf "%s " "$program_transform_name" | sed "$ac_script"` + +@@ -3698,8 +3897,8 @@ + if test ${ac_cv_prog_STRIP+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$STRIP"; then ++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 +@@ -3721,7 +3920,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +@@ -3743,8 +3943,8 @@ + if test ${ac_cv_prog_ac_ct_STRIP+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$ac_ct_STRIP"; then ++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 +@@ -3766,7 +3966,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +@@ -3802,8 +4003,8 @@ + if test ${ac_cv_path_mkdir+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++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 +@@ -3817,7 +4018,7 @@ + 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 '* | \ ++ *'BusyBox '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + break 3;; +@@ -3826,18 +4027,17 @@ + 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 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" ++ # 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 " "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +@@ -3852,8 +4052,8 @@ + if test ${ac_cv_prog_AWK+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$AWK"; then ++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 +@@ -3875,7 +4075,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +@@ -3897,8 +4098,8 @@ + if eval test \${ac_cv_prog_make_${ac_make}_set+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat >conftest.make <<\_ACEOF ++else case e in #( ++ e) cat >conftest.make <<\_ACEOF + SHELL = /bin/sh + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +@@ -3910,7 +4111,8 @@ + *) + eval ac_cv_prog_make_${ac_make}_set=no;; + esac +-rm -f conftest.make ++rm -f conftest.make ;; ++esac + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -3931,25 +4133,21 @@ + 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 + +-case $enable_silent_rules in # ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=1;; +-esac + am_make=${MAKE-make} + { printf "%s " "$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 $as_nop +- if printf "%s " 'TRUE=$(BAR$(V)) ++else case e in #( ++ e) if printf "%s " 'TRUE=$(BAR$(V)) + BAR0=false + BAR1=true + V=1 +@@ -3959,19 +4157,50 @@ + am_cv_make_support_nested_variables=yes + else + am_cv_make_support_nested_variables=no +-fi ++fi ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 + printf "%s " "$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='\' + ++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 " "$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 " "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5 ++printf "%s " "$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 + # is not polluted with repeated "-I." +@@ -4032,9 +4261,133 @@ + + + # We'll loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar pax cpio none' ++_am_tools='gnutar plaintar pax cpio none' + +-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' ++# 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 " "$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 " "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5 ++printf "%s " "$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 " "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++printf "%s " "yes" >&6; } ++ else ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s " "no" >&6; } ++ _am_tools=none ++ fi ++ { printf "%s " "$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 " "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5 ++printf "%s " "$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 " "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++printf "%s " "yes" >&6; } ++ else ++ { printf "%s " "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s " "no" >&6; } ++ _am_tools=none ++ fi ++ ++ { printf "%s " "$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 <conftest.tar" >&5 ++ ($am__untar <conftest.tar) >&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 " "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 ++printf "%s " "$am_cv_prog_tar_ustar" >&6; } + + + +@@ -4055,88 +4408,13 @@ + + + +-# 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: <http://austingroupbugs.net/view.php?id=542> +- +-Please tell [email protected] 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: <https://www.gnu.org/software/coreutils/>. +- +-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 + +-# Check whether --enable-silent-rules was given. +-if test ${enable_silent_rules+y} +-then : +- enableval=$enable_silent_rules; +-fi + +-case $enable_silent_rules in # ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=0;; +-esac +-am_make=${MAKE-make} +-{ printf "%s " "$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 $as_nop +- if printf "%s " 'TRUE=$(BAR$(V)) +-BAR0=false +-BAR1=true +-V=1 +-am__doit: +- @$(TRUE) +-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then +- am_cv_make_support_nested_variables=yes +-else +- am_cv_make_support_nested_variables=no +-fi +-fi +-{ printf "%s " "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +-printf "%s " "$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='\' ++ ++AM_DEFAULT_VERBOSITY=0 ++ + + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -4233,8 +4511,8 @@ + if test ${ac_cv_prog_CXX+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CXX"; then ++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 +@@ -4256,7 +4534,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +@@ -4282,8 +4561,8 @@ + if test ${ac_cv_prog_ac_ct_CXX+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$ac_ct_CXX"; then ++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 +@@ -4305,7 +4584,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +@@ -4405,8 +4685,8 @@ + printf "%s " "$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' ++ # 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. +@@ -4426,7 +4706,7 @@ + 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' ++ # 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. +@@ -4437,8 +4717,9 @@ + done + test "$ac_cv_exeext" = no && ac_cv_exeext= + +-else $as_nop +- ac_file='' ++else case e in #( ++ e) ac_file='' ;; ++esac + fi + if test -z "$ac_file" + then : +@@ -4447,13 +4728,14 @@ + printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s " "yes" >&6; } ++See 'config.log' for more details" "$LINENO" 5; } ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++printf "%s " "yes" >&6; } ;; ++esac + fi + { printf "%s " "$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; } +@@ -4477,10 +4759,10 @@ + printf "%s " "$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'. ++ # 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 +@@ -4490,11 +4772,12 @@ + * ) break;; + esac + done +-else $as_nop +- { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++else case e in #( ++ e) { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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; } ++See 'config.log' for more details" "$LINENO" 5; } ;; ++esac + fi + rm -f conftest conftest$ac_cv_exeext + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +@@ -4510,6 +4793,8 @@ + main (void) + { + FILE *f = fopen ("conftest.out", "w"); ++ if (!f) ++ return 1; + return ferror (f) || fclose (f) != 0; + + ; +@@ -4549,26 +4834,27 @@ + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++ { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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; } ++If you meant to cross compile, use '--host'. ++See 'config.log' for more details" "$LINENO" 5; } + fi + fi + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 + printf "%s " "$cross_compiling" >&6; } + +-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++rm -f conftest.$ac_ext conftest$ac_cv_exeext \ ++ conftest.o conftest.obj conftest.out + ac_clean_files=$ac_clean_files_save + { printf "%s " "$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 $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4600,16 +4886,18 @@ + break;; + esac + done +-else $as_nop +- printf "%s " "$as_me: failed program was:" >&5 ++else case e in #( ++ e) printf "%s " "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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; } ++See 'config.log' for more details" "$LINENO" 5; } ;; ++esac + fi +-rm -f conftest.$ac_cv_objext conftest.$ac_ext ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + printf "%s " "$ac_cv_objext" >&6; } +@@ -4620,8 +4908,8 @@ + if test ${ac_cv_cxx_compiler_gnu+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -4638,12 +4926,14 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_compiler_gnu=yes +-else $as_nop +- ac_compiler_gnu=no ++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 " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 + printf "%s " "$ac_cv_cxx_compiler_gnu" >&6; } +@@ -4661,8 +4951,8 @@ + if test ${ac_cv_prog_cxx_g+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++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" +@@ -4680,8 +4970,8 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_cv_prog_cxx_g=yes +-else $as_nop +- CXXFLAGS="" ++else case e in #( ++ e) CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -4696,8 +4986,8 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + +-else $as_nop +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++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. */ +@@ -4714,12 +5004,15 @@ + then : + ac_cv_prog_cxx_g=yes + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++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 ++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 ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 + printf "%s " "$ac_cv_prog_cxx_g" >&6; } +@@ -4743,11 +5036,11 @@ + then : + { printf "%s " "$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_11+y} ++if test ${ac_cv_prog_cxx_cxx11+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cxx_11=no ++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. */ +@@ -4764,36 +5057,39 @@ + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break + done + rm -f conftest.$ac_ext +-CXX=$ac_save_CXX ++CXX=$ac_save_CXX ;; ++esac + fi + + if test "x$ac_cv_prog_cxx_cxx11" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cxx_cxx11" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cxx_cxx11" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 + printf "%s " "$ac_cv_prog_cxx_cxx11" >&6; } +- CXX="$CXX $ac_cv_prog_cxx_cxx11" ++ CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; ++esac + fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 +- ac_prog_cxx_stdcxx=cxx11 ++ ac_prog_cxx_stdcxx=cxx11 ;; ++esac + fi + fi + if test x$ac_prog_cxx_stdcxx = xno + then : + { printf "%s " "$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_98+y} ++if test ${ac_cv_prog_cxx_cxx98+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cxx_98=no ++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. */ +@@ -4810,25 +5106,28 @@ + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break + done + rm -f conftest.$ac_ext +-CXX=$ac_save_CXX ++CXX=$ac_save_CXX ;; ++esac + fi + + if test "x$ac_cv_prog_cxx_cxx98" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cxx_cxx98" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cxx_cxx98" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 + printf "%s " "$ac_cv_prog_cxx_cxx98" >&6; } +- CXX="$CXX $ac_cv_prog_cxx_cxx98" ++ CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; ++esac + fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 +- ac_prog_cxx_stdcxx=cxx98 ++ ac_prog_cxx_stdcxx=cxx98 ;; ++esac + fi + fi + +@@ -4845,8 +5144,8 @@ + if test ${am_cv_CXX_dependencies_compiler_type+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++else case e in #( ++ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +@@ -4933,7 +5232,7 @@ + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # When given -MP, icc 7.0 and 7.1 complain thus: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported +@@ -4950,7 +5249,8 @@ + else + am_cv_CXX_dependencies_compiler_type=none + fi +- ++ ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 + printf "%s " "$am_cv_CXX_dependencies_compiler_type" >&6; } +@@ -4981,14 +5281,14 @@ + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do +- cachevar=`printf "%s " "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh` ++ cachevar=`printf "%s " "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"` + { printf "%s " "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5 + printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; } + if eval test \${$cachevar+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_save_CXX="$CXX" ++else case e in #( ++ e) ac_save_CXX="$CXX" + CXX="$CXX $switch" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -5782,11 +6082,13 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + eval $cachevar=yes +-else $as_nop +- eval $cachevar=no ++else case e in #( ++ e) eval $cachevar=no ;; ++esac + fi + rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- CXX="$ac_save_CXX" ++ CXX="$ac_save_CXX" ;; ++esac + fi + eval ac_res=\$$cachevar + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +@@ -5855,8 +6157,8 @@ + if test ${ac_cv_prog_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CC"; then ++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 +@@ -5878,7 +6180,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +@@ -5900,8 +6203,8 @@ + if test ${ac_cv_prog_ac_ct_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$ac_ct_CC"; then ++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 +@@ -5923,7 +6226,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +@@ -5958,8 +6262,8 @@ + if test ${ac_cv_prog_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CC"; then ++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 +@@ -5981,7 +6285,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +@@ -6003,8 +6308,8 @@ + if test ${ac_cv_prog_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CC"; then ++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 +@@ -6043,7 +6348,8 @@ + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi + fi +-fi ++fi ;; ++esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +@@ -6067,8 +6373,8 @@ + if test ${ac_cv_prog_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CC"; then ++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 +@@ -6090,7 +6396,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +@@ -6116,8 +6423,8 @@ + if test ${ac_cv_prog_ac_ct_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$ac_ct_CC"; then ++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 +@@ -6139,7 +6446,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +@@ -6177,8 +6485,8 @@ + if test ${ac_cv_prog_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CC"; then ++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 +@@ -6200,7 +6508,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +@@ -6222,8 +6531,8 @@ + if test ${ac_cv_prog_ac_ct_CC+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$ac_ct_CC"; then ++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 +@@ -6245,7 +6554,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +@@ -6274,10 +6584,10 @@ + fi + + +-test -z "$CC" && { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++test -z "$CC" && { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$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; } ++See 'config.log' for more details" "$LINENO" 5; } + + # Provide some information about the compiler. + printf "%s " "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -6309,8 +6619,8 @@ + if test ${ac_cv_c_compiler_gnu+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6327,12 +6637,14 @@ + if ac_fn_c_try_compile "$LINENO" + then : + ac_compiler_gnu=yes +-else $as_nop +- ac_compiler_gnu=no ++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 " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + printf "%s " "$ac_cv_c_compiler_gnu" >&6; } +@@ -6350,8 +6662,8 @@ + if test ${ac_cv_prog_cc_g+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_save_c_werror_flag=$ac_c_werror_flag ++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" +@@ -6369,8 +6681,8 @@ + if ac_fn_c_try_compile "$LINENO" + then : + ac_cv_prog_cc_g=yes +-else $as_nop +- CFLAGS="" ++else case e in #( ++ e) CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -6385,8 +6697,8 @@ + if ac_fn_c_try_compile "$LINENO" + then : + +-else $as_nop +- ac_c_werror_flag=$ac_save_c_werror_flag ++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. */ +@@ -6403,12 +6715,15 @@ + then : + ac_cv_prog_cc_g=yes + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++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 ++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 ++ ac_c_werror_flag=$ac_save_c_werror_flag ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + printf "%s " "$ac_cv_prog_cc_g" >&6; } +@@ -6435,8 +6750,8 @@ + if test ${ac_cv_prog_cc_c11+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cc_c11=no ++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. */ +@@ -6453,25 +6768,28 @@ + test "x$ac_cv_prog_cc_c11" != "xno" && break + done + rm -f conftest.$ac_ext +-CC=$ac_save_CC ++CC=$ac_save_CC ;; ++esac + fi + + if test "x$ac_cv_prog_cc_c11" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cc_c11" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cc_c11" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 + printf "%s " "$ac_cv_prog_cc_c11" >&6; } +- CC="$CC $ac_cv_prog_cc_c11" ++ CC="$CC $ac_cv_prog_cc_c11" ;; ++esac + fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 +- ac_prog_cc_stdc=c11 ++ ac_prog_cc_stdc=c11 ;; ++esac + fi + fi + if test x$ac_prog_cc_stdc = xno +@@ -6481,8 +6799,8 @@ + if test ${ac_cv_prog_cc_c99+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cc_c99=no ++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. */ +@@ -6499,25 +6817,28 @@ + test "x$ac_cv_prog_cc_c99" != "xno" && break + done + rm -f conftest.$ac_ext +-CC=$ac_save_CC ++CC=$ac_save_CC ;; ++esac + fi + + if test "x$ac_cv_prog_cc_c99" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cc_c99" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cc_c99" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 + printf "%s " "$ac_cv_prog_cc_c99" >&6; } +- CC="$CC $ac_cv_prog_cc_c99" ++ CC="$CC $ac_cv_prog_cc_c99" ;; ++esac + fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +- ac_prog_cc_stdc=c99 ++ ac_prog_cc_stdc=c99 ;; ++esac + fi + fi + if test x$ac_prog_cc_stdc = xno +@@ -6527,8 +6848,8 @@ + if test ${ac_cv_prog_cc_c89+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cc_c89=no ++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. */ +@@ -6545,25 +6866,28 @@ + test "x$ac_cv_prog_cc_c89" != "xno" && break + done + rm -f conftest.$ac_ext +-CC=$ac_save_CC ++CC=$ac_save_CC ;; ++esac + fi + + if test "x$ac_cv_prog_cc_c89" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cc_c89" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cc_c89" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + printf "%s " "$ac_cv_prog_cc_c89" >&6; } +- CC="$CC $ac_cv_prog_cc_c89" ++ CC="$CC $ac_cv_prog_cc_c89" ;; ++esac + fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 +- ac_prog_cc_stdc=c89 ++ ac_prog_cc_stdc=c89 ;; ++esac + fi + fi + +@@ -6584,8 +6908,8 @@ + if test ${am_cv_prog_cc_c_o+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6614,8 +6938,12 @@ + break + fi + done +- rm -f core conftest* +- unset am_i ++ # 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 " "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 + printf "%s " "$am_cv_prog_cc_c_o" >&6; } +@@ -6641,8 +6969,8 @@ + if test ${am_cv_CC_dependencies_compiler_type+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++else case e in #( ++ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +@@ -6729,7 +7057,7 @@ + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # When given -MP, icc 7.0 and 7.1 complain thus: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported +@@ -6746,7 +7074,8 @@ + else + am_cv_CC_dependencies_compiler_type=none + fi +- ++ ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + printf "%s " "$am_cv_CC_dependencies_compiler_type" >&6; } +@@ -6778,8 +7107,8 @@ + if test ${ac_cv_prog_CPP+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- # Double quotes because $CC needs to be expanded ++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 +@@ -6797,9 +7126,10 @@ + if ac_fn_c_try_cpp "$LINENO" + then : + +-else $as_nop +- # Broken: fails on valid input. +-continue ++else case e in #( ++ e) # Broken: fails on valid input. ++continue ;; ++esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +@@ -6813,15 +7143,16 @@ + then : + # Broken: success on invalid input. + continue +-else $as_nop +- # Passes both tests. ++else case e in #( ++ e) # Passes both tests. + ac_preproc_ok=: +-break ++break ;; ++esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++# 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 : +@@ -6830,7 +7161,8 @@ + + done + ac_cv_prog_CPP=$CPP +- ++ ;; ++esac + fi + CPP=$ac_cv_prog_CPP + else +@@ -6853,9 +7185,10 @@ + if ac_fn_c_try_cpp "$LINENO" + then : + +-else $as_nop +- # Broken: fails on valid input. +-continue ++else case e in #( ++ e) # Broken: fails on valid input. ++continue ;; ++esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + +@@ -6869,24 +7202,26 @@ + then : + # Broken: success on invalid input. + continue +-else $as_nop +- # Passes both tests. ++else case e in #( ++ e) # Passes both tests. + ac_preproc_ok=: +-break ++break ;; ++esac + fi + rm -f conftest.err conftest.i conftest.$ac_ext + + done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++# 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_nop +- { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s " "$as_me: error: in \`$ac_pwd':" >&2;} ++else case e in #( ++ e) { { printf "%s " "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 ++printf "%s " "$as_me: error: in '$ac_pwd':" >&2;} + as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } ++See 'config.log' for more details" "$LINENO" 5; } ;; ++esac + fi + + ac_ext=cpp +@@ -6914,8 +7249,8 @@ + if test ${ac_cv_prog_CXX+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$CXX"; then ++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 +@@ -6937,7 +7272,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +@@ -6963,8 +7299,8 @@ + if test ${ac_cv_prog_ac_ct_CXX+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -n "$ac_ct_CXX"; then ++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 +@@ -6986,7 +7322,8 @@ + done + IFS=$as_save_IFS + +-fi ++fi ;; ++esac + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +@@ -7046,8 +7383,8 @@ + if test ${ac_cv_cxx_compiler_gnu+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++else case e in #( ++ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -7064,12 +7401,14 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_compiler_gnu=yes +-else $as_nop +- ac_compiler_gnu=no ++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 " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 + printf "%s " "$ac_cv_cxx_compiler_gnu" >&6; } +@@ -7087,8 +7426,8 @@ + if test ${ac_cv_prog_cxx_g+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++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" +@@ -7106,8 +7445,8 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + ac_cv_prog_cxx_g=yes +-else $as_nop +- CXXFLAGS="" ++else case e in #( ++ e) CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7122,8 +7461,8 @@ + if ac_fn_cxx_try_compile "$LINENO" + then : + +-else $as_nop +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++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. */ +@@ -7140,12 +7479,15 @@ + then : + ac_cv_prog_cxx_g=yes + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++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 ++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 ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 + printf "%s " "$ac_cv_prog_cxx_g" >&6; } +@@ -7169,11 +7511,11 @@ + then : + { printf "%s " "$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_11+y} ++if test ${ac_cv_prog_cxx_cxx11+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cxx_11=no ++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. */ +@@ -7190,36 +7532,39 @@ + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break + done + rm -f conftest.$ac_ext +-CXX=$ac_save_CXX ++CXX=$ac_save_CXX ;; ++esac + fi + + if test "x$ac_cv_prog_cxx_cxx11" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cxx_cxx11" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cxx_cxx11" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 + printf "%s " "$ac_cv_prog_cxx_cxx11" >&6; } +- CXX="$CXX $ac_cv_prog_cxx_cxx11" ++ CXX="$CXX $ac_cv_prog_cxx_cxx11" ;; ++esac + fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 +- ac_prog_cxx_stdcxx=cxx11 ++ ac_prog_cxx_stdcxx=cxx11 ;; ++esac + fi + fi + if test x$ac_prog_cxx_stdcxx = xno + then : + { printf "%s " "$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_98+y} ++if test ${ac_cv_prog_cxx_cxx98+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_prog_cxx_98=no ++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. */ +@@ -7236,25 +7581,28 @@ + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break + done + rm -f conftest.$ac_ext +-CXX=$ac_save_CXX ++CXX=$ac_save_CXX ;; ++esac + fi + + if test "x$ac_cv_prog_cxx_cxx98" = xno + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + printf "%s " "unsupported" >&6; } +-else $as_nop +- if test "x$ac_cv_prog_cxx_cxx98" = x ++else case e in #( ++ e) if test "x$ac_cv_prog_cxx_cxx98" = x + then : + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + printf "%s " "none needed" >&6; } +-else $as_nop +- { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 ++else case e in #( ++ e) { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 + printf "%s " "$ac_cv_prog_cxx_cxx98" >&6; } +- CXX="$CXX $ac_cv_prog_cxx_cxx98" ++ CXX="$CXX $ac_cv_prog_cxx_cxx98" ;; ++esac + fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 +- ac_prog_cxx_stdcxx=cxx98 ++ ac_prog_cxx_stdcxx=cxx98 ;; ++esac + fi + fi + +@@ -7271,8 +7619,8 @@ + if test ${am_cv_CXX_dependencies_compiler_type+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++else case e in #( ++ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up +@@ -7359,7 +7707,7 @@ + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # When given -MP, icc 7.0 and 7.1 complain thus: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported +@@ -7376,7 +7724,8 @@ + else + am_cv_CXX_dependencies_compiler_type=none + fi +- ++ ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 + printf "%s " "$am_cv_CXX_dependencies_compiler_type" >&6; } +@@ -7401,8 +7750,8 @@ + + + +-macro_version='2.4.6' +-macro_revision='2.4.6' ++macro_version='2.5.4' ++macro_revision='2.5.4' + + + +@@ -7430,15 +7779,16 @@ + if test ${ac_cv_build+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_build_alias=$build_alias ++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 " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + printf "%s " "$ac_cv_build" >&6; } +@@ -7465,14 +7815,15 @@ + if test ${ac_cv_host+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test "x$host_alias" = x; then ++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 " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + printf "%s " "$ac_cv_host" >&6; } +@@ -7568,8 +7919,8 @@ + if test ${ac_cv_path_SED+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++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 +@@ -7594,9 +7945,10 @@ + 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 ++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" +@@ -7631,7 +7983,8 @@ + else + ac_cv_path_SED=$SED + fi +- ++ ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + printf "%s " "$ac_cv_path_SED" >&6; } +@@ -7656,8 +8009,8 @@ + if test ${ac_cv_path_GREP+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if test -z "$GREP"; then ++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 +@@ -7676,9 +8029,10 @@ + 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 ++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" +@@ -7713,7 +8067,8 @@ + else + ac_cv_path_GREP=$GREP + fi +- ++ ;; ++esac + fi + { printf "%s " "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + printf "%s " "$ac_cv_path_GREP" >&6; } +@@ -7725,8 +8080,8 @@ + if test ${ac_cv_path_EGREP+y} + then : + printf %s "(cached) " >&6 +-else $as_nop +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++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 -e ... etc. - the rest is truncated
