Re: include bindir in AUTOM4TE default

[Alexandre Duret-Lutz]

>>> "Akim" == Akim Demaille <address@hidden> writes:

[...]

 >> dir=`echo "$0" | sed -e 's,[^\\/]*$,,'`
 >> : address@hidden@}
 >> 
 >> That should obey PATH if the user typed `autoconf', but
 >> use `/mumble/autom4te' whenever the user ran `/mumble/autoconf'.

 Akim> I'm OK with this scheme.  I'm fine with applying it, but then, I'm
 Akim> waiting for someone to provide the patch.  Pay attention that the full
 Akim> patch should

 Akim> - cover all the guys in bin/
 Akim> - use something DOS portable to address the dirname bits
 Akim> - document the rules followed to find the executable.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/autoconf/autoconf/ChangeLog,v
retrieving revision 1.1849
diff -u -r1.1849 ChangeLog
--- ChangeLog   7 Feb 2002 18:31:27 -0000       1.1849
+++ ChangeLog   13 Feb 2002 22:26:00 -0000
@@ -1,3 +1,17 @@
+2002-02-13  Alexandre Duret-Lutz  <address@hidden>
+
+       * doc/autoconf.texi (autoscan Invocation, autoconf Invocation,
+       autoreconf Invocation, autoheader Invocation,
+       autoupdate Invocation): Explain how sub commands such as autom4te
+       are found, and how their location can be specified by the user.
+       * bin/autoscan.in (bindir): New variable.
+       (autom4te): Use it as prefix.
+       * bin/autoheader.in: Likewise.
+       * bin/autoupdate.in: Likewise.
+       * bin/autoreconf.in (bindir): New variable.
+       (autoconf, autoheader): Use it as prefix.
+       * bin/autoconf.in (AUTOM4TE): Use $dir as prefix.
+
 2002-02-07  Akim Demaille  <address@hidden>
 
        Version 2.52h.
