* config: New directory.

* configure.in: AC_CONFIG_AUX_DIR it.
* tests/atspecific.m4 (AT_CONFIGURE_AC): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 5fcf7f60d837c0c27a9b95b6277113b0951635f3..4c2f8963303c8eb326649b70953668d081e4f327 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-22  Akim Demaille  <akim@epita.fr>
+
+       * config: New directory.
+       * configure.in: AC_CONFIG_AUX_DIR it.
+       * tests/atspecific.m4 (AT_CONFIGURE_AC): Adjust.
+
 2001-05-22  Akim Demaille  <akim@epita.fr>
 
        * autoconf.in, autoreconf.in, autoheader.in, autoscan.in, ifnames.in,

diff --git a/Makefile.am b/Makefile.am
index beedf6d502a6989f64f7e92ebd5bb7279e22b7a3..b8545642541db6e8ec9a93d2d310b43dd9c943de 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 AUTOMAKE_OPTIONS = check-news 1.4 readme-alpha
 
-SUBDIRS = . m4 man doc tests
+SUBDIRS = . config m4 man doc tests
 
 SUFFIXES = .m4 .m4f
 ## There is currently no means with Automake not to run aclocal.
@@ -209,5 +209,5 @@ wget-update:
        $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/standards.texi -O $(srcdir)/doc/standards.texi
        $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/make-stds.texi -O $(srcdir)/doc/make-stds.texi
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex    -O $(srcdir)/doc/texinfo.tex
-       $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess    -O $(srcdir)/config.guess
-       $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub      -O $(srcdir)/config.sub
+       $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess    -O $(srcdir)/config/config.guess
+       $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub      -O $(srcdir)/config/config.sub

diff --git a/Makefile.in b/Makefile.in
index ad345f142df396be49577b5a69041e0e37f39b7a..3b61eaea4d585b609bb2f25568ef43edc318fb34 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,7 @@ standards_texi = @standards_texi@
 
 AUTOMAKE_OPTIONS = check-news 1.4 readme-alpha
 
-SUBDIRS = . m4 man doc tests
+SUBDIRS = . config m4 man doc tests
 
 SUFFIXES = .m4 .m4f
 ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
@@ -107,15 +107,15 @@ MAINTAINERCLEANFILES = acversion.m4 INSTALL.txt
 edit = sed     -e 's,@SHELL\@,$(SHELL),g'      -e 's,@PERL\@,$(PERL),g'        -e 's,@datadir\@,$(pkgdatadir),g'       -e 's,@bindir\@,$(bindir),g'    -e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g'        -e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g'    -e 's,@M4\@,$(M4),g'    -e 's,@AWK\@,$(AWK),g'  -e 's,@VERSION\@,$(VERSION),g'  -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g'
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 SCRIPTS =  $(bin_SCRIPTS)
 
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS README-alpha THANKS TODO aclocal.m4 config.guess \
-config.sub configure configure.in install-sh missing mkinstalldirs
+Makefile.in NEWS README-alpha THANKS TODO aclocal.m4 configure \
+configure.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -508,8 +508,8 @@ wget-update:
        $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/standards.texi -O $(srcdir)/doc/standards.texi
        $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/make-stds.texi -O $(srcdir)/doc/make-stds.texi
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex    -O $(srcdir)/doc/texinfo.tex
-       $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess    -O $(srcdir)/config.guess
-       $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub      -O $(srcdir)/config.sub
+       $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess    -O $(srcdir)/config/config.guess
+       $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub      -O $(srcdir)/config/config.sub
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/config/.cvsignore b/config/.cvsignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/config/.cvsignore
@@ -0,0 +1 @@
+Makefile

diff --git a/config/Makefile.am b/config/Makefile.am
new file mode 100644 (file)
index 0000000..234c412
--- /dev/null
+++ b/config/Makefile.am
@@ -0,0 +1 @@
+## Nothing to do here.

