From: Akim Demaille <akim@epita.fr>
Date: Tue, 23 Jan 2001 09:49:33 +0000 (+0000)
Subject: * acgeneral.m4 (_AC_INIT_PREPARE): Be sure to quote hashes to
X-Git-Tag: autoconf-2.50~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45651706401dbf7324498d4ac54c8a85a6ab5ba9;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (_AC_INIT_PREPARE): Be sure to quote hashes to
avoid M4 thinking it's comments.
---

diff --git a/BUGS b/BUGS
index d1ed999a8..01d008471 100644
--- a/BUGS
+++ b/BUGS
@@ -21,10 +21,6 @@ address them.
 
 Autoconf must not be used in production if there are serious bugs.
 
-** Unexpanded macros
-Some macros are left unexpanded (grep AS_MESSAGE configure), and
-worse, autoconf doesn't complain.
-
 ** AC_LANG vs AC_REQUIRE
 Because AC_REQUIRE makes the `time' concept different for Sh and M4,
 it may happen that the currently required language is not the one
diff --git a/ChangeLog b/ChangeLog
index 57f9aed62..3f8d7f618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-23  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (_AC_INIT_PREPARE): Be sure to quote hashes to
+	avoid M4 thinking it's comments.
+
 2001-01-23  Tim Van Holder  <tim.van.holder@pandora.be>
 
 	* aclang.m4 (_AC_COMPILER_EXEEXT_O): Use
diff --git a/acgeneral.m4 b/acgeneral.m4
index 49161420c..4019089c2 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1451,9 +1451,9 @@ done
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   echo >&AS_MESSAGE_LOG_FD
-  echo "## ----------------- ##" >&AS_MESSAGE_LOG_FD
-  echo "## Cache variables.  ##" >&AS_MESSAGE_LOG_FD
-  echo "## ----------------- ##" >&AS_MESSAGE_LOG_FD
+  echo ["## ----------------- ##"] >&AS_MESSAGE_LOG_FD
+  echo ["## Cache variables.  ##"] >&AS_MESSAGE_LOG_FD
+  echo ["## ----------------- ##"] >&AS_MESSAGE_LOG_FD
   echo >&AS_MESSAGE_LOG_FD
   m4_patsubst(m4_patsubst(m4_dquote(m4_defn([_AC_CACHE_DUMP])),
                           [^ *\(#.*\)?
@@ -1462,9 +1462,9 @@ trap 'exit_status=$?
   sed "/^$/d" confdefs.h >conftest.log
   if test -s conftest.log; then
     echo >&AS_MESSAGE_LOG_FD
-    echo "## ------------ ##" >&AS_MESSAGE_LOG_FD
-    echo "## confdefs.h.  ##" >&AS_MESSAGE_LOG_FD
-    echo "## ------------ ##" >&AS_MESSAGE_LOG_FD
+    echo ["## ------------ ##"] >&AS_MESSAGE_LOG_FD
+    echo ["## confdefs.h.  ##"] >&AS_MESSAGE_LOG_FD
+    echo ["## ------------ ##"] >&AS_MESSAGE_LOG_FD
     echo >&AS_MESSAGE_LOG_FD
     cat conftest.log >&AS_MESSAGE_LOG_FD
   fi
diff --git a/configure b/configure
index 018486f39..1e86fb919 100755
--- a/configure
+++ b/configure
@@ -30,21 +30,13 @@ else
 fi
 
 # NLS nuisances.
-
 $as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-
 $as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-
 $as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-
 $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-
 $as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-
 $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-
 $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-
 $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
 
 # IFS
@@ -54,7 +46,6 @@ ac_nl='
 IFS=" 	$ac_nl"
 
 # CDPATH.
-
 $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 
 # Name of the host.
@@ -145,11 +136,6 @@ ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
 ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
 ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
 
-# By default always use an empty string as the executable extension.
-ac_exeext=
-# By default assume that objects files use an extension of .o.
-ac_objext=o
-
 ac_unique_file="acgeneral.m4"
 
 # Initialize some variables set by options.
@@ -243,7 +229,7 @@ do
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:246: error: invalid feature name: $ac_feature" >&5
+      { { echo "$as_me:232: error: invalid feature name: $ac_feature" >&5
 echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -253,7 +239,7 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:256: error: invalid feature name: $ac_feature" >&5
+      { { echo "$as_me:242: error: invalid feature name: $ac_feature" >&5
 echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -436,7 +422,7 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:439: error: invalid package name: $ac_package" >&5
+      { { echo "$as_me:425: error: invalid package name: $ac_package" >&5
 echo "$as_me: error: invalid package name: $ac_package" >&2;}
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -450,7 +436,7 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;}
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:453: error: invalid package name: $ac_package" >&5
+      { { echo "$as_me:439: error: invalid package name: $ac_package" >&5
 echo "$as_me: error: invalid package name: $ac_package" >&2;}
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -474,7 +460,7 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;}
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { { echo "$as_me:477: error: unrecognized option: $ac_option
+  -*) { { echo "$as_me:463: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2;}
@@ -485,7 +471,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:488: error: invalid variable name: $ac_envvar" >&5
+      { { echo "$as_me:474: error: invalid variable name: $ac_envvar" >&5
 echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
@@ -494,10 +480,10 @@ echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    { echo "$as_me:497: WARNING: you should use --build, --host, --target" >&5
+    { echo "$as_me:483: WARNING: you should use --build, --host, --target" >&5
 echo "$as_me: WARNING: you should use --build, --host, --target" >&2;}
     expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
-      { echo "$as_me:500: WARNING: invalid host type: $ac_option" >&5
+      { echo "$as_me:486: WARNING: invalid host type: $ac_option" >&5
 echo "$as_me: WARNING: invalid host type: $ac_option" >&2;}
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
@@ -507,7 +493,7 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { { echo "$as_me:510: error: missing argument to $ac_option" >&5
+  { { echo "$as_me:496: error: missing argument to $ac_option" >&5
 echo "$as_me: error: missing argument to $ac_option" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -521,7 +507,7 @@ do
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
     NONE ) ;;
-    *)  { { echo "$as_me:524: error: expected an absolute path for --$ac_var: $ac_val" >&5
+    *)  { { echo "$as_me:510: error: expected an absolute path for --$ac_var: $ac_val" >&5
 echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -537,7 +523,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    { echo "$as_me:540: WARNING: If you wanted to set the --build type, don't use --host.
+    { echo "$as_me:526: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&5
 echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2;}
@@ -565,11 +551,11 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { { echo "$as_me:568: error: cannot find sources in $ac_confdir or .." >&5
+    { { echo "$as_me:554: error: cannot find sources in $ac_confdir or .." >&5
 echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2;}
    { (exit 1); exit 1; }; }
   else
-    { { echo "$as_me:572: error: cannot find sources in $srcdir" >&5
+    { { echo "$as_me:558: error: cannot find sources in $srcdir" >&5
 echo "$as_me: error: cannot find sources in $srcdir" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -695,7 +681,7 @@ if test "$ac_init_help" = "recursive"; then
       echo
       $ac_configure --help
     else
-      { echo "$as_me:698: WARNING: no configuration information is in $ac_subdir" >&5
+      { echo "$as_me:684: WARNING: no configuration information is in $ac_subdir" >&5
 echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
     fi
     cd $ac_popdir
@@ -738,8 +724,40 @@ do
 done
 
 # When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
 trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
   test "$ac_signal" != 0 &&
     echo "$as_me: caught signal $ac_signal" >&5
   echo "$as_me: exit $exit_status" >&5
@@ -747,7 +765,7 @@ trap 'exit_status=$?
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_status=$?; ac_signal='$ac_signal'; exit $ac_status' $ac_signal
+  trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
 done
 ac_signal=0
 
@@ -776,7 +794,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:779: loading cache $cache_file" >&5
+    { echo "$as_me:797: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -784,7 +802,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:787: creating cache $cache_file" >&5
+  { echo "$as_me:805: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -800,30 +818,30 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:803: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:821: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_suggest_removing_cache=: ;;
     ,set)
-      { echo "$as_me:807: WARNING: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:825: WARNING: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
       ac_suggest_removing_cache=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:813: WARNING: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:831: WARNING: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:815: WARNING:   former value:  $ac_old_val" >&5
+        { echo "$as_me:833: WARNING:   former value:  $ac_old_val" >&5
 echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:817: WARNING:   current value: $ac_new_val" >&5
+        { echo "$as_me:835: WARNING:   current value: $ac_new_val" >&5
 echo "$as_me: WARNING:   current value: $ac_new_val" >&2;}
         ac_suggest_removing_cache=:
       fi;;
   esac
 done
 if $ac_suggest_removing_cache; then
-  { echo "$as_me:824: WARNING: changes in the environment can compromise the build" >&5
+  { echo "$as_me:842: WARNING: changes in the environment can compromise the build" >&5
 echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
-  { echo "$as_me:826: WARNING: consider removing $cache_file and starting over" >&5
+  { echo "$as_me:844: WARNING: consider removing $cache_file and starting over" >&5
 echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
 fi
 
@@ -857,7 +875,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:860: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:878: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -877,7 +895,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:880: checking for a BSD compatible install" >&5
+echo "$as_me:898: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -926,7 +944,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:929: result: $INSTALL" >&5
+echo "$as_me:947: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -937,7 +955,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:940: checking whether build environment is sane" >&5
+echo "$as_me:958: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -960,7 +978,7 @@ if (
       # 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".
-      { { echo "$as_me:963: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:981: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -973,14 +991,14 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:976: error: newly created file is older than distributed files!
+   { { echo "$as_me:994: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest*
-echo "$as_me:983: result: yes" >&5
+echo "$as_me:1001: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
@@ -1001,7 +1019,7 @@ test "$program_suffix" != NONE &&
 # sed with no file args requires a program.
 test -z "$program_transform_name" && program_transform_name="s,x,x,"
 
-echo "$as_me:1004: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1022: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1021,11 +1039,11 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1024: result: yes" >&5
+  echo "$as_me:1042: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1028: result: no" >&5
+  echo "$as_me:1046: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1035,7 +1053,7 @@ PACKAGE=autoconf
 VERSION=2.49c
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { { echo "$as_me:1038: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1056: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1049,78 +1067,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:1052: checking for working aclocal" >&5
+echo "$as_me:1070: checking for working aclocal" >&5
 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
-   echo "$as_me:1059: result: found" >&5
+   echo "$as_me:1077: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$SHELL $missing_dir/missing aclocal"
-   echo "$as_me:1063: result: missing" >&5
+   echo "$as_me:1081: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1067: checking for working autoconf" >&5
+echo "$as_me:1085: checking for working autoconf" >&5
 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    AUTOCONF=autoconf
-   echo "$as_me:1074: result: found" >&5
+   echo "$as_me:1092: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$SHELL $missing_dir/missing autoconf"
-   echo "$as_me:1078: result: missing" >&5
+   echo "$as_me:1096: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1082: checking for working automake" >&5
+echo "$as_me:1100: checking for working automake" >&5
 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (automake --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake
-   echo "$as_me:1089: result: found" >&5
+   echo "$as_me:1107: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$SHELL $missing_dir/missing automake"
-   echo "$as_me:1093: result: missing" >&5
+   echo "$as_me:1111: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1097: checking for working autoheader" >&5
+echo "$as_me:1115: checking for working autoheader" >&5
 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    AUTOHEADER=autoheader
-   echo "$as_me:1104: result: found" >&5
+   echo "$as_me:1122: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$SHELL $missing_dir/missing autoheader"
-   echo "$as_me:1108: result: missing" >&5
+   echo "$as_me:1126: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1112: checking for working makeinfo" >&5
+echo "$as_me:1130: checking for working makeinfo" >&5
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    MAKEINFO=makeinfo
-   echo "$as_me:1119: result: found" >&5
+   echo "$as_me:1137: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$SHELL $missing_dir/missing makeinfo"
-   echo "$as_me:1123: result: missing" >&5
+   echo "$as_me:1141: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
@@ -1129,7 +1147,7 @@ AUTOTEST_PATH=..
 
 # Extract the first word of "expr", so it can be a program name with args.
 set dummy expr; ac_word=$2
-echo "$as_me:1132: checking for $ac_word" >&5
+echo "$as_me:1150: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EXPR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1156,10 +1174,10 @@ fi
 EXPR=$ac_cv_path_EXPR
 
 if test -n "$EXPR"; then
-  echo "$as_me:1159: result: $EXPR" >&5
+  echo "$as_me:1177: result: $EXPR" >&5
 echo "${ECHO_T}$EXPR" >&6
 else
-  echo "$as_me:1162: result: no" >&5
+  echo "$as_me:1180: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1171,7 +1189,7 @@ for ac_prog in gm4 gnum4 m4
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1174: checking for $ac_word" >&5
+echo "$as_me:1192: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1198,10 +1216,10 @@ fi
 M4=$ac_cv_path_M4
 
 if test -n "$M4"; then
-  echo "$as_me:1201: result: $M4" >&5
+  echo "$as_me:1219: result: $M4" >&5
 echo "${ECHO_T}$M4" >&6
 else
-  echo "$as_me:1204: result: no" >&5
+  echo "$as_me:1222: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1209,7 +1227,7 @@ fi
 done
 test -n "$M4" || M4="m4"
 
-echo "$as_me:1212: checking whether m4 supports frozen files" >&5
+echo "$as_me:1230: checking whether m4 supports frozen files" >&5
 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1221,10 +1239,10 @@ if test x"$M4" != x; then
   esac
 fi
 fi
-echo "$as_me:1224: result: $ac_cv_prog_gnu_m4" >&5
+echo "$as_me:1242: result: $ac_cv_prog_gnu_m4" >&5
 echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
 if test x"$ac_cv_prog_gnu_m4" != xyes; then
-  { { echo "$as_me:1227: error: GNU m4 1.4 is required" >&5
+  { { echo "$as_me:1245: error: GNU m4 1.4 is required" >&5
 echo "$as_me: error: GNU m4 1.4 is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1236,7 +1254,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1239: checking for $ac_word" >&5
+echo "$as_me:1257: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1258,10 +1276,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1261: result: $AWK" >&5
+  echo "$as_me:1279: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1264: result: no" >&5
+  echo "$as_me:1282: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1269,25 +1287,25 @@ fi
 done
 
 # Generating man pages.
-echo "$as_me:1272: checking for working help2man" >&5
+echo "$as_me:1290: checking for working help2man" >&5
 echo $ECHO_N "checking for working help2man... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (help2man --version) < /dev/null > /dev/null 2>&1; then
    HELP2MAN=help2man
-   echo "$as_me:1279: result: found" >&5
+   echo "$as_me:1297: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    HELP2MAN="$SHELL $missing_dir/missing help2man"
-   echo "$as_me:1283: result: missing" >&5
+   echo "$as_me:1301: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
 # We use a path for perl so the #! line in autoscan will work.
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "$as_me:1290: checking for $ac_word" >&5
+echo "$as_me:1308: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1315,17 +1333,17 @@ fi
 PERL=$ac_cv_path_PERL
 
 if test -n "$PERL"; then
-  echo "$as_me:1318: result: $PERL" >&5
+  echo "$as_me:1336: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:1321: result: no" >&5
+  echo "$as_me:1339: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$PERL" != no; then
   PERLSCRIPTS=autoscan
 else
-  { echo "$as_me:1328: WARNING: autoscan will not be built since perl is not found" >&5
+  { echo "$as_me:1346: WARNING: autoscan will not be built since perl is not found" >&5
 echo "$as_me: WARNING: autoscan will not be built since perl is not found" >&2;}
 fi
 
@@ -1341,7 +1359,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1344: checking for a BSD compatible install" >&5
+echo "$as_me:1362: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1390,7 +1408,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1393: result: $INSTALL" >&5
+echo "$as_me:1411: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1501,54 +1519,10 @@ ac_LF_and_DOT=`echo; echo .`
 DEFS=`sed -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
 rm -f confdef2opt.sed
 
