From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Mon, 10 Feb 2003 14:10:39 +0000 (+0000)
Subject: * automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
X-Git-Tag: Release-1-7-2b~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e71f7e220cd36fa20239b643b9b4f37b3134889;p=thirdparty%2Fautomake.git

* automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
SHELL for DJGPP.
Suggested by Richard Dawe.
---

diff --git a/ChangeLog b/ChangeLog
index 644fd1f64..478dedaa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-10  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
+	SHELL for DJGPP.
+	Suggested by Richard Dawe.
+
 2003-02-09  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* automake.texi (FAQ, CVS, maintainer-mode, wildcards)
diff --git a/automake.in b/automake.in
index 2bfaa9ea8..85a093d5a 100755
--- a/automake.in
+++ b/automake.in
@@ -33,6 +33,15 @@ BEGIN
 {
   my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
   unshift @INC, $perllibdir;
+
+  # Override SHELL.  This is required on DJGPP so that system() uses
+  # bash, not COMMAND.COM which doesn't quote arguments properly.
+  # Other systems aren't expected to use $SHELL when Automake
+  # runs, but it should be safe to drop the `if DJGPP' gard if
+  # it turns up other systems need the same thing.  After all,
+  # if SHELL is used, ./configure's SHELL is always better than
+  # the user's SHELL (which may be something like tcsh).
+  $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJGPP'};
 }
 
 use Automake::Struct;