From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 12 Jun 2002 17:26:19 +0000 (+0000)
Subject: * bin/autoconf.as (AUTOM4TE): Default to a fully qualified path
X-Git-Tag: AUTOCONF-2.53b~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9edd82d2ee0e127c4680ea521f76dd9e407ccefc;p=thirdparty%2Fautoconf.git

* bin/autoconf.as (AUTOM4TE): Default to a fully qualified path
name, so that symlinks to 'autoconf' work properly.  Bug reported
by Bruno Haible.
* bin/autoheader.in (AUTOM4TE): Likewise.
* bin/autoreconf.in (autoconf, autoheader): Likewise.
* bin/autoscan.in (autom4te): Likewise.
* bin/autoupdate.in (autom4te): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index cdaee0428..113cc9441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-06-12  Paul Eggert  <eggert@twinsun.com>
 
+	* bin/autoconf.as (AUTOM4TE): Default to a fully qualified path
+	name, so that symlinks to 'autoconf' work properly.  Bug reported
+	by Bruno Haible.
+	* bin/autoheader.in (AUTOM4TE): Likewise.
+	* bin/autoreconf.in (autoconf, autoheader): Likewise.
+	* bin/autoscan.in (autom4te): Likewise.
+	* bin/autoupdate.in (autom4te): Likewise.
+	
 	* lib/autoconf/functions.m4 (_AC_LIBOBJ_FNMATCH): Also check for
 	btowc, to fix a portability bug with diffutils-2.8.2/lib/fnmatch.c
 	on Solaris 2.5.1.
diff --git a/bin/autoconf.as b/bin/autoconf.as
index 2dea89d71..2e757d02f 100644
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -74,7 +74,7 @@ echo \"\$help\" >&2
 exit 1"
 
 # Variables.
-: ${AUTOM4TE=@autom4te-name@}
+: ${AUTOM4TE='@bindir@/@autom4te-name@'}
 dir=`AS_DIRNAME([$0])`
 outfile=
 verbose=:
diff --git a/bin/autoheader.in b/bin/autoheader.in
index 86ca54ff3..5d8262d6b 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -41,7 +41,7 @@ use strict;
 use vars qw ($config_h %verbatim %symbol);
 
 # Lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
+my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 local $config_h;
 my $config_h_in;
 my @include;
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 65b0ef5f1..2294cfa80 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -84,8 +84,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 ";
 
 # Lib files.
-my $autoconf   = $ENV{'AUTOCONF'}   || '@autoconf-name@';
-my $autoheader = $ENV{'AUTOHEADER'} || '@autoheader-name@';
+my $autoconf   = $ENV{'AUTOCONF'}   || '@bindir@/@autoconf-name@';
+my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@';
 my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
 my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
 my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
diff --git a/bin/autoscan.in b/bin/autoscan.in
index 184e9a409..9696bb8dd 100644
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -78,7 +78,7 @@ my $configure_scan = 'configure.scan';
 my $log = new Autom4te::XFile ">$me.log";
 
 # Autoconf and lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
+my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 my $autoconf = "$autom4te --language=autoconf";
 my @include = ('@datadir@');
 
diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index ce55a4b22..374bfe5b4 100644
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -36,7 +36,7 @@ use Autom4te::XFile;
 use strict;
 
 # Lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
+my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@';
 my $autoconf = "$autom4te --language=autoconf";
 # We need to find m4sugar.
 my @include = ('@datadir@');