-# Save into config.log some information that might help in debugging.
-cat <<_ACEOF >&5
-
-## ----------------- ##
-## Cache variables.  ##
-## ----------------- ##
-
-_ACEOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-        "s/'/'\\\\''/g;
-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} >&5
-
-sed '/^$/d' confdefs.h >conftest.log
-if test -s conftest.log; then
-  cat <<_ACEOF >&5
-
-## ------------ ##
-## confdefs.h.  ##
-## ------------ ##
-
-_ACEOF
-  cat conftest.log >&5
-fi
-(echo; echo) >&5
-
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:1551: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:1525: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<\_ACEOF
 #! /bin/sh
@@ -1582,21 +1556,13 @@ else
 fi
 
 # NLS nuisances.
-
 $as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-
 $as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-
 $as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-
 $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-
 $as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-
 $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-
 $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-
 $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
 
 # IFS
@@ -1606,7 +1572,6 @@ ac_nl='
 IFS=" 	$ac_nl"
 
 # CDPATH.
-
 $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 
 # File descriptor usage:
@@ -1717,7 +1682,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:1720: error: ambiguous option: $1
+    { { echo "$as_me:1685: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -1744,12 +1709,12 @@ Try \`$0 --help' for more information." >&2;}
   'tests/atconfig' ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;;
 
   # This is an error.
-  -*) { { echo "$as_me:1747: error: unrecognized option: $1
+  -*) { { echo "$as_me:1712: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
-  *) { { echo "$as_me:1752: error: invalid argument: $1" >&5
+  *) { { echo "$as_me:1717: error: invalid argument: $1" >&5
 echo "$as_me: error: invalid argument: $1" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -1761,8 +1726,10 @@ EOF
 cat >>$CONFIG_STATUS <<\EOF
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  CONFIG_FILES=${CONFIG_FILES="$config_files"}
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 fi
 
 # Create a temporary directory, and hook for its removal unless debugging.
@@ -1909,8 +1876,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   esac
 
   # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-  ac_dir=`
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
          X"$ac_file" : 'X\(//\)[^/]' \| \
          X"$ac_file" : 'X\(//\)$' \| \
          X"$ac_file" : 'X\(/\)' \| \
@@ -1963,7 +1929,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:1966: creating $ac_file" >&5
+    { echo "$as_me:1932: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -1981,7 +1947,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]* | ?:[\\/]*)
          # Absolute
-         test -f "$f" || { { echo "$as_me:1984: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:1950: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -1994,7 +1960,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $ac_given_srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:1997: error: cannot find input file: $f" >&5
+           { { echo "$as_me:1963: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 49161420c..4019089c2 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1451,9 +1451,9 @@ done
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   echo >&AS_MESSAGE_LOG_FD
-  echo "## ----------------- ##" >&AS_MESSAGE_LOG_FD
-  echo "## Cache variables.  ##" >&AS_MESSAGE_LOG_FD
-  echo "## ----------------- ##" >&AS_MESSAGE_LOG_FD
+  echo ["## ----------------- ##"] >&AS_MESSAGE_LOG_FD
+  echo ["## Cache variables.  ##"] >&AS_MESSAGE_LOG_FD
+  echo ["## ----------------- ##"] >&AS_MESSAGE_LOG_FD
   echo >&AS_MESSAGE_LOG_FD
   m4_patsubst(m4_patsubst(m4_dquote(m4_defn([_AC_CACHE_DUMP])),
                           [^ *\(#.*\)?
@@ -1462,9 +1462,9 @@ trap 'exit_status=$?
   sed "/^$/d" confdefs.h >conftest.log
   if test -s conftest.log; then
     echo >&AS_MESSAGE_LOG_FD
-    echo "## ------------ ##" >&AS_MESSAGE_LOG_FD
-    echo "## confdefs.h.  ##" >&AS_MESSAGE_LOG_FD
-    echo "## ------------ ##" >&AS_MESSAGE_LOG_FD
+    echo ["## ------------ ##"] >&AS_MESSAGE_LOG_FD
+    echo ["## confdefs.h.  ##"] >&AS_MESSAGE_LOG_FD
+    echo ["## ------------ ##"] >&AS_MESSAGE_LOG_FD
     echo >&AS_MESSAGE_LOG_FD
     cat conftest.log >&AS_MESSAGE_LOG_FD
   fi