aux directory name

[Bruno Haible]

Hi,

It has been reported that the "config" directory name led some people to look
for configuration results there. A poll on bug-gnulib resulted in "build-aux"
as new name for this directory in several GNU projects. Here is a patch to
make autoconf follow suite.

This patch needs the following commands as preparation steps:

    mkdir build-aux m4
    cvs add build-aux m4
    for f in Makefile.am config.guess config.sub elisp-comp install-sh mdate-sh 
missing mkinstalldirs move-if-change prev-version.txt texinfo.tex; do
      mv config/$f build-aux/$f ; cvs remove config/$f; cvs add build-aux/$f
      cvs commit config/$f build-aux/$f
    done
    for f in m4.m4; do
      mv config/$f m4/$f ; cvs remove config/$f; cvs add m4/$f
      cvs commit config/$f m4/$f
    done

Afterwards you need to replace config/m4.m4 with m4/m4.m4 in some files
(aclocal.m4 or Makefile.in ... well-known problem when renaming .m4 files).


2006-04-13  Bruno Haible  <address@hidden>

        * build-aux: Directory renamed from config.
        * m4: New directory, holding the previous config/m4.m4.
        * Makefile.am (SUBDIRS, ACLOCAL_AMFLAGS): Update.
        * Makefile.cfg (prev_version_file, move_if_change, announce_gen):
        In build-aux/ instead of config/.
        (wget_files, cvs_files, executable-update): Likewise.
        * build-aux/Makefile.am (SPECIFIC_MACROS): Remove variable.
        (EXTRA_DIST): Update.
        * configure.ac: Use build-aux instead of config.
        * man/Makefile.am (config.sub.1, config.guess.1): Update.
        * tests/local.at: Update.
        * tests/tools.at: Update.
        * tests/torture.at: Update.

diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/Makefile.am autoconf-2.59c/Makefile.am
*** autoconf-2.59c.orig/Makefile.am     2005-05-14 09:00:39.000000000 +0200
--- autoconf-2.59c/Makefile.am  2006-04-14 01:34:42.000000000 +0200
***************
*** 2,8 ****
  
  ## Makefile for Autoconf.
  
! ## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
  ## Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
--- 2,8 ----
  
  ## Makefile for Autoconf.
  
! ## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software
  ## Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
***************
*** 22,30 ****
  
  # bin/ must be run first, as it builds executables needed for tests.
  # autom4te uses autotest.m4f to generate `testsuite', so build tests last.
! SUBDIRS = bin . lib config man doc tests
  
! ACLOCAL_AMFLAGS = -I config
  
  EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
             BUGS \
--- 22,30 ----
  
  # bin/ must be run first, as it builds executables needed for tests.
  # autom4te uses autotest.m4f to generate `testsuite', so build tests last.
! SUBDIRS = bin . lib build-aux man doc tests
  
! ACLOCAL_AMFLAGS = -I m4
  
  EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
             BUGS \
diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/Makefile.cfg autoconf-2.59c/Makefile.cfg
*** autoconf-2.59c.orig/Makefile.cfg    2006-04-12 22:42:16.000000000 +0200
--- autoconf-2.59c/Makefile.cfg 2006-04-14 01:24:06.000000000 +0200
***************
*** 16,24 ****
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  # 02110-1301, USA.
  
! prev_version_file = $(srcdir)/config/prev-version.txt
! move_if_change = $(srcdir)/config/move-if-change
! announce_gen   = $(srcdir)/config/announce-gen
  release_archive_dir = releases
  
  # Use alpha.gnu.org for alpha and beta releases.
--- 16,24 ----
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  # 02110-1301, USA.
  
! prev_version_file = $(srcdir)/build-aux/prev-version.txt
! move_if_change = $(srcdir)/build-aux/move-if-change
! announce_gen   = $(srcdir)/build-aux/announce-gen
  release_archive_dir = releases
  
  # Use alpha.gnu.org for alpha and beta releases.
***************
*** 35,50 ****
  wget_files = \
    $(srcdir)/doc/standards.texi \
    $(srcdir)/doc/make-stds.texi \
!   $(srcdir)/config/config.guess \
!   $(srcdir)/config/config.sub \
!   $(srcdir)/config/texinfo.tex
  
  cvs_files = \
