mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-30 11:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

* autoreconf.sh <run_aclocal>: Use false/: instead of no/yes.

Browse Source 
Formatting and factoring changes.
This commit is contained in:
Akim Demaille 2000-07-10 08:59:11 +00:00
parent d70f10d81b
commit 09c8c7c398
4 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-07-10 Akim Demaille <akim@epita.fr>
* autoreconf.sh <run_aclocal>: Use false/: instead of no/yes.
Formatting and factoring changes.
2000-07-10 Akim Demaille <akim@epita.fr> 2000-07-10 Akim Demaille <akim@epita.fr>
* autoreconf.sh: You too can have a $tmp dir if you wish. * autoreconf.sh: You too can have a $tmp dir if you wish.

36
autoreconf.in
View File

@ -232,29 +232,25 @@ while read dir; do
# Running aclocal. # # Running aclocal. #
# ----------------- # # ----------------- #
run_aclocal=no # run_aclocal -- is this package using aclocal?
run_aclocal=false
aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'` aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'`
if test -f "$aclocal_m4" && if grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null 2>&1 ||
grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null; then test -f "$aclocal_dir/acinclude.m4"; then
run_aclocal=yes run_aclocal=:
else
if test -f "$aclocal_dir/acinclude.m4"; then
run_aclocal=yes
fi
fi fi
if test $run_aclocal = yes; then if $run_aclocal &&
$force &&
ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null |
sed 1q |
grep 'aclocal\.m4$' >/dev/null; then :; else
# If there are flags for aclocal in Makefile.am, use them. # If there are flags for aclocal in Makefile.am, use them.
aclocal_flags=`sed -f $tmp/alflags.sed Makefile.am 2>/dev/null` aclocal_flags=`sed -f $tmp/alflags.sed Makefile.am 2>/dev/null`
if $force && if test x"$aclocal_dir" != x.; then
ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null | aclocal_flags="$aclocal_flags -I $aclocal_dir"
sed 1q |
grep 'aclocal\.m4$' >/dev/null; then :; else
if test x"$aclocal_dir" != x.; then
aclocal_flags="$aclocal_flags -I $aclocal_dir"
fi
$verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
$aclocal $aclocal_flags --output=$aclocal_m4
fi fi
$verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
$aclocal $aclocal_flags --output=$aclocal_m4
fi fi
@ -264,8 +260,8 @@ while read dir; do
# Assumes that there is a Makefile.am in the topmost directory. # Assumes that there is a Makefile.am in the topmost directory.
if test -f Makefile.am; then if test -f Makefile.am; then
$verbose running $automake in $dir $verbose running $automake in $dir
$automake $automake
fi fi

36
autoreconf.sh
View File

@ -232,29 +232,25 @@ while read dir; do
# Running aclocal. # # Running aclocal. #
# ----------------- # # ----------------- #
run_aclocal=no # run_aclocal -- is this package using aclocal?
run_aclocal=false
aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'` aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'`
if test -f "$aclocal_m4" && if grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null 2>&1 ||
grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null; then test -f "$aclocal_dir/acinclude.m4"; then
run_aclocal=yes run_aclocal=:
else
if test -f "$aclocal_dir/acinclude.m4"; then
run_aclocal=yes
fi
fi fi
if test $run_aclocal = yes; then if $run_aclocal &&
$force &&
ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null |
sed 1q |
grep 'aclocal\.m4$' >/dev/null; then :; else
# If there are flags for aclocal in Makefile.am, use them. # If there are flags for aclocal in Makefile.am, use them.
aclocal_flags=`sed -f $tmp/alflags.sed Makefile.am 2>/dev/null` aclocal_flags=`sed -f $tmp/alflags.sed Makefile.am 2>/dev/null`
if $force && if test x"$aclocal_dir" != x.; then
ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null | aclocal_flags="$aclocal_flags -I $aclocal_dir"
sed 1q |
grep 'aclocal\.m4$' >/dev/null; then :; else
if test x"$aclocal_dir" != x.; then
aclocal_flags="$aclocal_flags -I $aclocal_dir"
fi
$verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
$aclocal $aclocal_flags --output=$aclocal_m4
fi fi
$verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
$aclocal $aclocal_flags --output=$aclocal_m4
fi fi
@ -264,8 +260,8 @@ while read dir; do
# Assumes that there is a Makefile.am in the topmost directory. # Assumes that there is a Makefile.am in the topmost directory.
if test -f Makefile.am; then if test -f Makefile.am; then
$verbose running $automake in $dir $verbose running $automake in $dir
$automake $automake
fi fi

36
bin/autoreconf.in
View File

@ -232,29 +232,25 @@ while read dir; do
# Running aclocal. # # Running aclocal. #
# ----------------- # # ----------------- #
run_aclocal=no # run_aclocal -- is this package using aclocal?
run_aclocal=false
aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'` aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'`
if test -f "$aclocal_m4" && if grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null 2>&1 ||
grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null; then test -f "$aclocal_dir/acinclude.m4"; then
run_aclocal=yes run_aclocal=:
else
if test -f "$aclocal_dir/acinclude.m4"; then
run_aclocal=yes
fi
fi fi
if test $run_aclocal = yes; then if $run_aclocal &&
$force &&
ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null |
sed 1q |
grep 'aclocal\.m4$' >/dev/null; then :; else
# If there are flags for aclocal in Makefile.am, use them. # If there are flags for aclocal in Makefile.am, use them.
aclocal_flags=`sed -f $tmp/alflags.sed Makefile.am 2>/dev/null` aclocal_flags=`sed -f $tmp/alflags.sed Makefile.am 2>/dev/null`
if $force && if test x"$aclocal_dir" != x.; then
ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null | aclocal_flags="$aclocal_flags -I $aclocal_dir"
sed 1q |
grep 'aclocal\.m4$' >/dev/null; then :; else
if test x"$aclocal_dir" != x.; then
aclocal_flags="$aclocal_flags -I $aclocal_dir"
fi
$verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
$aclocal $aclocal_flags --output=$aclocal_m4
fi fi
$verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
$aclocal $aclocal_flags --output=$aclocal_m4
fi fi
@ -264,8 +260,8 @@ while read dir; do
# Assumes that there is a Makefile.am in the topmost directory. # Assumes that there is a Makefile.am in the topmost directory.
if test -f Makefile.am; then if test -f Makefile.am; then
$verbose running $automake in $dir $verbose running $automake in $dir
$automake $automake
fi fi