From: Akim Demaille Date: Mon, 26 Jun 2000 10:51:17 +0000 (+0000) Subject: * autoreconf.sh (automake, aclocal): New variables. Import X-Git-Tag: autoconf-2.50~796 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94939fa6c162d91d23297eede0211e88f88c2788;p=thirdparty%2Fautoconf.git * autoreconf.sh (automake, aclocal): New variables. Import $AUTOMAKE and $ACLOCAL. Pass --verbose to the tools. Avoid using plenty of variables, just append to existing variables. * doc/autoconf.texi: List options in the order --help, --version, --verbose, --debug, and then specific options. --- diff --git a/ChangeLog b/ChangeLog index 934979592..8f8cd7b72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-06-26 Akim Demaille + + * autoreconf.sh (automake, aclocal): New variables. Import + $AUTOMAKE and $ACLOCAL. + Pass --verbose to the tools. + Avoid using plenty of variables, just append to existing + variables. + * doc/autoconf.texi: List options in the order --help, --version, + --verbose, --debug, and then specific options. + 2000-06-26 Akim Demaille * doc/autoconf.texi: Various Texinfo adjustments. diff --git a/autoreconf.in b/autoreconf.in index e631df66d..4dae1a983 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -38,11 +38,15 @@ the \`--force' option. -f, --force consider every files are obsolete The following options are passed to \`automake': - --cygnus assume program is part of Cygnus-style tree - --foreign set strictness to foreign - --gnits set strictness to gnits - --gnu set strictness to gnu - -i, --include-deps include generated dependencies in Makefile.in + --cygnus assume program is part of Cygnus-style tree + --foreign set strictness to foreign + --gnits set strictness to gnits + --gnu set strictness to gnu + --include-deps include generated dependencies in Makefile.in + -i deprecated alias for --include-deps + +The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL +are honored. Report bugs to ." @@ -75,6 +79,11 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # Variables. : ${AC_MACRODIR=@datadir@} dir=`echo "$0" | sed -e 's/[^/]*$//'` +force=no +localdir=. +verbose=: + +# Looking for autoconf. # We test "$dir/autoconf" in case we are in the build tree, in which case # the names are not transformed yet. for autoconf in "$AUTOCONF" \ @@ -83,17 +92,18 @@ for autoconf in "$AUTOCONF" \ "@bindir@/@autoconf-name@"; do test -f "$autoconf" && break done + +# Looking for autoheader. for autoheader in "$AUTOHEADER" \ "$dir/@autoheader-name@" \ "$dir/autoheader" \ "@bindir@/@autoheader-name@"; do test -f "$autoheader" && break done -automake_mode=--gnu -automake_deps= -force=no -localdir=. -verbose=: +# Looking for automake. +: ${automake=${AUTOMAKE=automake}} +# Looking for aclocal. +: ${aclocal=${ACLOCAL=aclocal}} # Parse command line. while test $# -gt 0; do @@ -127,10 +137,10 @@ while test $# -gt 0; do --force | -f ) force=yes; shift ;; - --cygnus | --foreign | --gnits | --gnu) - automake_mode=$1; shift ;; - --include-deps | -i) - automake_deps=$1; shift ;; + + # Options of Automake. + --cygnus | --foreign | --gnits | --gnu | --include-deps | -i ) + automake="$automake $1"; shift ;; -- ) # Stop option processing. shift; break ;; @@ -152,9 +162,12 @@ if test $# -ne 0; then exit 1 fi -# Set up autoconf and autoheader. -autoconf="$autoconf -l $localdir" -autoheader="$autoheader -l $localdir" +# Dispatch autoreconf's option to the tools. +autoconf="$autoconf -l $localdir `$verbose --verbose`" +autoheader="$autoheader -l $localdir `$verbose --verbose`" +test $force = no && automake="$automake --no-force" +automake="$automake `$verbose --verbose`" +aclocal="$aclocal `$verbose --verbose`" export AC_MACRODIR # ----------------------- # @@ -217,19 +230,16 @@ while read dir; do then aclocal_flags="$aclocal_flags -I $aclocal_dir" fi - $verbose "running aclocal $aclocal_flags in $dir, creating $aclocal_m4" - aclocal $aclocal_flags --output=$aclocal_m4 + $verbose "running $aclocal $aclocal_flags in $dir, creating $aclocal_m4" + $aclocal $aclocal_flags --output=$aclocal_m4 fi fi # Re-run automake if required. Assumes that there is a Makefile.am # in the topmost directory. - if test -f Makefile.am - then - amforce= - test $force = no && amforce=--no-force - $verbose running automake $amforce in $dir - automake $amforce $automake_mode $automake_deps + if test -f Makefile.am; then + $verbose running $automake $amforce in $dir + $automake $amforce $automake_mode $automake_deps fi test ! -f $aclocal_m4 && aclocal_m4= diff --git a/autoreconf.sh b/autoreconf.sh index e631df66d..4dae1a983 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -38,11 +38,15 @@ the \`--force' option. -f, --force consider every files are obsolete The following options are passed to \`automake': - --cygnus assume program is part of Cygnus-style tree - --foreign set strictness to foreign - --gnits set strictness to gnits - --gnu set strictness to gnu - -i, --include-deps include generated dependencies in Makefile.in + --cygnus assume program is part of Cygnus-style tree + --foreign set strictness to foreign + --gnits set strictness to gnits + --gnu set strictness to gnu + --include-deps include generated dependencies in Makefile.in + -i deprecated alias for --include-deps + +The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL +are honored. Report bugs to ." @@ -75,6 +79,11 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # Variables. : ${AC_MACRODIR=@datadir@} dir=`echo "$0" | sed -e 's/[^/]*$//'` +force=no +localdir=. +verbose=: + +# Looking for autoconf. # We test "$dir/autoconf" in case we are in the build tree, in which case # the names are not transformed yet. for autoconf in "$AUTOCONF" \ @@ -83,17 +92,18 @@ for autoconf in "$AUTOCONF" \ "@bindir@/@autoconf-name@"; do test -f "$autoconf" && break done + +# Looking for autoheader. for autoheader in "$AUTOHEADER" \ "$dir/@autoheader-name@" \ "$dir/autoheader" \ "@bindir@/@autoheader-name@"; do test -f "$autoheader" && break done -automake_mode=--gnu -automake_deps= -force=no -localdir=. -verbose=: +# Looking for automake. +: ${automake=${AUTOMAKE=automake}} +# Looking for aclocal. +: ${aclocal=${ACLOCAL=aclocal}} # Parse command line. while test $# -gt 0; do @@ -127,10 +137,10 @@ while test $# -gt 0; do --force | -f ) force=yes; shift ;; - --cygnus | --foreign | --gnits | --gnu) - automake_mode=$1; shift ;; - --include-deps | -i) - automake_deps=$1; shift ;; + + # Options of Automake. + --cygnus | --foreign | --gnits | --gnu | --include-deps | -i ) + automake="$automake $1"; shift ;; -- ) # Stop option processing. shift; break ;; @@ -152,9 +162,12 @@ if test $# -ne 0; then exit 1 fi -# Set up autoconf and autoheader. -autoconf="$autoconf -l $localdir" -autoheader="$autoheader -l $localdir" +# Dispatch autoreconf's option to the tools. +autoconf="$autoconf -l $localdir `$verbose --verbose`" +autoheader="$autoheader -l $localdir `$verbose --verbose`" +test $force = no && automake="$automake --no-force" +automake="$automake `$verbose --verbose`" +aclocal="$aclocal `$verbose --verbose`" export AC_MACRODIR # ----------------------- # @@ -217,19 +230,16 @@ while read dir; do then aclocal_flags="$aclocal_flags -I $aclocal_dir" fi - $verbose "running aclocal $aclocal_flags in $dir, creating $aclocal_m4" - aclocal $aclocal_flags --output=$aclocal_m4 + $verbose "running $aclocal $aclocal_flags in $dir, creating $aclocal_m4" + $aclocal $aclocal_flags --output=$aclocal_m4 fi fi # Re-run automake if required. Assumes that there is a Makefile.am # in the topmost directory. - if test -f Makefile.am - then - amforce= - test $force = no && amforce=--no-force - $verbose running automake $amforce in $dir - automake $amforce $automake_mode $automake_deps + if test -f Makefile.am; then + $verbose running $automake $amforce in $dir + $automake $amforce $automake_mode $automake_deps fi test ! -f $aclocal_m4 && aclocal_m4= diff --git a/bin/autoreconf.in b/bin/autoreconf.in index e631df66d..4dae1a983 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -38,11 +38,15 @@ the \`--force' option. -f, --force consider every files are obsolete The following options are passed to \`automake': - --cygnus assume program is part of Cygnus-style tree - --foreign set strictness to foreign - --gnits set strictness to gnits - --gnu set strictness to gnu - -i, --include-deps include generated dependencies in Makefile.in + --cygnus assume program is part of Cygnus-style tree + --foreign set strictness to foreign + --gnits set strictness to gnits + --gnu set strictness to gnu + --include-deps include generated dependencies in Makefile.in + -i deprecated alias for --include-deps + +The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL +are honored. Report bugs to ." @@ -75,6 +79,11 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # Variables. : ${AC_MACRODIR=@datadir@} dir=`echo "$0" | sed -e 's/[^/]*$//'` +force=no +localdir=. +verbose=: + +# Looking for autoconf. # We test "$dir/autoconf" in case we are in the build tree, in which case # the names are not transformed yet. for autoconf in "$AUTOCONF" \ @@ -83,17 +92,18 @@ for autoconf in "$AUTOCONF" \ "@bindir@/@autoconf-name@"; do test -f "$autoconf" && break done + +# Looking for autoheader. for autoheader in "$AUTOHEADER" \ "$dir/@autoheader-name@" \ "$dir/autoheader" \ "@bindir@/@autoheader-name@"; do test -f "$autoheader" && break done -automake_mode=--gnu -automake_deps= -force=no -localdir=. -verbose=: +# Looking for automake. +: ${automake=${AUTOMAKE=automake}} +# Looking for aclocal. +: ${aclocal=${ACLOCAL=aclocal}} # Parse command line. while test $# -gt 0; do @@ -127,10 +137,10 @@ while test $# -gt 0; do --force | -f ) force=yes; shift ;; - --cygnus | --foreign | --gnits | --gnu) - automake_mode=$1; shift ;; - --include-deps | -i) - automake_deps=$1; shift ;; + + # Options of Automake. + --cygnus | --foreign | --gnits | --gnu | --include-deps | -i ) + automake="$automake $1"; shift ;; -- ) # Stop option processing. shift; break ;; @@ -152,9 +162,12 @@ if test $# -ne 0; then exit 1 fi -# Set up autoconf and autoheader. -autoconf="$autoconf -l $localdir" -autoheader="$autoheader -l $localdir" +# Dispatch autoreconf's option to the tools. +autoconf="$autoconf -l $localdir `$verbose --verbose`" +autoheader="$autoheader -l $localdir `$verbose --verbose`" +test $force = no && automake="$automake --no-force" +automake="$automake `$verbose --verbose`" +aclocal="$aclocal `$verbose --verbose`" export AC_MACRODIR # ----------------------- # @@ -217,19 +230,16 @@ while read dir; do then aclocal_flags="$aclocal_flags -I $aclocal_dir" fi - $verbose "running aclocal $aclocal_flags in $dir, creating $aclocal_m4" - aclocal $aclocal_flags --output=$aclocal_m4 + $verbose "running $aclocal $aclocal_flags in $dir, creating $aclocal_m4" + $aclocal $aclocal_flags --output=$aclocal_m4 fi fi # Re-run automake if required. Assumes that there is a Makefile.am # in the topmost directory. - if test -f Makefile.am - then - amforce= - test $force = no && amforce=--no-force - $verbose running automake $amforce in $dir - automake $amforce $automake_mode $automake_deps + if test -f Makefile.am; then + $verbose running $automake $amforce in $dir + $automake $amforce $automake_mode $automake_deps fi test ! -f $aclocal_m4 && aclocal_m4= diff --git a/doc/autoconf.texi b/doc/autoconf.texi index a54e972c3..5dc6b1d78 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -797,20 +797,20 @@ encountered. Lines starting with @samp{#} are comments. @item --help Print a summary of the command line options and exit. +@item --version +@itemx -V +Print the version number of Autoconf and exit. + +@item --verbose +Print the names of the files it examines and the potentially interesting +symbols it finds in them. This output can be voluminous. + @item --macrodir=@var{dir} @evindex AC_MACRODIR Look for the data files in directory @var{dir} instead of the default installation directory. You can also set the @code{AC_MACRODIR} environment variable to a directory; this option overrides the environment variable. - -@item --verbose -Print the names of the files it examines and the potentially interesting -symbols it finds in them. This output can be voluminous. - -@item --version -@itemx -V -Print the version number of Autoconf and exit. @end table @node ifnames Invocation, autoconf Invocation, autoscan Invocation, Making configure Scripts @@ -1091,6 +1091,14 @@ properly, but does not pass @option{--macrodir=@var{dir}} or @itemx -h Print a summary of the command line options and exit. +@item --version +@itemx -V +Print the version number of Autoconf and exit. + +@item --verbose +Print the name of each directory where @code{autoreconf} runs +@code{autoconf} (and @code{autoheader}, if appropriate). + @item --force @itemx -f Remake even @file{configure} scripts and configuration headers that are @@ -1111,14 +1119,6 @@ Look for the Autoconf macro files in directory @var{dir} instead of the default installation directory. You can also set the @code{AC_MACRODIR} environment variable to a directory; this option overrides the environment variable. - -@item --verbose -Print the name of each directory where @code{autoreconf} runs -@code{autoconf} (and @code{autoheader}, if appropriate). - -@item --version -@itemx -V -Print the version number of Autoconf and exit. @end table diff --git a/man/autoreconf.1 b/man/autoreconf.1 index b30f0a913..4b35a091f 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -45,8 +45,14 @@ set strictness to gnits \fB\-\-gnu\fR set strictness to gnu .TP -\fB\-i\fR, \fB\-\-include\-deps\fR +\fB\-\-include\-deps\fR include generated dependencies in Makefile.in +.TP +\fB\-i\fR +deprecated alias for \fB\-\-include\-deps\fR +.PP +The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL +are honored. .SH AUTHOR Written by David J. MacKenzie. .SH "REPORTING BUGS"