Regen.

diff --git a/aclocal.m4 b/aclocal.m4
index 353c35153264aa85ecd2b9411669c6da80b3ee10..937e6b8089998ea51b5da6664ca5465c817729e0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4t generated automatically by aclocal 1.6 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.

diff --git a/configure b/configure
index 3268f0bb34b4b7b891be11c76034147a3a58cf35..e63135ab1c392986c21bc23753c04cc90365dc99 100755 (executable)
--- a/configure
+++ b/configure
@@ -279,7 +279,7 @@ PACKAGE_STRING='GNU Autoconf 2.53b'
 PACKAGE_BUGREPORT='bug-autoconf@gnu.org'
 
 ac_unique_file="ChangeLog"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE EXPR M4 HELP2MAN PERL EMACS lispdir'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE SITE_MACRO_DIR EXPR M4 HELP2MAN PERL EMACS lispdir'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -791,6 +791,13 @@ if test -n "$ac_init_help"; then
    esac
   cat <<\_ACEOF
 
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-site-macro-dir=DIR
+                          use site macro directory DIR
+                          [DATADIR/autoconf/site_macros]
+
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -987,6 +994,7 @@ _ASBOX
 ## Output variables. ##
 ## ----------------- ##
 _ASBOX
+    echo
     for ac_var in $ac_subst_vars
     do
       eval ac_val=$`echo $ac_var`
@@ -994,6 +1002,21 @@ _ASBOX
     done | sort
     echo
 
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+       eval ac_val=$`echo $ac_var`
+        echo "$ac_var='"'"'$ac_val'"'"'"
+      done | sort
+      echo
+    fi
+
     if test -s confdefs.h; then
       cat <<\_ASBOX
 ## ----------- ##
@@ -1197,7 +1220,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
           ac_config_files="$ac_config_files config/Makefile"
 
 
-am__api_version="1.6a"
+am__api_version="1.6"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1553,25 +1576,35 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
+# Check whether --enable-site-macro-dir or --disable-site-macro-dir was given.
+if test "${enable_site_macro_dir+set}" = set; then
+  enableval="$enable_site_macro_dir"
+
+else
+  enable_site_macro_dir='${datadir}/autoconf/site_macros'
+fi;
+SITE_MACRO_DIR="${enable_site_macro_dir}"
+
+
 # Initialize the test suite and build position independent wrappers.
           ac_config_commands="$ac_config_commands tests/atconfig"
 
 
                     ac_config_files="$ac_config_files tests/Makefile tests/atlocal"
 
-          ac_config_files="$ac_config_files tests/autoconf:tests/wrapsh.in"
+          ac_config_files="$ac_config_files tests/autoconf:tests/wrapper.in"
 
-          ac_config_files="$ac_config_files tests/autoheader:tests/wrappl.in"
+          ac_config_files="$ac_config_files tests/autoheader:tests/wrapper.in"
 
-          ac_config_files="$ac_config_files tests/autom4te:tests/wrappl.in"
+          ac_config_files="$ac_config_files tests/autom4te:tests/wrapper.in"
 
-          ac_config_files="$ac_config_files tests/autoreconf:tests/wrappl.in"
+          ac_config_files="$ac_config_files tests/autoreconf:tests/wrapper.in"
 
-          ac_config_files="$ac_config_files tests/autoscan:tests/wrappl.in"
+          ac_config_files="$ac_config_files tests/autoscan:tests/wrapper.in"
 
-          ac_config_files="$ac_config_files tests/autoupdate:tests/wrappl.in"
+          ac_config_files="$ac_config_files tests/autoupdate:tests/wrapper.in"
 
-          ac_config_files="$ac_config_files tests/ifnames:tests/wrappl.in"
+          ac_config_files="$ac_config_files tests/ifnames:tests/wrapper.in"
 
 # Extract the first word of "expr", so it can be a program name with args.
 set dummy expr; ac_word=$2
@@ -2414,13 +2447,13 @@ do
   "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
   "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
   "tests/atlocal" ) CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;
-  "tests/autoconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoconf:tests/wrapsh.in" ;;
-  "tests/autoheader" ) CONFIG_FILES="$CONFIG_FILES tests/autoheader:tests/wrappl.in" ;;
-  "tests/autom4te" ) CONFIG_FILES="$CONFIG_FILES tests/autom4te:tests/wrappl.in" ;;
-  "tests/autoreconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoreconf:tests/wrappl.in" ;;
-  "tests/autoscan" ) CONFIG_FILES="$CONFIG_FILES tests/autoscan:tests/wrappl.in" ;;
-  "tests/autoupdate" ) CONFIG_FILES="$CONFIG_FILES tests/autoupdate:tests/wrappl.in" ;;
-  "tests/ifnames" ) CONFIG_FILES="$CONFIG_FILES tests/ifnames:tests/wrappl.in" ;;
+  "tests/autoconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoconf:tests/wrapper.in" ;;
+  "tests/autoheader" ) CONFIG_FILES="$CONFIG_FILES tests/autoheader:tests/wrapper.in" ;;
+  "tests/autom4te" ) CONFIG_FILES="$CONFIG_FILES tests/autom4te:tests/wrapper.in" ;;
+  "tests/autoreconf" ) CONFIG_FILES="$CONFIG_FILES tests/autoreconf:tests/wrapper.in" ;;
+  "tests/autoscan" ) CONFIG_FILES="$CONFIG_FILES tests/autoscan:tests/wrapper.in" ;;
+  "tests/autoupdate" ) CONFIG_FILES="$CONFIG_FILES tests/autoupdate:tests/wrapper.in" ;;
+  "tests/ifnames" ) CONFIG_FILES="$CONFIG_FILES tests/ifnames:tests/wrapper.in" ;;
   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
   "lib/emacs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/emacs/Makefile" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -2531,6 +2564,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
