From: Ben Elliston <bje+keyword+gnu.7caf74@air.net.au>
Date: Wed, 25 Aug 1999 13:44:46 +0000 (+0000)
Subject: 1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
X-Git-Tag: trunk-pre-merge-trunk-into-experimental-1999-10-01~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=117cd369d4aebbef11b0864583ac3f4792d7fa1d;p=thirdparty%2Fautoconf.git

1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* autoreconf.sh: Run aclocal with the -I option only if
	aclocal_dir != `.'.  Fix for autoconf/44.
---

diff --git a/ChangeLog b/ChangeLog
index bc5ed3a8..552c70b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* autoreconf.sh: Run aclocal with the -I option only if
+	aclocal_dir != `.'.  Fix for autoconf/44.
+	
 1999-08-05  Jeffrey A Law  <law@cygnus.com>
 
 	* 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