From: Akim Demaille Date: Mon, 10 Jul 2000 08:54:41 +0000 (+0000) Subject: * autoreconf.sh (force): Instead of yes/no, use :/false. X-Git-Tag: autoconf-2.50~761 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cdafb9b2b797c7d127b31a7a5f951fcf1dce74b;p=thirdparty%2Fautoconf.git * autoreconf.sh (force): Instead of yes/no, use :/false. Adjust the code. (automake_deps, automake_force): No longer used. --- diff --git a/ChangeLog b/ChangeLog index 16a51bf01..66eb69b5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-07-10 Akim Demaille + + * autoreconf.sh (force): Instead of yes/no, use :/false. + Adjust the code. + (automake_deps, automake_force): No longer used. + 2000-07-10 Akim Demaille * acgeneral.m4 (AC_DIRNAME): Use an `expr' solution instead of diff --git a/autoreconf.in b/autoreconf.in index 4dae1a983..47036d64e 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -79,7 +79,7 @@ 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 +force=false localdir=. verbose=: @@ -136,7 +136,7 @@ while test $# -gt 0; do shift ;; --force | -f ) - force=yes; shift ;; + force=:; shift ;; # Options of Automake. --cygnus | --foreign | --gnits | --gnu | --include-deps | -i ) @@ -165,7 +165,7 @@ fi # 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" +$force || automake="$automake --no-force" automake="$automake `$verbose --verbose`" aclocal="$aclocal `$verbose --verbose`" export AC_MACRODIR @@ -219,7 +219,7 @@ while read dir; do p q }' Makefile.in 2>/dev/null` - if test $force = no && + if $force && ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null| sed 1q | grep 'aclocal\.m4$' > /dev/null @@ -238,13 +238,13 @@ while read dir; do # Re-run automake if required. Assumes that there is a Makefile.am # in the topmost directory. if test -f Makefile.am; then - $verbose running $automake $amforce in $dir - $automake $amforce $automake_mode $automake_deps + $verbose running $automake in $dir + $automake fi test ! -f $aclocal_m4 && aclocal_m4= - if test $force = no && test -f configure && + if $force && test -f configure && ls -lt configure configure.in $aclocal_m4 | sed 1q | grep 'configure$' > /dev/null then @@ -270,7 +270,7 @@ while read dir; do '` stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in if test ! -f "$template" || grep autoheader "$template" >/dev/null; then - if test $force = no && test -f $template && + if $force && test -f $template && ls -lt $template configure.in $aclocal_m4 $stamp 2>/dev/null \ `echo $localdir_opt | sed -e 's/--localdir=//' \ -e '/./ s%$%/%'`acconfig.h | diff --git a/autoreconf.sh b/autoreconf.sh index 4dae1a983..47036d64e 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -79,7 +79,7 @@ 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 +force=false localdir=. verbose=: @@ -136,7 +136,7 @@ while test $# -gt 0; do shift ;; --force | -f ) - force=yes; shift ;; + force=:; shift ;; # Options of Automake. --cygnus | --foreign | --gnits | --gnu | --include-deps | -i ) @@ -165,7 +165,7 @@ fi # 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" +$force || automake="$automake --no-force" automake="$automake `$verbose --verbose`" aclocal="$aclocal `$verbose --verbose`" export AC_MACRODIR @@ -219,7 +219,7 @@ while read dir; do p q }' Makefile.in 2>/dev/null` - if test $force = no && + if $force && ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null| sed 1q | grep 'aclocal\.m4$' > /dev/null @@ -238,13 +238,13 @@ while read dir; do # Re-run automake if required. Assumes that there is a Makefile.am # in the topmost directory. if test -f Makefile.am; then - $verbose running $automake $amforce in $dir - $automake $amforce $automake_mode $automake_deps + $verbose running $automake in $dir + $automake fi test ! -f $aclocal_m4 && aclocal_m4= - if test $force = no && test -f configure && + if $force && test -f configure && ls -lt configure configure.in $aclocal_m4 | sed 1q | grep 'configure$' > /dev/null then @@ -270,7 +270,7 @@ while read dir; do '` stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in if test ! -f "$template" || grep autoheader "$template" >/dev/null; then - if test $force = no && test -f $template && + if $force && test -f $template && ls -lt $template configure.in $aclocal_m4 $stamp 2>/dev/null \ `echo $localdir_opt | sed -e 's/--localdir=//' \ -e '/./ s%$%/%'`acconfig.h | diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 4dae1a983..47036d64e 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -79,7 +79,7 @@ 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 +force=false localdir=. verbose=: @@ -136,7 +136,7 @@ while test $# -gt 0; do shift ;; --force | -f ) - force=yes; shift ;; + force=:; shift ;; # Options of Automake. --cygnus | --foreign | --gnits | --gnu | --include-deps | -i ) @@ -165,7 +165,7 @@ fi # 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" +$force || automake="$automake --no-force" automake="$automake `$verbose --verbose`" aclocal="$aclocal `$verbose --verbose`" export AC_MACRODIR @@ -219,7 +219,7 @@ while read dir; do p q }' Makefile.in 2>/dev/null` - if test $force = no && + if $force && ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null| sed 1q | grep 'aclocal\.m4$' > /dev/null @@ -238,13 +238,13 @@ while read dir; do # Re-run automake if required. Assumes that there is a Makefile.am # in the topmost directory. if test -f Makefile.am; then - $verbose running $automake $amforce in $dir - $automake $amforce $automake_mode $automake_deps + $verbose running $automake in $dir + $automake fi test ! -f $aclocal_m4 && aclocal_m4= - if test $force = no && test -f configure && + if $force && test -f configure && ls -lt configure configure.in $aclocal_m4 | sed 1q | grep 'configure$' > /dev/null then @@ -270,7 +270,7 @@ while read dir; do '` stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in if test ! -f "$template" || grep autoheader "$template" >/dev/null; then - if test $force = no && test -f $template && + if $force && test -f $template && ls -lt $template configure.in $aclocal_m4 $stamp 2>/dev/null \ `echo $localdir_opt | sed -e 's/--localdir=//' \ -e '/./ s%$%/%'`acconfig.h |