+s,@SITE_MACRO_DIR@,$SITE_MACRO_DIR,;t t
 s,@EXPR@,$EXPR,;t t
 s,@M4@,$M4,;t t
 s,@HELP2MAN@,$HELP2MAN,;t t
@@ -2869,3 +2903,4 @@ Below you will find information on the status of this version of Autoconf.
 
 EOF
     sed -n '/^\* Status/,$p' $srcdir/BUGS
+

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 81c0bcd9f4faf05424ccaee5f04e0a90c679338a..d1e4961d4f3ef4f854d1161b7c79e68636775047 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -84,7 +84,7 @@ lispdir = @lispdir@
 # We don't actually distribute the testsuite, since one only
 # needs m4 to build it, m4 being required anyway to install Autoconf.
 EXTRA_DIST = $(TESTSUITE_AT) atspecific.m4 mktests.sh \
-             atlocal.in package.m4 wrappl.as wrapsh.as
+             atlocal.in package.m4 wrapper.as
 
 
 # Running the uninstalled scripts.
@@ -200,7 +200,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = atlocal autoconf autoheader autom4te autoreconf \
        autoscan autoupdate ifnames
 DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in atlocal.in wrappl.in wrapsh.in
+DIST_COMMON = Makefile.am Makefile.in atlocal.in
 all: all-am
 
 .SUFFIXES:
@@ -212,19 +212,19 @@ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 atlocal: $(top_builddir)/config.status atlocal.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoconf: $(top_builddir)/config.status wrapsh.in
+autoconf: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoheader: $(top_builddir)/config.status wrappl.in
+autoheader: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autom4te: $(top_builddir)/config.status wrappl.in
+autom4te: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoreconf: $(top_builddir)/config.status wrappl.in
+autoreconf: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoscan: $(top_builddir)/config.status wrappl.in
+autoscan: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-autoupdate: $(top_builddir)/config.status wrappl.in
+autoupdate: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-ifnames: $(top_builddir)/config.status wrappl.in
+ifnames: $(top_builddir)/config.status wrapper.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 uninstall-info-am:
 tags: TAGS
@@ -369,11 +369,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
        } >$(srcdir)/package.m4
 
-$(srcdir)/wrapsh.in: $(srcdir)/wrapsh.as
-       ./autom4te --language=M4sh $(srcdir)/wrapsh.as -o $@
-
-$(srcdir)/wrappl.in: $(srcdir)/wrappl.as
-       ./autom4te --language=M4sh $(srcdir)/wrappl.as -o $@
+$(srcdir)/wrapper.in: $(srcdir)/wrapper.as
+       ./autom4te --language=M4sh $(srcdir)/wrapper.as -o $@
 $(TESTSUITE): $(srcdir)/package.m4 \
              atspecific.m4 \
               $(TESTSUITE_AT) \

diff --git a/tests/acc.at b/tests/acc.at
index c3f92cb233db43c542e0e23f29b762d86f5db61f..15571904069685cbaa81677ec088fc685173e9ca 100644 (file)
--- a/tests/acc.at
+++ b/tests/acc.at
@@ -4,6 +4,7 @@
 AT_BANNER([Testing autoconf/c macros.])
 
 # Modern macros.
+AT_CHECK_MACRO([AC_C_BACKSLASH_A])
 AT_CHECK_MACRO([AC_C_BIGENDIAN])
 AT_CHECK_MACRO([AC_C_CHAR_UNSIGNED])
 AT_CHECK_MACRO([AC_C_LONG_DOUBLE])

diff --git a/tests/acfunctions.at b/tests/acfunctions.at
index 2a58ba71ab56fa5a412a1fcb6fcec4a292f24551..120de12db264f749f4382fddf7282e658ccdd8c3 100644 (file)
--- a/tests/acfunctions.at
+++ b/tests/acfunctions.at
@@ -18,6 +18,7 @@ AT_CHECK_MACRO([AC_FUNC_MEMCMP])
 AT_CHECK_MACRO([AC_FUNC_MKTIME])
 AT_CHECK_MACRO([AC_FUNC_MMAP])
 AT_CHECK_MACRO([AC_FUNC_OBSTACK])
+AT_CHECK_MACRO([AC_FUNC_REALLOC])
 AT_CHECK_MACRO([AC_FUNC_SELECT_ARGTYPES])
 AT_CHECK_MACRO([AC_FUNC_SETPGRP])
 AT_CHECK_MACRO([AC_FUNC_SETVBUF_REVERSED])