* 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 cdaee0428fde0aa1bcb5a9e5315a1b45a8b7d98d..113cc94411981777342aa58a2f63f00fea097428 100644 (file)
--- 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 2dea89d7140adfbde2edea2abb7829704165222c..2e757d02faddf64c111969209dd63630eff28fae 100644 (file)
--- 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 86ca54ff3eabc6128f9b69300a72edc565bbf7eb..5d8262d6b69acd6d266a921c672c89cb8a812870 100644 (file)
--- 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 65b0ef5f17cc6c1e2e1ba05b1e7e75e21806927e..2294cfa807e459ca0e8fbf5907b53237cd977cdb 100644 (file)
--- 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 184e9a4098f1e85735f1c22a6715393669fd75d7..9696bb8dd21af8b5f2c566e0647fce01be294d0f 100644 (file)
--- 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 ce55a4b22d6f3aeabeeb0a56cb19731350ca141a..374bfe5b490f3d3b270ff1643b8a120e2f88878b 100644 (file)
--- 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@');