* automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's

SHELL for DJGPP.
Suggested by Richard Dawe.

diff --git a/ChangeLog b/ChangeLog
index 644fd1f649f06d556cfcd5681909b68e7fc4dcbd..478dedaa758f6140d2bc623c5266ad53af887949 100644 (file)
--- 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 2bfaa9ea84d10e296ccbd7c64fa4a9134a8fc9c3..85a093d5a9199137727a76c8fe2d49ef0d9758f3 100755 (executable)
--- 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;