Index: NEWS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/NEWS,v
retrieving revision 1.219
diff -u -r1.219 NEWS
--- NEWS        11 Feb 2002 14:04:54 -0000      1.219
+++ NEWS        13 Feb 2002 22:26:05 -0000
@@ -54,6 +54,12 @@
   Before, it used to run on all the `configure.ac' found in the
   current tree.
   Independent packages are properly updated.
+- autoscan, autoupdate, autoconf, autoheader, autoreconf
+  These commands, which need to run another command such as autom4te,
+  are now able to run this command even if it is not in PATH.  For
+  instance if you invoke /mumble/autoreconf, it will runs /mumble/autoconf
+  and /mumble/autoheader.  If you invoke autoreconf it will still invoke
+  autoconf and autoheader as before (i.e. doing a PATH search).
 
 ** Bug fixes
 
Index: bin/autoconf.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoconf.in,v
retrieving revision 1.143
diff -u -r1.143 autoconf.in
--- bin/autoconf.in     24 Jan 2002 18:41:17 -0000      1.143
+++ bin/autoconf.in     13 Feb 2002 22:26:17 -0000
@@ -82,8 +82,8 @@
 if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 
 # Variables.
-: address@hidden@}
 dir=`echo "$0" | sed -e 's,[^\\/]*$,,'`
+: address@hidden@}
 outfile=
 verbose=:
 
Index: bin/autoheader.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoheader.in,v
retrieving revision 1.114
diff -u -r1.114 autoheader.in
--- bin/autoheader.in   20 Oct 2001 06:51:41 -0000      1.114
+++ bin/autoheader.in   13 Feb 2002 22:26:17 -0000
@@ -41,7 +41,9 @@
 use vars qw ($config_h %verbatim %symbol);
 
 # Lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
+my $bindir;
+($bindir = $0) =~ s,[^\\/]*$,,;
+my $autom4te = $ENV{'AUTOM4TE'} || $bindir . '@autom4te-name@';
 local $config_h;
 my $config_h_in;
 my @include;
Index: bin/autoreconf.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoreconf.in,v
retrieving revision 1.88
diff -u -r1.88 autoreconf.in
--- bin/autoreconf.in   8 Nov 2001 17:21:38 -0000       1.88
+++ bin/autoreconf.in   13 Feb 2002 22:26:19 -0000
@@ -84,8 +84,10 @@
 ";
 
 # Lib files.
-my $autoconf   = $ENV{'AUTOCONF'}   || '@autoconf-name@';
-my $autoheader = $ENV{'AUTOHEADER'} || '@autoheader-name@';
+my $bindir;
+($bindir = $0) =~ s,[^\\/]*$,,;
+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';
Index: bin/autoscan.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoscan.in,v
retrieving revision 1.74
diff -u -r1.74 autoscan.in
--- bin/autoscan.in     24 Jan 2002 18:41:17 -0000      1.74
+++ bin/autoscan.in     13 Feb 2002 22:26:20 -0000
@@ -78,7 +78,9 @@
 my $log = new Autom4te::XFile ">$me.log";
 
 # Autoconf and lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
+my $bindir;
+($bindir = $0) =~ s,[^\\/]*$,,;
+my $autom4te = $ENV{'AUTOM4TE'} || $bindir . '@autom4te-name@';
 my $autoconf = "$autom4te --language=autoconf";
 my @include = ('@datadir@');
 
Index: bin/autoupdate.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoupdate.in,v
retrieving revision 1.30
diff -u -r1.30 autoupdate.in
--- bin/autoupdate.in   20 Sep 2001 14:55:49 -0000      1.30
+++ bin/autoupdate.in   13 Feb 2002 22:26:23 -0000
@@ -36,7 +36,9 @@
 use strict;
 
 # Lib files.
-my $autom4te = $ENV{'AUTOM4TE'} || '@autom4te-name@';
+my $bindir;
+($bindir = $0) =~ s,[^\\/]*$,,;
+my $autom4te = $ENV{'AUTOM4TE'} || $bindir . '@autom4te-name@';
 my $autoconf = "$autom4te --language=autoconf";
 # We need to find m4sugar.
 my @include = ('@datadir@');
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.585
diff -u -r1.585 autoconf.texi
--- doc/autoconf.texi   7 Feb 2002 15:49:32 -0000       1.585
+++ doc/autoconf.texi   13 Feb 2002 22:27:12 -0000
@@ -1067,6 +1067,15 @@
 output if that symbol is encountered.  Lines starting with @samp{#} are
 comments.
 
address@hidden uses @command{autom4te} (another command installed by
+Autoconf in the same directory as @command{autoscan}).  The location of
address@hidden can be specified using the @code{AUTOM4TE}
+environment variable, otherwise @command{autoscan} will run
address@hidden as follow: if you run @command{/mumble/autoscan},
+then @command{/mumble/autom4te} is run, if you run @command{autoscan}
+then @command{autom4te} is run.  This rules are meant to allow you using
address@hidden even if it is not in your @code{PATH}.
+
 @command{autoscan} accepts the following options:
 
 @table @option
@@ -1145,6 +1154,10 @@
 defined in more than one of the files that @command{autoconf} reads, the
 last definition it reads overrides the earlier ones.
 
+Like @command{autoscan}, @command{autoconf} uses @command{autom4te} and
+allow you to override the automatically computed location using the
address@hidden environment variable.
+
 @command{autoconf} accepts the following options:
 
 @table @option
@@ -1405,6 +1418,22 @@
 properly, but does not pass @address@hidden or
 @address@hidden
 
+The @command{aclocal}, @command{automake}, @command{libtoolize}, and
address@hidden programs have to be in your @code{PATH} if they are
+needed, or you can specify their location using the @code{ACLOCAL},
address@hidden, @code{LIBTOOLIZE}, and @code{GETTEXTIZE} environment
+variables.
+
+The @command{autoconf} and @command{autoupdate} commands are installed
+with @command{autoreconf} and can hence be looked up on a smarter way.
+If @command{autorecond} is invoked as @command{/mumble/autoreconf} then
address@hidden/mumble/autoconf} and @command{/mumble/autoupdate} are run, if
+it is simply invoked as @command{autoreconf} then @command{autoconf} and
address@hidden are run.  This should allow you to use
address@hidden even if it is not in @code{PATH}.  As with the other
+commands, you can override these locations with the @code{AUTOCONF} and
address@hidden environment variables.
+
 @noindent
 @command{autoreconf} accepts the following options:
 
@@ -2503,6 +2532,10 @@
 argument of @option{-}, it reads the standard input instead of
 @file{configure.ac} and writes the header file to the standard output.
 
+Like @command{autoscan}, @command{autoheader} needs to call
address@hidden and allows you to override the computed location by
+setting the @code{AUTOM4TE} environment variable.
+
 @command{autoheader} accepts the following options:
 
 @table @option
@@ -10392,6 +10425,10 @@
 set).  If you give @command{autoupdate} an argument, it reads that file
 instead of @file{configure.ac} and writes the updated file to the
 standard output.
+
+Like @command{autoscan}, @command{autoupdate} uses @command{autom4te},
+and allow you to override its computed location with the @code{AUTOM4TE}
+environment variable.
 
 @noindent
 @command{autoupdate} accepts the following options:



-- 
Alexandre Duret-Lutz