From: Akim Demaille <akim@epita.fr>
Date: Thu, 18 Jan 2001 09:30:10 +0000 (+0000)
Subject: * acgeneral.m4: Don't leave macro names in comments.
X-Git-Tag: autoconf-2.50~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bc8d19d4e96e602570e8fec79919b5086371580;p=thirdparty%2Fautoconf.git

* acgeneral.m4: Don't leave macro names in comments.
* aclang.m4: Likewise.
* configure.in: Likewise.
* tests/semantics.at: Likewise.
* tests/tools.at: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 13d28a2b8..580d5f9c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-18  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4: Don't leave macro names in comments.
+	* aclang.m4: Likewise.
+	* configure.in: Likewise.
+	* tests/semantics.at: Likewise.
+	* tests/tools.at: Likewise.
+
 2001-01-18  Akim Demaille  <akim@epita.fr>
 
 	Medium term goal: AC_ macros can be tested with -W obsolete.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 32487bb07..174e09c7c 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -804,10 +804,8 @@ 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.
-# Only change it if the script calls AC_EXEEXT.
 ac_exeext=
-# By default assume that objects files use an extension of .o.  Only
-# change it if the script calls AC_OBJEXT.
+# By default assume that objects files use an extension of .o.
 ac_objext=o
 
 m4_divert_pop([DEFAULTS])dnl
@@ -4187,9 +4185,6 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   configure_input="Generated automatically from `echo $ac_file_in |
                                                  sed 's,.*/,,'` by configure."
 
-  # Don't redirect the output to AC_FILE directly: use `mv' so that
-  # updating is atomic, and doesn't need trapping.
-
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
@@ -4392,7 +4387,7 @@ s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${a
 EOF
 # If some macros were called several times there might be several times
 # the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC_DEFINE to be honored.
+# sort them, since we want the *last* AC-DEFINE to be honored.
 uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
 sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
 rm -f confdef2sed.sed
diff --git a/aclang.m4 b/aclang.m4
index b5bcc9496..6203c62d3 100644
--- a/aclang.m4
+++ b/aclang.m4
@@ -621,7 +621,7 @@ m4_define([AC_LINK_IFELSE],
 [AC_FATAL([All the tests involving linking were disabled by $0])])
 
 m4_divert_pop()dnl
-])# # AC_NO_EXECUTABLES
+])# AC_NO_EXECUTABLES
 
 
 
@@ -1253,9 +1253,8 @@ AC_DEFUN([AC_PROG_F77_C_O],
 AC_CACHE_CHECK([whether $F77 understand -c and -o together],
                [ac_cv_prog_f77_c_o],
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-# We do the `AC_TRY_EVAL' test twice because some compilers refuse to
-# overwrite an existing `.o' file with `-o', although they will create
-# one.
+# We test twice because some compilers refuse to overwrite an existing
+# `.o' file with `-o', although they will create one.
 ac_try='$F77 $FFLAGS -c conftest.$ac_ext -o conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
 if AC_TRY_EVAL(ac_try) &&
      test -f conftest.$ac_objext &&
@@ -1362,12 +1361,10 @@ esac
 ])# AC_PROG_CC_STDC
 
 