diff --git a/config/Makefile.in b/config/Makefile.in
new file mode 100644 (file)
index 0000000..9c97853
--- /dev/null
+++ b/config/Makefile.in
@@ -0,0 +1,176 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+AWK = @AWK@
+EXPR = @EXPR@
+HELP2MAN = @HELP2MAN@
+M4 = @M4@
+PACKAGE = @PACKAGE@
+PACKAGE_NAME = @PACKAGE_NAME@
+PERL = @PERL@
+PERLSCRIPTS = @PERLSCRIPTS@
+VERSION = @VERSION@
+standards_texi = @standards_texi@
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in config.guess config.sub \
+install-sh mdate-sh missing mkinstalldirs
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+       cd $(top_builddir) \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = config
+
+distdir: $(DISTFILES)
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       distdir=`cd $(distdir) && pwd`; \
+       cd $(top_srcdir) \
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu config/Makefile
+       @for file in $(DISTFILES); do \
+         d=$(srcdir); \
+         if test -d $$d/$$file; then \
+           cp -pr $$d/$$file $(distdir)/$$file; \
+         else \
+           test -f $(distdir)/$$file \
+           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+           || cp -p $$d/$$file $(distdir)/$$file || :; \
+         fi; \
+       done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

diff --git a/config.guess b/config/config.guess
similarity index 100%
rename from config.guess
rename to config/config.guess

diff --git a/config.sub b/config/config.sub
similarity index 100%
rename from config.sub
rename to config/config.sub

diff --git a/install-sh b/config/install-sh
similarity index 100%
rename from install-sh
rename to config/install-sh

diff --git a/doc/mdate-sh b/config/mdate-sh
similarity index 100%
rename from doc/mdate-sh
rename to config/mdate-sh

diff --git a/missing b/config/missing
similarity index 100%
rename from missing
rename to config/missing

diff --git a/mkinstalldirs b/config/mkinstalldirs
similarity index 100%
rename from mkinstalldirs
rename to config/mkinstalldirs

diff --git a/configure b/configure
index 1373054be7713f996268f05faca9021a9f4a0860..ca26807f863225eb27b2261132c34b2058336495 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.50 for GNU Autoconf 2.50a.
+# Generated by Autoconf 2.50a for GNU Autoconf 2.50a.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -645,7 +645,7 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\EOF
 GNU Autoconf configure 2.50a
-generated by GNU Autoconf 2.50
+generated by GNU Autoconf 2.50a
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
@@ -660,7 +660,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.50a, which was
-generated by GNU Autoconf 2.50.  Invocation command line was
+generated by GNU Autoconf 2.50a.  Invocation command line was
 
   $ $0 $@
 