!   $(srcdir)/config/elisp-comp \
!   $(srcdir)/config/install-sh \
!   $(srcdir)/config/mdate-sh \
!   $(srcdir)/config/missing \
!   $(srcdir)/config/mkinstalldirs
  
  # Keep executables executable.  Make it robust to parallel makes.
  local_updates = executable-update
--- 35,50 ----
  wget_files = \
    $(srcdir)/doc/standards.texi \
    $(srcdir)/doc/make-stds.texi \
!   $(srcdir)/build-aux/config.guess \
!   $(srcdir)/build-aux/config.sub \
!   $(srcdir)/build-aux/texinfo.tex
  
  cvs_files = \
!   $(srcdir)/build-aux/elisp-comp \
!   $(srcdir)/build-aux/install-sh \
!   $(srcdir)/build-aux/mdate-sh \
!   $(srcdir)/build-aux/missing \
!   $(srcdir)/build-aux/mkinstalldirs
  
  # Keep executables executable.  Make it robust to parallel makes.
  local_updates = executable-update
***************
*** 53,60 ****
  # autom4te-update is defined in Makefile.am.
  executable-update: wget-update cvs-update autom4te-update
        chmod a+x $(cvs_files)   \
!                $(srcdir)/config/config.guess \
!                $(srcdir)/config/config.sub
  
  # Tests not to run.
  local-checks-to-skip ?= \
--- 53,60 ----
  # autom4te-update is defined in Makefile.am.
  executable-update: wget-update cvs-update autom4te-update
        chmod a+x $(cvs_files)   \
!                $(srcdir)/build-aux/config.guess \
!                $(srcdir)/build-aux/config.sub
  
  # Tests not to run.
  local-checks-to-skip ?= \
*** autoconf-2.59c.orig/build-aux/Makefile.am   2006-04-12 22:42:16.000000000 
+0200
--- autoconf-2.59c/build-aux/Makefile.am        2006-04-14 01:48:09.000000000 
+0200
***************
*** 1,7 ****
  ## Process this file with automake to create Makefile.in -*-Makefile-*-
  
  ## Makefile for Autoconf.
! ## Copyright 2001, 2002 Free Software Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
--- 1,7 ----
  ## Process this file with automake to create Makefile.in -*-Makefile-*-
  
  ## Makefile for Autoconf.
! ## Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
***************
*** 20,32 ****
  
  # This line added to force a rebuild of Makefile.in.
  
! EXTRA_DIST = $(SPECIFIC_MACROS) $(SPECIFIC_TOOLS) \
              prev-version.txt
  MAINTAINERCLEANFILES = $(GENERIC_TOOLS)
  
- SPECIFIC_MACROS =                             \
- m4.m4
- 
  GENERIC_TOOLS =                                       \
  config.guess                                  \
  config.sub                                    \
--- 20,29 ----
  
  # This line added to force a rebuild of Makefile.in.
  
! EXTRA_DIST = $(SPECIFIC_TOOLS) \
              prev-version.txt
  MAINTAINERCLEANFILES = $(GENERIC_TOOLS)
  
  GENERIC_TOOLS =                                       \
  config.guess                                  \
  config.sub                                    \
diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/configure.ac autoconf-2.59c/configure.ac
*** autoconf-2.59c.orig/configure.ac    2005-06-22 14:14:00.000000000 +0200
--- autoconf-2.59c/configure.ac 2006-04-14 01:37:20.000000000 +0200
***************
*** 2,8 ****
  # Process this file with autoconf to produce a configure script.
  
  # Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
! # 2004 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 2,8 ----
  # Process this file with autoconf to produce a configure script.
  
  # Copyright (C) 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
! # 2004, 2006 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
***************
*** 26,33 ****
  AC_SUBST([PACKAGE_NAME])dnl
  AC_CONFIG_SRCDIR([ChangeLog])
  
! AC_CONFIG_AUX_DIR([config])
! AC_CONFIG_FILES([config/Makefile])
  
  AM_INIT_AUTOMAKE([check-news 1.7.9 dist-bzip2 readme-alpha])
  
--- 26,33 ----
  AC_SUBST([PACKAGE_NAME])dnl
  AC_CONFIG_SRCDIR([ChangeLog])
  
! AC_CONFIG_AUX_DIR([build-aux])
! AC_CONFIG_FILES([build-aux/Makefile])
  
  AM_INIT_AUTOMAKE([check-news 1.7.9 dist-bzip2 readme-alpha])
  
diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/man/Makefile.am autoconf-2.59c/man/Makefile.am
*** autoconf-2.59c.orig/man/Makefile.am 2005-06-10 19:56:21.000000000 +0200
--- autoconf-2.59c/man/Makefile.am      2006-04-14 01:25:51.000000000 +0200
***************
*** 1,7 ****
  ## Process this file with automake to create Makefile.in -*-Makefile-*-
  
  ## Makefile for Autoconf.
! ## Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
--- 1,7 ----
  ## Process this file with automake to create Makefile.in -*-Makefile-*-
  
  ## Makefile for Autoconf.
! ## Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
  
  ## This program is free software; you can redistribute it and/or modify
  ## it under the terms of the GNU General Public License as published by
***************
*** 44,51 ****
  $(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
  
  remove_time_stamp = 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
  
--- 44,51 ----
  $(srcdir)/ifnames.1:    $(common_dep) $(binsrcdir)/ifnames.in
  
  # Independent from this package.
! $(srcdir)/config.guess.1: $(top_srcdir)/build-aux/config.guess
! $(srcdir)/config.sub.1:   $(top_srcdir)/build-aux/config.sub
  
  remove_time_stamp = 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
  
diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/tests/local.at autoconf-2.59c/tests/local.at
*** autoconf-2.59c.orig/tests/local.at  2006-03-20 21:28:57.000000000 +0100
--- autoconf-2.59c/tests/local.at       2006-04-14 01:21:35.000000000 +0200
***************
*** 188,194 ****
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/config)
  AC_CONFIG_HEADER(config.h:config.hin)
  AC_STATE_SAVE(before)]
  $1
--- 188,194 ----
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/build-aux)
  AC_CONFIG_HEADER(config.h:config.hin)
  AC_STATE_SAVE(before)]
  $1
diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/tests/tools.at autoconf-2.59c/tests/tools.at
*** autoconf-2.59c.orig/tests/tools.at  2006-04-10 20:27:25.000000000 +0200
--- autoconf-2.59c/tests/tools.at       2006-04-14 01:20:08.000000000 +0200
***************
*** 54,62 ****
  AT_CHECK_SHELL_SYNTAX([$abs_top_builddir/tests/testsuite], exit 77)
  
  # These are not built, they are in the src tree.
! AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/config/install-sh], exit 77)
! AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/config/mkinstalldirs], exit 77)
! AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/config/missing], exit 77)
  
  AT_CLEANUP
  
--- 54,62 ----
  AT_CHECK_SHELL_SYNTAX([$abs_top_builddir/tests/testsuite], exit 77)
  
  # These are not built, they are in the src tree.
! AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/build-aux/install-sh], exit 77)
! AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/build-aux/mkinstalldirs], exit 77)
! AT_CHECK_SHELL_SYNTAX([$abs_top_srcdir/build-aux/missing], exit 77)
  
  AT_CLEANUP
  
diff -r -c3 --exclude='*.info' --exclude=Makefile.in 
autoconf-2.59c.orig/tests/torture.at autoconf-2.59c/tests/torture.at
*** autoconf-2.59c.orig/tests/torture.at        2006-04-12 22:42:17.000000000 
+0200
--- autoconf-2.59c/tests/torture.at     2006-04-14 01:21:12.000000000 +0200
***************
*** 528,534 ****
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/config)
  AC_SUBST([foo], ]m4_for([n], 1, 100,, ....................)[)
  AC_CONFIG_FILES([Foo])
  AC_OUTPUT
--- 528,534 ----
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/build-aux)
  AC_SUBST([foo], ]m4_for([n], 1, 100,, ....................)[)
  AC_CONFIG_FILES([Foo])
  AC_OUTPUT
***************
*** 599,605 ****
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/config)
  foo='one
  two'
  AC_SUBST([foo])
--- 599,605 ----
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/build-aux)
  foo='one
  two'
  AC_SUBST([foo])
***************
*** 649,655 ****
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/config)
  AC_CONFIG_FILES([Foo])
  AC_OUTPUT
  ]])
--- 649,655 ----
  
  AT_DATA([configure.ac],
  [[AC_INIT
! AC_CONFIG_AUX_DIR($top_srcdir/build-aux)
  AC_CONFIG_FILES([Foo])
  AC_OUTPUT
  ]])