-
-
-
-
-AC_DEFUN([AC_C_CROSS],
-[AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
+# AC_C_CROSS
+# ----------
+# Has been merged into AC_PROG_CC.
+AU_DEFUN([AC_C_CROSS], [])
 
 
 # AC_C_CHAR_UNSIGNED
diff --git a/configure b/configure
index 0091ffd3a..a28143723 100755
--- a/configure
+++ b/configure
@@ -146,10 +146,8 @@ 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.
-# Only change it if the script calls AC_EXEEXT.
 ac_exeext=
-# By default assume that objects files use an extension of .o.  Only
-# change it if the script calls AC_OBJEXT.
+# By default assume that objects files use an extension of .o.
 ac_objext=o
 
 ac_unique_file="acgeneral.m4"
@@ -245,7 +243,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:248: error: invalid feature name: $ac_feature" >&5
+      { { echo "$as_me:246: 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'`
@@ -255,7 +253,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:258: error: invalid feature name: $ac_feature" >&5
+      { { echo "$as_me:256: 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'`
@@ -438,7 +436,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:441: 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'`
@@ -452,7 +450,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:455: error: invalid package name: $ac_package" >&5
+      { { echo "$as_me:453: 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'`
@@ -476,7 +474,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:479: error: unrecognized option: $ac_option
+  -*) { { echo "$as_me:477: 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;}
@@ -487,7 +485,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:490: error: invalid variable name: $ac_envvar" >&5
+      { { echo "$as_me:488: 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"`
@@ -496,10 +494,10 @@ echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    { echo "$as_me:499: WARNING: you should use --build, --host, --target" >&5
+    { echo "$as_me:497: 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:502: WARNING: invalid host type: $ac_option" >&5
+      { echo "$as_me:500: 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}
     ;;
@@ -509,7 +507,7 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { { echo "$as_me:512: error: missing argument to $ac_option" >&5
+  { { echo "$as_me:510: error: missing argument to $ac_option" >&5
 echo "$as_me: error: missing argument to $ac_option" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -523,7 +521,7 @@ do
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
     NONE ) ;;
-    *)  { { echo "$as_me:526: error: expected an absolute path for --$ac_var: $ac_val" >&5
+    *)  { { echo "$as_me:524: 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
@@ -539,7 +537,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    { echo "$as_me:542: WARNING: If you wanted to set the --build type, don't use --host.
+    { echo "$as_me:540: 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;}
@@ -567,11 +565,11 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { { echo "$as_me:570: error: cannot find sources in $ac_confdir or .." >&5
+    { { echo "$as_me:568: 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:574: error: cannot find sources in $srcdir" >&5
+    { { echo "$as_me:572: error: cannot find sources in $srcdir" >&5
 echo "$as_me: error: cannot find sources in $srcdir" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -697,7 +695,7 @@ if test "$ac_init_help" = "recursive"; then
       echo
       $ac_configure --help
     else
-      { echo "$as_me:700: WARNING: no configuration information is in $ac_subdir" >&5
+      { echo "$as_me:698: 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
@@ -778,7 +776,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:781: loading cache $cache_file" >&5
+    { echo "$as_me:779: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -786,7 +784,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:789: creating cache $cache_file" >&5
+  { echo "$as_me:787: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -802,30 +800,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:805: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:803: 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:809: WARNING: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:807: 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:815: WARNING: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:813: 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:817: WARNING:   former value:  $ac_old_val" >&5
+        { echo "$as_me:815: WARNING:   former value:  $ac_old_val" >&5
 echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:819: WARNING:   current value: $ac_new_val" >&5
+        { echo "$as_me:817: 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:826: WARNING: changes in the environment can compromise the build" >&5
+  { echo "$as_me:824: 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:828: WARNING: consider removing $cache_file and starting over" >&5
+  { echo "$as_me:826: WARNING: consider removing $cache_file and starting over" >&5
 echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
 fi
 
@@ -859,7 +857,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:862: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:860: 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
@@ -879,7 +877,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:882: checking for a BSD compatible install" >&5
+echo "$as_me:880: 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
@@ -928,7 +926,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:931: result: $INSTALL" >&5
+echo "$as_me:929: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -939,7 +937,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:942: checking whether build environment is sane" >&5
+echo "$as_me:940: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -962,7 +960,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:965: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:963: 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;}
@@ -975,14 +973,14 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:978: error: newly created file is older than distributed files!
+   { { echo "$as_me:976: 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:985: result: yes" >&5
+echo "$as_me:983: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
@@ -1003,7 +1001,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:1006: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1004: 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
@@ -1023,11 +1021,11 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1026: result: yes" >&5
+  echo "$as_me:1024: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1030: result: no" >&5
+  echo "$as_me:1028: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1037,7 +1035,7 @@ PACKAGE=autoconf
 VERSION=2.49c
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { { echo "$as_me:1040: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1038: 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
@@ -1051,78 +1049,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:1054: checking for working aclocal" >&5
+echo "$as_me:1052: 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:1061: result: found" >&5
+   echo "$as_me:1059: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$SHELL $missing_dir/missing aclocal"
-   echo "$as_me:1065: result: missing" >&5
+   echo "$as_me:1063: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1069: checking for working autoconf" >&5
+echo "$as_me:1067: 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:1076: result: found" >&5
+   echo "$as_me:1074: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$SHELL $missing_dir/missing autoconf"
-   echo "$as_me:1080: result: missing" >&5
+   echo "$as_me:1078: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1084: checking for working automake" >&5
+echo "$as_me:1082: 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:1091: result: found" >&5
+   echo "$as_me:1089: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$SHELL $missing_dir/missing automake"
-   echo "$as_me:1095: result: missing" >&5
+   echo "$as_me:1093: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1099: checking for working autoheader" >&5
+echo "$as_me:1097: 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:1106: result: found" >&5
+   echo "$as_me:1104: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$SHELL $missing_dir/missing autoheader"
-   echo "$as_me:1110: result: missing" >&5
+   echo "$as_me:1108: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "$as_me:1114: checking for working makeinfo" >&5
+echo "$as_me:1112: 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:1121: result: found" >&5
+   echo "$as_me:1119: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$SHELL $missing_dir/missing makeinfo"
-   echo "$as_me:1125: result: missing" >&5
+   echo "$as_me:1123: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
@@ -1131,7 +1129,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:1134: checking for $ac_word" >&5
+echo "$as_me:1132: 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
@@ -1158,10 +1156,10 @@ fi
 EXPR=$ac_cv_path_EXPR
 
 if test -n "$EXPR"; then
-  echo "$as_me:1161: result: $EXPR" >&5
+  echo "$as_me:1159: result: $EXPR" >&5
 echo "${ECHO_T}$EXPR" >&6
 else
-  echo "$as_me:1164: result: no" >&5
+  echo "$as_me:1162: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1173,7 +1171,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:1176: checking for $ac_word" >&5
+echo "$as_me:1174: 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
@@ -1200,10 +1198,10 @@ fi
 M4=$ac_cv_path_M4
 
 if test -n "$M4"; then
-  echo "$as_me:1203: result: $M4" >&5
+  echo "$as_me:1201: result: $M4" >&5
 echo "${ECHO_T}$M4" >&6
 else
-  echo "$as_me:1206: result: no" >&5
+  echo "$as_me:1204: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1211,7 +1209,7 @@ fi
 done
 test -n "$M4" || M4="m4"
 
-echo "$as_me:1214: checking whether m4 supports frozen files" >&5
+echo "$as_me:1212: 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
@@ -1223,22 +1221,22 @@ if test x"$M4" != x; then
   esac
 fi
 fi
-echo "$as_me:1226: result: $ac_cv_prog_gnu_m4" >&5
+echo "$as_me:1224: 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:1229: error: GNU m4 1.4 is required" >&5
+  { { echo "$as_me:1227: error: GNU m4 1.4 is required" >&5
 echo "$as_me: error: GNU m4 1.4 is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 # This is needed because Automake does not seem to realize there is
-# an AC_SUBST inside AC_PROG_GNU_M4.  Grmph!
+# a AC-SUBST inside AC-PROG-GNU-M4.  Grmph!
 
 # `autoconf' and `ifnames' use AWK.
 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:1241: checking for $ac_word" >&5
+echo "$as_me:1239: 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
@@ -1260,10 +1258,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1263: result: $AWK" >&5
+  echo "$as_me:1261: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1266: result: no" >&5
+  echo "$as_me:1264: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1271,25 +1269,25 @@ fi
 done
 
 # Generating man pages.
-echo "$as_me:1274: checking for working help2man" >&5
+echo "$as_me:1272: 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:1281: result: found" >&5
+   echo "$as_me:1279: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    HELP2MAN="$SHELL $missing_dir/missing help2man"
-   echo "$as_me:1285: result: missing" >&5
+   echo "$as_me:1283: 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:1292: checking for $ac_word" >&5
+echo "$as_me:1290: 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
@@ -1317,17 +1315,17 @@ fi
 PERL=$ac_cv_path_PERL
 
 if test -n "$PERL"; then
-  echo "$as_me:1320: result: $PERL" >&5
+  echo "$as_me:1318: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "$as_me:1323: result: no" >&5
+  echo "$as_me:1321: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$PERL" != no; then
   PERLSCRIPTS=autoscan
 else
-  { echo "$as_me:1330: WARNING: autoscan will not be built since perl is not found" >&5
+  { echo "$as_me:1328: 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
 
@@ -1343,7 +1341,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:1346: checking for a BSD compatible install" >&5
+echo "$as_me:1344: 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
@@ -1392,7 +1390,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1395: result: $INSTALL" >&5
+echo "$as_me:1393: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1550,7 +1548,7 @@ fi
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:1553: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:1551: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<\_ACEOF
 #! /bin/sh
@@ -1719,7 +1717,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:1722: error: ambiguous option: $1
+    { { echo "$as_me:1720: 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;}
@@ -1746,12 +1744,12 @@ Try \`$0 --help' for more information." >&2;}
   'tests/atconfig' ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;;
 
   # This is an error.
-  -*) { { echo "$as_me:1749: error: unrecognized option: $1
+  -*) { { echo "$as_me:1747: 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:1754: error: invalid argument: $1" >&5
+  *) { { echo "$as_me:1752: error: invalid argument: $1" >&5
 echo "$as_me: error: invalid argument: $1" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -1959,7 +1957,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:1962: creating $ac_file" >&5
+    { echo "$as_me:1960: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -1969,9 +1967,6 @@ echo "$as_me: creating $ac_file" >&6;}
   configure_input="Generated automatically from `echo $ac_file_in |
                                                  sed 's,.*/,,'` by configure."
 
-  # Don't redirect the output to AC_FILE directly: use `mv' so that
-  # updating is atomic, and doesn't need trapping.
-
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
@@ -1980,7 +1975,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]* | ?:[\\/]*)
          # Absolute
-         test -f "$f" || { { echo "$as_me:1983: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:1978: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -1993,7 +1988,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $ac_given_srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:1996: error: cannot find input file: $f" >&5
+           { { echo "$as_me:1991: 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/configure.in b/configure.in
index 26ea26094..10f7618ab 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ if test x"$ac_cv_prog_gnu_m4" != xyes; then
   AC_MSG_ERROR([GNU m4 1.4 is required])
 fi
 # This is needed because Automake does not seem to realize there is
-# an AC_SUBST inside AC_PROG_GNU_M4.  Grmph!
+# a AC-SUBST inside AC-PROG-GNU-M4.  Grmph!
 AC_SUBST(M4)
 
 # `autoconf' and `ifnames' use AWK.
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index b5bcc9496..6203c62d3 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -621,7 +621,7 @@ m4_define([AC_LINK_IFELSE],
 [AC_FATAL([All the tests involving linking were disabled by $0])])
 
 m4_divert_pop()dnl
-])# # AC_NO_EXECUTABLES
+])# AC_NO_EXECUTABLES
 
 
 
@@ -1253,9 +1253,8 @@ AC_DEFUN([AC_PROG_F77_C_O],
 AC_CACHE_CHECK([whether $F77 understand -c and -o together],
                [ac_cv_prog_f77_c_o],
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-# We do the `AC_TRY_EVAL' test twice because some compilers refuse to
-# overwrite an existing `.o' file with `-o', although they will create
-# one.
+# We test twice because some compilers refuse to overwrite an existing
+# `.o' file with `-o', although they will create one.
 ac_try='$F77 $FFLAGS -c conftest.$ac_ext -o conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
 if AC_TRY_EVAL(ac_try) &&
      test -f conftest.$ac_objext &&
@@ -1362,12 +1361,10 @@ esac
 ])# AC_PROG_CC_STDC
 
 
-
-
-
-
-AC_DEFUN([AC_C_CROSS],
-[AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
+# AC_C_CROSS
+# ----------
+# Has been merged into AC_PROG_CC.
+AU_DEFUN([AC_C_CROSS], [])
 
 
 # AC_C_CHAR_UNSIGNED
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index b5bcc9496..6203c62d3 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -621,7 +621,7 @@ m4_define([AC_LINK_IFELSE],
 [AC_FATAL([All the tests involving linking were disabled by $0])])
 
 m4_divert_pop()dnl
-])# # AC_NO_EXECUTABLES
+])# AC_NO_EXECUTABLES
 
 
 
@@ -1253,9 +1253,8 @@ AC_DEFUN([AC_PROG_F77_C_O],
 AC_CACHE_CHECK([whether $F77 understand -c and -o together],
                [ac_cv_prog_f77_c_o],
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-# We do the `AC_TRY_EVAL' test twice because some compilers refuse to
-# overwrite an existing `.o' file with `-o', although they will create
-# one.
+# We test twice because some compilers refuse to overwrite an existing
+# `.o' file with `-o', although they will create one.
 ac_try='$F77 $FFLAGS -c conftest.$ac_ext -o conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
 if AC_TRY_EVAL(ac_try) &&
      test -f conftest.$ac_objext &&
@@ -1362,12 +1361,10 @@ esac
 ])# AC_PROG_CC_STDC
 
 
-
-
-
-
-AC_DEFUN([AC_C_CROSS],
-[AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
+# AC_C_CROSS
+# ----------
+# Has been merged into AC_PROG_CC.
+AU_DEFUN([AC_C_CROSS], [])
 
 
 # AC_C_CHAR_UNSIGNED
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 32487bb07..174e09c7c 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -804,10 +804,8 @@ 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.
-# Only change it if the script calls AC_EXEEXT.
 ac_exeext=
-# By default assume that objects files use an extension of .o.  Only
-# change it if the script calls AC_OBJEXT.
+# By default assume that objects files use an extension of .o.
 ac_objext=o
 
 m4_divert_pop([DEFAULTS])dnl
@@ -4187,9 +4185,6 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   configure_input="Generated automatically from `echo $ac_file_in |
                                                  sed 's,.*/,,'` by configure."
 
-  # Don't redirect the output to AC_FILE directly: use `mv' so that
-  # updating is atomic, and doesn't need trapping.
-
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
@@ -4392,7 +4387,7 @@ s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${a
 EOF
 # If some macros were called several times there might be several times
 # the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC_DEFINE to be honored.
+# sort them, since we want the *last* AC-DEFINE to be honored.
 uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
 sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
 rm -f confdef2sed.sed
diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index b5bcc9496..6203c62d3 100644
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -621,7 +621,7 @@ m4_define([AC_LINK_IFELSE],
 [AC_FATAL([All the tests involving linking were disabled by $0])])
 
 m4_divert_pop()dnl
-])# # AC_NO_EXECUTABLES
+])# AC_NO_EXECUTABLES
 
 
 
@@ -1253,9 +1253,8 @@ AC_DEFUN([AC_PROG_F77_C_O],
 AC_CACHE_CHECK([whether $F77 understand -c and -o together],
                [ac_cv_prog_f77_c_o],
 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-# We do the `AC_TRY_EVAL' test twice because some compilers refuse to
-# overwrite an existing `.o' file with `-o', although they will create
-# one.
+# We test twice because some compilers refuse to overwrite an existing
+# `.o' file with `-o', although they will create one.
 ac_try='$F77 $FFLAGS -c conftest.$ac_ext -o conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
 if AC_TRY_EVAL(ac_try) &&
      test -f conftest.$ac_objext &&
@@ -1362,12 +1361,10 @@ esac
 ])# AC_PROG_CC_STDC
 
 
-
-
-
-
-AC_DEFUN([AC_C_CROSS],
-[AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
+# AC_C_CROSS
+# ----------
+# Has been merged into AC_PROG_CC.
+AU_DEFUN([AC_C_CROSS], [])
 
 
 # AC_C_CHAR_UNSIGNED
diff --git a/man/autoconf.1 b/man/autoconf.1
index eadc1afee..148fe6a60 100644
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOCONF "1" "January 2001" "autoconf (@PACKAGE_NAME@) 2.49c" FSF
+.TH AUTOCONF "1" "January 2001" "GNU Autoconf 2.49c" FSF
 .SH NAME
 autoconf \- Generate configuration scripts
 .SH SYNOPSIS
diff --git a/man/autoheader.1 b/man/autoheader.1
index 6ae550a00..0e433755b 100644
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOHEADER "1" "January 2001" "autoheader (@PACKAGE_NAME@) 2.49c" FSF
+.TH AUTOHEADER "1" "January 2001" "GNU Autoconf 2.49c" FSF
 .SH NAME
 autoheader \- Create a template header for configure
 .SH SYNOPSIS
diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 7de680ee9..b66d6b2e5 100644
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTORECONF "1" "January 2001" "autoreconf (@PACKAGE_NAME@) 2.49c" FSF
+.TH AUTORECONF "1" "January 2001" "GNU Autoconf 2.49c" FSF
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS
diff --git a/man/autoupdate.1 b/man/autoupdate.1
index 51cefd15b..213250b78 100644
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOUPDATE "1" "January 2001" "autoupdate (@PACKAGE_NAME@) 2.49c" FSF
+.TH AUTOUPDATE "1" "January 2001" "GNU Autoconf 2.49c" FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf
 .SH SYNOPSIS
diff --git a/man/ifnames.1 b/man/ifnames.1
index 89790f01c..a330d42eb 100644
--- a/man/ifnames.1
+++ b/man/ifnames.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH IFNAMES "1" "January 2001" "ifnames (@PACKAGE_NAME@) 2.49c" FSF
+.TH IFNAMES "1" "January 2001" "GNU Autoconf 2.49c" FSF
 .SH NAME
 ifnames \- Extract CPP conditionals from a set of files
 .SH SYNOPSIS
diff --git a/tests/semantics.at b/tests/semantics.at
index d05395d7d..5cf6f6f42 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -179,14 +179,14 @@ AT_CLEANUP
 # FIXME: To really test HAVE_AC_EXISTS2 and HAVE_AC_MISSING2 we need to
 # open AH_TEMPLATE to `configure.ac', which is not yet the case.
 AT_CHECK_MACRO([AC_CHECK_FILES],
-[touch ac-exists1 ac-exists2
-ac_exists2=ac-exists2
-ac_missing2=ac-missing2
-AC_CHECK_FILES(ac-exists1 ac-missing1 $ac_exists2 $ac_missing2)
-rm ac-exists1 ac-exists2],
+[touch at-exists1 at-exists2
+ac_exists2=at-exists2
+ac_missing2=at-missing2
+AC_CHECK_FILES(at-exists1 at-missing1 $ac_exists2 $ac_missing2)
+rm at-exists1 at-exists2],
 [AT_CHECK_DEFINES(
-[#define HAVE_AC_EXISTS1 1
-/* #undef HAVE_AC_MISSING1 */
+[#define HAVE_AT_EXISTS1 1
+/* #undef HAVE_AT_MISSING1 */
 ])])
 
 
@@ -252,7 +252,7 @@ test -z "$TOOL5" || fail=:
 AC_CHECK_PROGS(TOOL6, missing tool better,, $path)
 test "$TOOL6" = tool || fail=:
 
-# no AC_OUTPUT, we don't need config.status.
+# No AC-OUTPUT, we don't need config.status.
 $fail &&
   AC_MSG_ERROR([[CHECK_PROG failed]])
 AS_EXIT(0)
@@ -292,7 +292,7 @@ test -z "$TOOL3" || fail=:
 AC_PATH_PROGS(TOOL4, missing tool better,, $path)
 test "$TOOL4" = $pwd/path/1/tool || fail=:
 
-# no AC_OUTPUT, we don't need config.status.
+# No AC-OUTPUT, we don't need config.status.
 $fail &&
   AC_MSG_ERROR([[PATH_PROG failed]])
 AS_EXIT(0)
diff --git a/tests/update.at b/tests/update.at
index 6a8054d12..55e5e7d79 100644
--- a/tests/update.at
+++ b/tests/update.at
@@ -6,6 +6,7 @@ AT_CHECK_UPDATE([AC_ARG_ARRAY])
 AT_CHECK_UPDATE([AC_CHECKING])
 AT_CHECK_UPDATE([AC_CHECK_TOOL_PREFIX])
 AT_CHECK_UPDATE([AC_COMPILE_CHECK])
+AT_CHECK_UPDATE([AC_C_CROSS])
 AT_CHECK_UPDATE([AC_DECL_YYTEXT])
 AT_CHECK_UPDATE([AC_DIR_HEADER])
 AT_CHECK_UPDATE([AC_DYNIX_SEQ])