From: Akim Demaille <akim@epita.fr>
Date: Mon, 22 Jan 2001 19:05:16 +0000 (+0000)
Subject: * autoscan.pl ($dir, $autoconf): New.
X-Git-Tag: autoconf-2.50~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4643604bcea05974c5ab8f3c80cf4f78ebb802;p=thirdparty%2Fautoconf.git

* autoscan.pl ($dir, $autoconf): New.
---

diff --git a/ChangeLog b/ChangeLog
index e43a7a6c4..43419e53b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-22  Akim Demaille  <akim@epita.fr>
+
+	* autoscan.pl ($dir, $autoconf): New.
+
 2001-01-22  Akim Demaille  <akim@epita.fr>
 
 	* autoscan.pl ($headers, $functions, $identifiers, $libraries):
diff --git a/autoscan.in b/autoscan.in
index 33cc63e35..d488c9081 100644
--- a/autoscan.in
+++ b/autoscan.in
@@ -22,7 +22,24 @@
 require "find.pl";
 use Getopt::Long;
 
+# Find the lib files and autoconf.
 $datadir = $ENV{"AC_MACRODIR"} || "@datadir@";
+($dir = $0) =~ s,[^/]*$,,;
+$autoconf = '';
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+foreach $file ("$ENV{AUTOCONF}" || '',
+	       "$dir/@autoconf-name@",
+	       "$dir/autoconf",
+	       "@bindir@/@autoconf-name@")
+  {
+    if (-f $file)
+      {
+	$autoconf = $file;
+	last;
+      }
+  }
+
 ($me = $0) =~ s,.*/,,;
 $verbose = 0;
 
@@ -538,7 +555,7 @@ sub check_configure_ac
       $trace_option .= " -t $macro";
     }
 
-  open (TRACES, "/home/akim/src/ace/autoconf -A $datadir $trace_option $configure_ac|") ||
+  open (TRACES, "$autoconf -A $datadir $trace_option $configure_ac|") ||
     die "$me: cannot create read traces: $!\n";
 
   while (<TRACES>)
diff --git a/autoscan.pl b/autoscan.pl
index 33cc63e35..d488c9081 100644
--- a/autoscan.pl
+++ b/autoscan.pl
@@ -22,7 +22,24 @@
 require "find.pl";
 use Getopt::Long;
 
+# Find the lib files and autoconf.
 $datadir = $ENV{"AC_MACRODIR"} || "@datadir@";
+($dir = $0) =~ s,[^/]*$,,;
+$autoconf = '';
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+foreach $file ("$ENV{AUTOCONF}" || '',
+	       "$dir/@autoconf-name@",
+	       "$dir/autoconf",
+	       "@bindir@/@autoconf-name@")
+  {
+    if (-f $file)
+      {
+	$autoconf = $file;
+	last;
+      }
+  }
+
 ($me = $0) =~ s,.*/,,;
 $verbose = 0;
 
@@ -538,7 +555,7 @@ sub check_configure_ac
       $trace_option .= " -t $macro";
     }
 
-  open (TRACES, "/home/akim/src/ace/autoconf -A $datadir $trace_option $configure_ac|") ||
+  open (TRACES, "$autoconf -A $datadir $trace_option $configure_ac|") ||
     die "$me: cannot create read traces: $!\n";
 
   while (<TRACES>)
diff --git a/bin/autoscan.in b/bin/autoscan.in
index 33cc63e35..d488c9081 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -22,7 +22,24 @@
 require "find.pl";
 use Getopt::Long;
 
+# Find the lib files and autoconf.
 $datadir = $ENV{"AC_MACRODIR"} || "@datadir@";
+($dir = $0) =~ s,[^/]*$,,;
+$autoconf = '';
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+foreach $file ("$ENV{AUTOCONF}" || '',
+	       "$dir/@autoconf-name@",
+	       "$dir/autoconf",
+	       "@bindir@/@autoconf-name@")
+  {
+    if (-f $file)
+      {
+	$autoconf = $file;
+	last;
+      }
+  }
+
 ($me = $0) =~ s,.*/,,;
 $verbose = 0;
 
@@ -538,7 +555,7 @@ sub check_configure_ac
       $trace_option .= " -t $macro";
     }
 
-  open (TRACES, "/home/akim/src/ace/autoconf -A $datadir $trace_option $configure_ac|") ||
+  open (TRACES, "$autoconf -A $datadir $trace_option $configure_ac|") ||
     die "$me: cannot create read traces: $!\n";
 
   while (<TRACES>)