From 5058e82d545f9caca047d6f185e851e892c69ba2 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 12 Jan 2001 09:19:59 +0000 Subject: [PATCH] * acgeneral.m4: Last changes for `configure.ac'. (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Take `configure.ac' into account. * autoreconf.sh: Likewise. --- ChangeLog | 8 ++++++++ acgeneral.m4 | 18 ++++++++++-------- autoconf.in | 4 ++-- autoconf.sh | 4 ++-- autoheader.in | 4 ++-- autoheader.sh | 4 ++-- autoreconf.in | 6 +++--- autoreconf.sh | 6 +++--- autoscan.in | 8 ++++---- autoscan.pl | 8 ++++---- bin/autoconf.in | 4 ++-- bin/autoheader.in | 4 ++-- bin/autoreconf.in | 6 +++--- bin/autoscan.in | 8 ++++---- doc/install.texi | 8 ++++---- lib/autoconf/general.m4 | 18 ++++++++++-------- lib/m4sugar/m4sugar.m4 | 2 +- m4sugar.m4 | 2 +- man/autoheader.1 | 4 ++-- man/autoscan.1 | 6 +++--- man/autoupdate.1 | 2 +- 21 files changed, 73 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdd4b771..2dc0fbb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-01-12 Akim Demaille + + * acgeneral.m4: Last changes for `configure.ac'. + (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Take `configure.ac' into + account. + * autoreconf.sh: Likewise. + + 2001-01-11 Motoyuki Kasahara * acfunctions.m4 (AC_FUNC_MEMCMP): Missing comma in AC_TRY_RUN diff --git a/acgeneral.m4 b/acgeneral.m4 index 2636eae0..1fa1f13b 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -62,7 +62,7 @@ # KILL is only used to suppress output. # # The layers of `configure'. We let m4 undivert them by itself, when -# it reaches the end of `configure.in'. +# it reaches the end of `configure.ac'. # # - BINSH # AC_REQUIRE'd #! /bin/sh line @@ -268,7 +268,7 @@ m4_define([AU_DEFINE], # Also define NAME as a macro which code is NEW-CODE. # # This allows to share the same code for both supporting obsoleted macros, -# and to update a configure.in. +# and to update a configure.ac. # See `acobsolete.m4' for a longer description. m4_define([AU_DEFUN], [AU_DEFINE([$1], @@ -580,7 +580,7 @@ m4_popdef([AC_Prefix])dnl # It is suggested that the macros in this section appear before -# AC_INIT in `configure.in'. Nevertheless, this is just stylistic, +# AC_INIT in `configure.ac'. Nevertheless, this is just stylistic, # and from the implementation point of, AC_INIT *must* be expanded # beforehand: it puts data in diversions which must appear before the # data provided by the macros of this section. @@ -732,7 +732,7 @@ exec AS_MESSAGE_LOG_FD>>config.log # _AC_INIT_DEFAULTS # ----------------- -# Values which defaults can be set from `configure.in'. +# Values which defaults can be set from `configure.ac'. # `/bin/machine' is used in `glibcbug'. The others are used in config.* m4_define([_AC_INIT_DEFAULTS], [m4_divert_push([DEFAULTS])dnl @@ -1408,7 +1408,8 @@ if test "$ac_init_help" = "recursive"; then elif test -f $ac_sub_srcdir/configure; then echo $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.in; then + elif test -f $ac_sub_srcdir/configure.ac || + test -f $ac_sub_srcdir/configure.in; then echo $ac_configure --help else @@ -3537,7 +3538,7 @@ m4_define([AC_LIST_COMMANDS_COMMANDS]) # `default-2' etc. for each call. # # Unfortunately this scheme is fragile: bad things might happen -# if you update an included file and configure.in: you might have +# if you update an included file and configure.ac: you might have # clashes :( On the other hand, I'd like to avoid weird keys (e.g., # depending upon __file__ or the pid). AU_DEFUN([AC_OUTPUT_COMMANDS], @@ -4250,7 +4251,7 @@ EOF cat >>$CONFIG_STATUS <>$tmp/config.hin test -r $localdir/acconfig.h && sed '/@BOTTOM@/,$d;s/@TOP@//' $localdir/acconfig.h >>$tmp/config.hin -# Dump the templates from `configure.in'. +# Dump the templates from `configure.ac'. for verb in `(set) 2>&1 | sed -n -e '/^ac_verbatim/s/^\([^=]*\)=.*$/\1/p' | sort`; do echo >>$tmp/config.hin eval echo '"${'$verb'}"' >>$tmp/config.hin diff --git a/autoheader.sh b/autoheader.sh index 066c8018..e0fc1a7e 100644 --- a/autoheader.sh +++ b/autoheader.sh @@ -1,5 +1,5 @@ #! @SHELL@ -# autoheader -- create `config.h.in' from `configure.in' +# autoheader -- create `config.h.in' from `configure.ac' # Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 # Free Software Foundation, Inc. @@ -308,7 +308,7 @@ test -r $config_h.top && cat $config_h.top >>$tmp/config.hin test -r $localdir/acconfig.h && sed '/@BOTTOM@/,$d;s/@TOP@//' $localdir/acconfig.h >>$tmp/config.hin -# Dump the templates from `configure.in'. +# Dump the templates from `configure.ac'. for verb in `(set) 2>&1 | sed -n -e '/^ac_verbatim/s/^\([^=]*\)=.*$/\1/p' | sort`; do echo >>$tmp/config.hin eval echo '"${'$verb'}"' >>$tmp/config.hin diff --git a/autoreconf.in b/autoreconf.in index 7a909c70..ef241e1a 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -298,9 +298,9 @@ update="@SHELL@ $tmp/update.sh" # Make a list of directories to process. # The xargs grep filters out Cygnus configure.in files. -find . -name configure.in -print | -xargs grep -l AC_OUTPUT | -sed 's%/configure\.in$%%; s%^./%%' | +find . -name configure.ac -o -name configure.ac -print | +xargs grep -l AC_INIT | +sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' | while read dir; do ( cd $dir || continue diff --git a/autoreconf.sh b/autoreconf.sh index 7a909c70..ef241e1a 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -298,9 +298,9 @@ update="@SHELL@ $tmp/update.sh" # Make a list of directories to process. # The xargs grep filters out Cygnus configure.in files. -find . -name configure.in -print | -xargs grep -l AC_OUTPUT | -sed 's%/configure\.in$%%; s%^./%%' | +find . -name configure.ac -o -name configure.ac -print | +xargs grep -l AC_INIT | +sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' | while read dir; do ( cd $dir || continue diff --git a/autoscan.in b/autoscan.in index d7d6a36e..ee998558 100644 --- a/autoscan.in +++ b/autoscan.in @@ -1,5 +1,5 @@ #! @PERL@ -w -# autoscan - Create configure.scan (a preliminary configure.in) for a package. +# autoscan - Create configure.scan (a preliminary configure.ac) for a package. # Copyright 1994, 1999, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -47,7 +47,7 @@ sub print_usage Examine source files in the directory tree rooted at SRCDIR, or the current directory if none is given. Search the source files for common portability problems and create a file `configure.scan' which -is a preliminary `configure.in' for that package. +is a preliminary `configure.ac' for that package. -h, --help print this help, then exit -V, --version print version number, then exit @@ -117,7 +117,7 @@ sub init_tables # The data file format supports only one line of macros per function. # If more than that is required for a common portability problem, # a new Autoconf macro should probably be written for that case, - # instead of duplicating the code in lots of configure.in files. + # instead of duplicating the code in lots of configure.ac files. foreach $kind ('functions', 'headers', 'identifiers', 'programs', 'makevars') { @@ -317,7 +317,7 @@ sub scan_sh_file } } -# Print a configure.in. +# Print a configure.ac. sub output { local (%unique_makefiles); diff --git a/autoscan.pl b/autoscan.pl index d7d6a36e..ee998558 100644 --- a/autoscan.pl +++ b/autoscan.pl @@ -1,5 +1,5 @@ #! @PERL@ -w -# autoscan - Create configure.scan (a preliminary configure.in) for a package. +# autoscan - Create configure.scan (a preliminary configure.ac) for a package. # Copyright 1994, 1999, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -47,7 +47,7 @@ sub print_usage Examine source files in the directory tree rooted at SRCDIR, or the current directory if none is given. Search the source files for common portability problems and create a file `configure.scan' which -is a preliminary `configure.in' for that package. +is a preliminary `configure.ac' for that package. -h, --help print this help, then exit -V, --version print version number, then exit @@ -117,7 +117,7 @@ sub init_tables # The data file format supports only one line of macros per function. # If more than that is required for a common portability problem, # a new Autoconf macro should probably be written for that case, - # instead of duplicating the code in lots of configure.in files. + # instead of duplicating the code in lots of configure.ac files. foreach $kind ('functions', 'headers', 'identifiers', 'programs', 'makevars') { @@ -317,7 +317,7 @@ sub scan_sh_file } } -# Print a configure.in. +# Print a configure.ac. sub output { local (%unique_makefiles); diff --git a/bin/autoconf.in b/bin/autoconf.in index 4da21ea3..5dd62701 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -502,11 +502,11 @@ EOF # Transform the traces from m4 into an m4 input file. # Typically, transform: # - # | m4trace:configure.in:3: -1- AC_SUBST([exec_prefix], [NONE]) + # | m4trace:configure.ac:3: -1- AC_SUBST([exec_prefix], [NONE]) # # into # - # | AT_AC_SUBST([configure.in], [3], [1], [AC_SUBST], [exec_prefix], [NONE]) + # | AT_AC_SUBST([configure.ac], [3], [1], [AC_SUBST], [exec_prefix], [NONE]) # # Pay attention that the file name might include colons, if under DOS # for instance, so we don't use `[^:][^:]*'. diff --git a/bin/autoheader.in b/bin/autoheader.in index 066c8018..e0fc1a7e 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -1,5 +1,5 @@ #! @SHELL@ -# autoheader -- create `config.h.in' from `configure.in' +# autoheader -- create `config.h.in' from `configure.ac' # Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000 # Free Software Foundation, Inc. @@ -308,7 +308,7 @@ test -r $config_h.top && cat $config_h.top >>$tmp/config.hin test -r $localdir/acconfig.h && sed '/@BOTTOM@/,$d;s/@TOP@//' $localdir/acconfig.h >>$tmp/config.hin -# Dump the templates from `configure.in'. +# Dump the templates from `configure.ac'. for verb in `(set) 2>&1 | sed -n -e '/^ac_verbatim/s/^\([^=]*\)=.*$/\1/p' | sort`; do echo >>$tmp/config.hin eval echo '"${'$verb'}"' >>$tmp/config.hin diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 7a909c70..ef241e1a 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -298,9 +298,9 @@ update="@SHELL@ $tmp/update.sh" # Make a list of directories to process. # The xargs grep filters out Cygnus configure.in files. -find . -name configure.in -print | -xargs grep -l AC_OUTPUT | -sed 's%/configure\.in$%%; s%^./%%' | +find . -name configure.ac -o -name configure.ac -print | +xargs grep -l AC_INIT | +sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' | while read dir; do ( cd $dir || continue diff --git a/bin/autoscan.in b/bin/autoscan.in index d7d6a36e..ee998558 100644 --- a/bin/autoscan.in +++ b/bin/autoscan.in @@ -1,5 +1,5 @@ #! @PERL@ -w -# autoscan - Create configure.scan (a preliminary configure.in) for a package. +# autoscan - Create configure.scan (a preliminary configure.ac) for a package. # Copyright 1994, 1999, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -47,7 +47,7 @@ sub print_usage Examine source files in the directory tree rooted at SRCDIR, or the current directory if none is given. Search the source files for common portability problems and create a file `configure.scan' which -is a preliminary `configure.in' for that package. +is a preliminary `configure.ac' for that package. -h, --help print this help, then exit -V, --version print version number, then exit @@ -117,7 +117,7 @@ sub init_tables # The data file format supports only one line of macros per function. # If more than that is required for a common portability problem, # a new Autoconf macro should probably be written for that case, - # instead of duplicating the code in lots of configure.in files. + # instead of duplicating the code in lots of configure.ac files. foreach $kind ('functions', 'headers', 'identifiers', 'programs', 'makevars') { @@ -317,7 +317,7 @@ sub scan_sh_file } } -# Print a configure.in. +# Print a configure.ac. sub output { local (%unique_makefiles); diff --git a/doc/install.texi b/doc/install.texi index cd25f94c..19fd35e3 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -28,10 +28,10 @@ can be considered for the next release. If you are using the cache, and at some point @file{config.cache} contains results you don't want to keep, you may remove or edit it. -The file @file{configure.in} is used to create @file{configure} by a -program called @code{autoconf}. You only need @file{configure.in} if -you want to change it or regenerate @file{configure} using a newer -version of @code{autoconf}. +The file @file{configure.ac} (or @file{configure.in}) is used to create +@file{configure} by a program called @code{autoconf}. You only need +@file{configure.ac} if you want to change it or regenerate +@file{configure} using a newer version of @code{autoconf}. @noindent The simplest way to compile this package is: diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 2636eae0..1fa1f13b 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -62,7 +62,7 @@ # KILL is only used to suppress output. # # The layers of `configure'. We let m4 undivert them by itself, when -# it reaches the end of `configure.in'. +# it reaches the end of `configure.ac'. # # - BINSH # AC_REQUIRE'd #! /bin/sh line @@ -268,7 +268,7 @@ m4_define([AU_DEFINE], # Also define NAME as a macro which code is NEW-CODE. # # This allows to share the same code for both supporting obsoleted macros, -# and to update a configure.in. +# and to update a configure.ac. # See `acobsolete.m4' for a longer description. m4_define([AU_DEFUN], [AU_DEFINE([$1], @@ -580,7 +580,7 @@ m4_popdef([AC_Prefix])dnl # It is suggested that the macros in this section appear before -# AC_INIT in `configure.in'. Nevertheless, this is just stylistic, +# AC_INIT in `configure.ac'. Nevertheless, this is just stylistic, # and from the implementation point of, AC_INIT *must* be expanded # beforehand: it puts data in diversions which must appear before the # data provided by the macros of this section. @@ -732,7 +732,7 @@ exec AS_MESSAGE_LOG_FD>>config.log # _AC_INIT_DEFAULTS # ----------------- -# Values which defaults can be set from `configure.in'. +# Values which defaults can be set from `configure.ac'. # `/bin/machine' is used in `glibcbug'. The others are used in config.* m4_define([_AC_INIT_DEFAULTS], [m4_divert_push([DEFAULTS])dnl @@ -1408,7 +1408,8 @@ if test "$ac_init_help" = "recursive"; then elif test -f $ac_sub_srcdir/configure; then echo $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.in; then + elif test -f $ac_sub_srcdir/configure.ac || + test -f $ac_sub_srcdir/configure.in; then echo $ac_configure --help else @@ -3537,7 +3538,7 @@ m4_define([AC_LIST_COMMANDS_COMMANDS]) # `default-2' etc. for each call. # # Unfortunately this scheme is fragile: bad things might happen -# if you update an included file and configure.in: you might have +# if you update an included file and configure.ac: you might have # clashes :( On the other hand, I'd like to avoid weird keys (e.g., # depending upon __file__ or the pid). AU_DEFUN([AC_OUTPUT_COMMANDS], @@ -4250,7 +4251,7 @@ EOF cat >>$CONFIG_STATUS <