From 117cd369d4aebbef11b0864583ac3f4792d7fa1d Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Wed, 25 Aug 1999 13:44:46 +0000 Subject: [PATCH] 1999-08-25 Alexandre Oliva * autoreconf.sh: Run aclocal with the -I option only if aclocal_dir != `.'. Fix for autoconf/44. --- ChangeLog | 5 +++++ autoreconf.in | 6 +++++- autoreconf.sh | 6 +++++- bin/autoreconf.in | 6 +++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc5ed3a8..552c70b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-08-25 Alexandre Oliva + + * autoreconf.sh: Run aclocal with the -I option only if + aclocal_dir != `.'. Fix for autoconf/44. + 1999-08-05 Jeffrey A Law * config.sub (-wrs case): Use os=-vxworks, not os=vxworks. diff --git a/autoreconf.in b/autoreconf.in index 125d442e..abd43ec3 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -170,8 +170,12 @@ while read dir; do then : else + if test x"$aclocal_dir" != x. + 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 -I $aclocal_dir + aclocal $aclocal_flags --output=$aclocal_m4 fi fi diff --git a/autoreconf.sh b/autoreconf.sh index 125d442e..abd43ec3 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -170,8 +170,12 @@ while read dir; do then : else + if test x"$aclocal_dir" != x. + 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 -I $aclocal_dir + aclocal $aclocal_flags --output=$aclocal_m4 fi fi diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 125d442e..abd43ec3 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -170,8 +170,12 @@ while read dir; do then : else + if test x"$aclocal_dir" != x. + 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 -I $aclocal_dir + aclocal $aclocal_flags --output=$aclocal_m4 fi fi -- 2.47.2