Regenerate.

diff --git a/configure b/configure
index 8d4830ee7dbb96d520374f73e1508347f13c2de2..732ecc10d9282807dee70ff908ba9b5729a96866 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60a for GNU Autoconf 2.60a.
+# Generated by GNU Autoconf 2.60 for GNU Autoconf 2.60a.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -1289,7 +1289,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Autoconf configure 2.60a
-generated by GNU Autoconf 2.60a
+generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1303,7 +1303,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Autoconf $as_me 2.60a, which was
-generated by GNU Autoconf 2.60a.  Invocation command line was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
 
@@ -1658,7 +1658,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_aux_dir=
-for ac_dir in config "$srcdir"/config; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1674,8 +1674,8 @@ for ac_dir in config "$srcdir"/config; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1688,8 +1688,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-ac_config_files="$ac_config_files config/Makefile"
-
 
 am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
@@ -3221,7 +3219,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by GNU Autoconf $as_me 2.60a, which was
-generated by GNU Autoconf 2.60a.  Invocation command line was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3249,7 +3247,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
+  -V, --version    print version number, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -3268,7 +3266,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Autoconf config.status 2.60a
-configured by $0, generated by GNU Autoconf 2.60a,
+configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -3366,7 +3364,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
     "tests/atconfig") CONFIG_COMMANDS="$CONFIG_COMMANDS tests/atconfig" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/atlocal") CONFIG_FILES="$CONFIG_FILES tests/atlocal" ;;

diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in
index 152607bbecf929f86eaa996e5478a9a80a80798d..271c947ee25654a997508a8b0fd6b42d566ac632 100644 (file)
--- a/lib/m4sugar/Makefile.in
+++ b/lib/m4sugar/Makefile.in
@@ -38,11 +38,11 @@ DIST_COMMON = $(dist_m4sugarlib_DATA) $(srcdir)/../freeze.mk \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 subdir = lib/m4sugar
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =

diff --git a/man/Makefile.in b/man/Makefile.in
index 058cda2f848f15362c075b7e8c096777879fbafb..83a1351392de139d91da406ce5f0c6d1e389458e 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -37,11 +37,11 @@ subdir = man
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -355,8 +355,8 @@ $(srcdir)/autoupdate.1: $(common_dep) $(binsrcdir)/autoupdate.in
 $(srcdir)/ifnames.1:    $(common_dep) $(binsrcdir)/ifnames.in
 
 # Independent from this package.
-$(srcdir)/config.guess.1: $(top_srcdir)/config/config.guess
-$(srcdir)/config.sub.1:   $(top_srcdir)/config/config.sub
+$(srcdir)/config.guess.1: $(top_srcdir)/build-aux/config.guess
+$(srcdir)/config.sub.1:   $(top_srcdir)/build-aux/config.sub
 
 .x.1:
        @program=`expr "/$*" : '.*/\(.*\)'` && \
@@ -369,7 +369,7 @@ $(srcdir)/config.sub.1:   $(top_srcdir)/config/config.sub
          done;; \
        esac
        echo "Updating man page $@"
-       PATH="$(top_builddir)/tests@PATH_SEPARATOR@$(top_srcdir)/config@PATH_SEPARATOR@$$PATH"; \
+       PATH="$(top_builddir)/tests@PATH_SEPARATOR@$(top_srcdir)/build-aux@PATH_SEPARATOR@$$PATH"; \
        export PATH; \
        $(HELP2MAN) \
            --include=$*.x \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c4380c501313441d67e4143dafe93e0bcfaf6c63..a77681909c1ed99d53f93ee5037367f58f51684d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -37,11 +37,11 @@ DIST_COMMON = $(srcdir)/../lib/freeze.mk $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/atlocal.in
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = atlocal
 SOURCES =
 DIST_SOURCES =