@@ -874,7 +874,7 @@ PATH_SEPARATOR="$ac_path_separator"
 rm -f conftest.sh
 
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in config $srcdir/config; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -890,8 +890,8 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:893: 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;}
+  { { echo "$as_me:893: 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;}
    { (exit 1); exit 1; }; }
 fi
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"
@@ -1446,7 +1446,7 @@ fi
 # Automake can't see inner AC_SUBSTS (`aclocal' is bypassed), so we tag the
 # AC_SUBSTS here too.
 
-ac_config_files="$ac_config_files Makefile m4/Makefile man/Makefile doc/Makefile tests/Makefile tests/atconfig"
+ac_config_files="$ac_config_files Makefile m4/Makefile man/Makefile doc/Makefile config/Makefile tests/Makefile tests/atconfig"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -1680,7 +1680,7 @@ EOF
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 GNU Autoconf config.status 2.50a
-configured by $0, generated by GNU Autoconf 2.50,
+configured by $0, generated by GNU Autoconf 2.50a,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -1747,16 +1747,17 @@ Try \`$0 --help' for more information." >&2;}
   'm4/Makefile' ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
   'man/Makefile' ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
   'doc/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+  'config/Makefile' ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
   'tests/Makefile' ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
   'tests/atconfig' ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;;
 
   # This is an error.
-  -*) { { echo "$as_me:1754: error: unrecognized option: $1
+  -*) { { echo "$as_me:1755: 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:1759: error: invalid argument: $1" >&5
+  *) { { echo "$as_me:1760: error: invalid argument: $1" >&5
 echo "$as_me: error: invalid argument: $1" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -1770,7 +1771,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me (GNU Autoconf 2.50a) 2.50, executed with
+This file was extended by $as_me (GNU Autoconf 2.50a) 2.50a, executed with
   > $ac_cs_invocation
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -1982,7 +1983,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:1985: creating $ac_file" >&5
+    { echo "$as_me:1986: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -2000,7 +2001,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:2003: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:2004: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -2013,7 +2014,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:2016: error: cannot find input file: $f" >&5
+           { { echo "$as_me:2017: 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 bac8334ec005ca5ce86b03dc454ad73de876cb7c..a0c72f0b6cdaebd32ec3a365565ee1cc3cca5074 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,7 @@
 AC_PREREQ(2.50)
 AC_INIT(GNU Autoconf, 2.50a, bug-autoconf@gnu.org)
 AC_CONFIG_SRCDIR(acgeneral.m4)
+AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(autoconf, 2.50a)
 
 # Initialize the test suite.
@@ -49,7 +50,7 @@ AC_SUBST(PACKAGE_NAME)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
-AC_OUTPUT(Makefile m4/Makefile man/Makefile doc/Makefile
+AC_OUTPUT(Makefile m4/Makefile man/Makefile doc/Makefile config/Makefile
           tests/Makefile tests/atconfig)
 
 # Report the state of this version of Autoconf if this is a beta.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index f746a92e986d2af99c497768a158b694edccde1b..1770949fba0afa90e61a98542eb23eaae3ea7f3c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -79,14 +79,15 @@ standards_TEXINFOS = make-stds.texi
 # not know.
 CLEANFILES = autoconf.cvs autoconf.ev autoconf.evs autoconf.ma autoconf.mas              autoconf.ov autoconf.ovs autoconf.tmp
 
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 TEXI2DVI = texi2dvi
+TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
 INFO_DEPS = autoconf.info standards.info
 DVIS = autoconf.dvi standards.dvi
 TEXINFOS = autoconf.texi standards.texi
 DIST_COMMON =  $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \
-Makefile.in mdate-sh stamp-vti texinfo.tex version.texi
+Makefile.in stamp-vti texinfo.tex version.texi
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -108,7 +109,7 @@ $(srcdir)/version.texi: stamp-vti
        @:
 
 $(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure.in
-       @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/autoconf.texi`" > vti.tmp
+       @echo "@set UPDATED `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/autoconf.texi`" > vti.tmp
        @echo "@set EDITION $(VERSION)" >> vti.tmp
        @echo "@set VERSION $(VERSION)" >> vti.tmp
        @cmp -s vti.tmp $(srcdir)/version.texi \
@@ -143,7 +144,7 @@ DVIPS = dvips
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texi.dvi:
-       TEXINPUTS=.:$$TEXINPUTS \
+       TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texi:
@@ -162,7 +163,7 @@ DVIPS = dvips
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo.dvi:
-       TEXINPUTS=.:$$TEXINPUTS \
+       TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .txi.info:
@@ -171,7 +172,7 @@ DVIPS = dvips
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .txi.dvi:
-       TEXINPUTS=.:$$TEXINPUTS \
+       TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
          MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .txi:

diff --git a/m4/Makefile.in b/m4/Makefile.in
index fc5c908d608a853c8bf366d48be34dec0e37722c..e5e80f8dab2905a6247affac001a800b3cb991ed 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -70,7 +70,7 @@ standards_texi = @standards_texi@
 
 EXTRA_DIST =  atconfig.m4 init.m4 m4.m4 missing.m4 sanity.m4
 
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  Makefile.am Makefile.in
 

diff --git a/man/Makefile.am b/man/Makefile.am
index 7acdca392665d2d96dbfb3b7da5a9affb1d32233..c1c464762a796b5db2472711319031a6ad8f1878 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -37,14 +37,15 @@ ifnames.1:    $(common_dep) $(srcdir)/ifnames.x    $(top_srcdir)/ifnames.in
 autoscan.1:   $(common_dep) $(srcdir)/autoscan.x   $(top_srcdir)/autoscan.in
 
 # Independent from this package.
-config.guess.1: $(srcdir)/config.guess.x  $(top_srcdir)/config.guess
-config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config.sub
+config.guess.1: $(srcdir)/config.guess.x  $(top_srcdir)/config/config.guess
+config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config/config.sub
 
 SUFFIXES = .x .1
 
 .x.1:
        test -f $(top_builddir)/$* && prog=$(top_builddir)/$*; \
        test -f $(top_srcdir)/$* && prog=$(top_srcdir)/$*; \
+       test -f $(top_srcdir)/config/$* && prog=$(top_srcdir)/config/$*; \
        if test -n "$$prog"; then \
          echo "Updating man page $@"; \
          $(HELP2MAN) \

diff --git a/man/Makefile.in b/man/Makefile.in
index 167e4321ad549bb20a944ecb81813423464ecc44..bac08563415f015f3f87f9e009ebfc2657acc28e 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -81,7 +81,7 @@ MAINTAINERCLEANFILES = $(man_MANS)
 common_dep = $(top_srcdir)/configure.in $(srcdir)/common.x
 
 SUFFIXES = .x .1
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 man1dir = $(mandir)/man1
 MANS = $(man_MANS)
@@ -237,12 +237,13 @@ ifnames.1:    $(common_dep) $(srcdir)/ifnames.x    $(top_srcdir)/ifnames.in
 autoscan.1:   $(common_dep) $(srcdir)/autoscan.x   $(top_srcdir)/autoscan.in
 
 # Independent from this package.
-config.guess.1: $(srcdir)/config.guess.x  $(top_srcdir)/config.guess
-config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config.sub
+config.guess.1: $(srcdir)/config.guess.x  $(top_srcdir)/config/config.guess
+config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config/config.sub
 
 .x.1:
        test -f $(top_builddir)/$* && prog=$(top_builddir)/$*; \
        test -f $(top_srcdir)/$* && prog=$(top_srcdir)/$*; \
+       test -f $(top_srcdir)/config/$* && prog=$(top_srcdir)/config/$*; \
        if test -n "$$prog"; then \
          echo "Updating man page $@"; \
          $(HELP2MAN) \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 23bfc8c9dd07efc0d2c9e8fc36fae7253eddf6e6..8e89b0bb94318a7d09d8d035c06be080e3fcac3a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -87,7 +87,7 @@ MACRO_FILES = ../acgeneral.m4               ../acspecific.m4               ../ac
 CLEANFILES = debug-*.sh macro configure configure.in configure.ac              config.status config.cache config.log config.h.in config.h              config.hin state-* at-*              stderr stdout empty             config.guess config.sub expr libtool ltconfig ltmain.sh install-sh
 
 DISTCLEANFILES = atconfig testsuite
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =  atconfig
 DIST_COMMON =  README Makefile.am Makefile.in atconfig.in
 

diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index 8edddbeaed531deed6419e7835127f67d9994edc..b46e790f72711981505829c0045e487773846d30 100644 (file)
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -30,7 +30,7 @@ m4_define([AT_CONFIGURE_AC],
 [AT_CLEANUP_FILES(env-after state*)dnl
 AT_DATA([configure.ac],
 [[AC_INIT
-AC_CONFIG_AUX_DIR($top_srcdir)
+AC_CONFIG_AUX_DIR($top_srcdir/config)
 AC_CONFIG_HEADER(config.h:config.hin)
 AC_STATE_SAVE(before)]
 $1

diff --git a/tests/tools.at b/tests/tools.at
index b1998102bbd0e4443b6292ca4dae6fe3775670f6..47bf811fb2b7c8bb4ec0bc19e23cf15c6909ca3a 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -60,9 +60,9 @@ AT_CHECK([/bin/sh -n ../autoreconf], 0)
 AT_CHECK([/bin/sh -n ../ifnames],    0)
 
 # These are not built, they are in the src tree.
-AT_CHECK([/bin/sh -n $top_srcdir/install-sh], 0)
-AT_CHECK([/bin/sh -n $top_srcdir/mkinstalldirs], 0)
-AT_CHECK([/bin/sh -n $top_srcdir/missing], 0)
+AT_CHECK([/bin/sh -n $top_srcdir/config/install-sh], 0)
+AT_CHECK([/bin/sh -n $top_srcdir/config/mkinstalldirs], 0)
+AT_CHECK([/bin/sh -n $top_srcdir/config/missing], 0)
 
 AT_CLEANUP