* bin/autoheader.in (BEGIN): For DJGPP SHELL may not be set

to a shell that can handle redirection or quoting correctly.
Override SHELL with the shell detected by configure.
Use of $^O suggested by Tim van Holder.
* bin/autom4te.in (BEGIN): Likewise.
* bin/autoreconf.in (BEGIN): Likewise.
* bin/autoscan.in (BEGIN): Likewise.
* bin/autoupdate.in (BEGIN): Likewise.
* bin/ifnames.in (BEGIN): Likewise.
* bin/ifnames.in: Add final newline to help and version messages.
* lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Translate colons,
to cope with DOS-style absolute paths, when constructing
${ac_make}.
* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS, _AC_OUTPUT_FILES):
When constructing paths with IFS=:, quote the path. If we're
constructing a DOS-style absolute path, we don't want to split it
on the colon.
* tests/atspecific.m4 (AT_CHECK_CONFIGURE): Fix typo
in description.

diff --git a/ChangeLog b/ChangeLog
index 00cdc99bd8bef2723c130827aa7979ee33d40c38..c10cffbcbe0be71b60395c9faf98d9d417fa29f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2003-02-26  Richard Dawe  <rich@phekda.freeserve.co.uk>
+
+       * bin/autoheader.in (BEGIN): For DJGPP SHELL may not be set
+       to a shell that can handle redirection or quoting correctly.
+       Override SHELL with the shell detected by configure.
+       Use of $^O suggested by Tim van Holder.
+       * bin/autom4te.in (BEGIN): Likewise.
+       * bin/autoreconf.in (BEGIN): Likewise.
+       * bin/autoscan.in (BEGIN): Likewise.
+       * bin/autoupdate.in (BEGIN): Likewise.
+       * bin/ifnames.in (BEGIN): Likewise.
+
+       * bin/ifnames.in: Add final newline to help and version messages.
+
+       * lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Translate colons,
+       to cope with DOS-style absolute paths, when constructing
+       ${ac_make}.
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS, _AC_OUTPUT_FILES):
+       When constructing paths with IFS=:, quote the path. If we're
+       constructing a DOS-style absolute path, we don't want to split it
+       on the colon.
+
+       * tests/atspecific.m4 (AT_CHECK_CONFIGURE): Fix typo
+       in description.
+
 2003-02-25  Pavel Roskin  <proski@gnu.org>
 
        * bin/autoheader.in: Add missing newline when printing

diff --git a/NEWS b/NEWS
index 64cfa6949e32f9181e1a752ba60f1a6a3c98aa3e..1f9ca921c98f3ead8c4f8056ec74de76b1d079e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,11 @@
 * Major changes in Autoconf 2.57a                       -*- outline -*-
 
+* Improve DJGPP portability
+  The Autoconf tools and configure behave better under DJGPP.
+
 * Major changes in Autoconf 2.57
 
-  Released 2002-12-03.
+  Released 2002-12-03 by Paul Eggert.
 
 Bug fixes for problems with AIX linker, with freestanding C compilers,
 with GNU m4 limitations, and with obsolete copies of GNU documents.
@@ -11,13 +14,13 @@ The Free Documentation License has been upgraded from 1.1 to 1.2.
 \f
 * Major changes in Autoconf 2.56
 
-  Released November 15th, 2002.
+  Released November 15th, 2002 by Akim Demaille.
 
 One packaging problem fixed (config/install-sh was not executable).
 \f
 * Major changes in Autoconf 2.55
 
-  Released November 14th, 2002.
+  Released November 14th, 2002 by Akim Demaille.
 
 Release tips:
 

diff --git a/THANKS b/THANKS
index 5565c4520fb9dbb2af1f1538e286c7ce84cf10b1..0bbe361e01d67854f12f3af36cc84e63999bb017 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -156,6 +156,7 @@ Rainer Orth                 ro@TechFak.Uni-Bielefeld.DE
 Raja R Harinath             harinath@cs.umn.edu
 Ralf Corsepius              corsepiu@faw.uni-ulm.de
 Ralf S. Engelschall         rse@engelschall.com
+Richard Dawe                rich@phekda.freeserve.co.uk
 Richard Stallman            rms@gnu.org
 Robert Lipe                 robertlipe@usa.net
 Robert S. Maier             rsm@math.arizona.edu

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 28b89c565d32f08403fa304132b35dd2507a2e01..adf6d822dc03c030668ee78aa14d595d618f1a56 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -31,6 +31,12 @@ BEGIN
 {
   my $perllibdir = $ENV{'autom4te_perllibdir'} || '@datadir@';
   unshift @INC, "$perllibdir";
+
+  # Override SHELL.  On DJGPP SHELL may not be set to a shell
+  # that can handle redirection and quote arguments correctly,
+  # e.g.: COMMAND.COM.  For DJGPP always use the shell that configure
+  # has detected.
+  $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
 use Autom4te::General;

diff --git a/bin/autom4te.in b/bin/autom4te.in
index fbec2e41ef3f69b14b2765734a0ac00f8de87579..b2d3995285666906c996503bbc40a78d274c0ef0 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -28,6 +28,12 @@ BEGIN
 {
   my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
   unshift @INC, "$datadir";
+
+  # Override SHELL.  On DJGPP SHELL may not be set to a shell
+  # that can handle redirection and quote arguments correctly,
+  # e.g.: COMMAND.COM.  For DJGPP always use the shell that configure
+  # has detected.
+  $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
 ## --------- ##

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 774d0644a1bfc05bbe5edc51968cd971cc9fcb5c..6ecd3889c7f0f4f61cde5cb450aa976cf6788954 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -30,6 +30,12 @@ BEGIN
 {
   my $perllibdir = $ENV{'autom4te_perllibdir'} || '@datadir@';
   unshift @INC, "$perllibdir";
+
+  # Override SHELL.  On DJGPP SHELL may not be set to a shell
+  # that can handle redirection and quote arguments correctly,
+  # e.g.: COMMAND.COM.  For DJGPP always use the shell that configure
+  # has detected.
+  $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
 use Autom4te::General;

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 74b0bbdbabd09d79a225ebce2be1a95609c7b6c4..a27afc8337f423c496b73cbb534cf70e4f2fadc5 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -27,6 +27,12 @@ BEGIN
 {
   my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@";
   unshift @INC, "$perllibdir";
+
+  # Override SHELL.  On DJGPP SHELL may not be set to a shell
+  # that can handle redirection and quote arguments correctly,
+  # e.g.: COMMAND.COM.  For DJGPP always use the shell that configure
+  # has detected.
+  $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
 use Autom4te::General;

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index f4a913c563ae60a9de74a93e05f6810a574b01bf..4976ea9b794e29e6acc5b9e6468f494848d89488 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -28,6 +28,12 @@ BEGIN
 {
   my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@";
   unshift @INC, "$perllibdir";
+
+  # Override SHELL.  On DJGPP SHELL may not be set to a shell
+  # that can handle redirection and quote arguments correctly,
+  # e.g.: COMMAND.COM.  For DJGPP always use the shell that configure
+  # has detected.
+  $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
 use File::Basename;

diff --git a/bin/ifnames.in b/bin/ifnames.in
index adaf16dfe2b5dabd352358d1d283843a80884c83..b0f50197a5d2a38d361bce5b8f80581c0d28c913 100644 (file)
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -35,6 +35,12 @@ BEGIN
 {
   my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
   unshift @INC, "$datadir";
+
+  # Override SHELL.  On DJGPP SHELL may not be set to a shell
+  # that can handle redirection and quote arguments correctly,
+  # e.g.: COMMAND.COM.  For DJGPP always use the shell that configure
+  # has detected.
+  $ENV{'SHELL'} = '@SHELL@' if ($^O eq 'dos');
 }
 
 use Autom4te::General;
@@ -53,7 +59,8 @@ space-separated list of the files in which that identifier occurs.
   -h, --help      print this help, then exit
   -V, --version   print version number, then exit
 
-Report bugs to <bug-autoconf\@gnu.org>.";
+Report bugs to <bug-autoconf\@gnu.org>.
+";
 
 
 # $VERSION
@@ -64,7 +71,8 @@ Written by David J. MacKenzie and Paul Eggert.
 
 Copyright 2002 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.";
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+";
 
 
 # &parse_args ()

diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index 230ed6f14eefb89433a728159d1203d77b532829..9c9b118db6290eaa8dd7b90484442ff752be087e 100644 (file)
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -458,7 +458,7 @@ AN_MAKEVAR([MAKE], [AC_PROG_MAKE_SET])
 AN_PROGRAM([make], [AC_PROG_MAKE_SET])
 AC_DEFUN([AC_PROG_MAKE_SET],
 [AC_MSG_CHECKING([whether ${MAKE-make} sets \$(MAKE)])
-set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,:./+-,___p_,'`
 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
 [cat >conftest.make <<\_ACEOF
 all:

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 77adefaf0ee37adff8bb274d08fdca66fa1e17e2..6ce0304157cf6af9d49835e00a503a984dc79c59 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Parameterizing and creating config.status.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -523,14 +523,15 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
       [[\\/$]]*)
          # Absolute (can't be DOS-style, as IFS=:)
          test -f "$f" || AC_MSG_ERROR([cannot find input file: $f])
-         echo $f;;
+         # Do quote $f, to prevent DOS paths from being IFS'd.
+         echo "$f";;
       *) # Relative
          if test -f "$f"; then
            # Build tree
-           echo $f
+           echo "$f"
          elif test -f "$srcdir/$f"; then
            # Source tree
-           echo $srcdir/$f
+           echo "$srcdir/$f"
          else
            # /dev/null tree
            AC_MSG_ERROR([cannot find input file: $f])
@@ -979,14 +980,14 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
       [[\\/$]]*)
          # Absolute (can't be DOS-style, as IFS=:)
          test -f "$f" || AC_MSG_ERROR([cannot find input file: $f])
-         echo $f;;
+         echo "$f";;
       *) # Relative
          if test -f "$f"; then
            # Build tree
-           echo $f
+           echo "$f"
          elif test -f "$srcdir/$f"; then
            # Source tree
-           echo $srcdir/$f
+           echo "$srcdir/$f"
          else
            # /dev/null tree
            AC_MSG_ERROR([cannot find input file: $f])

diff --git a/tests/atspecific.m4 b/tests/atspecific.m4
index fb7726425fd0e9b42bbad8540dbf994e00331160..242d4434e83f4cfda0845fa49ab6af34d2999f25 100644 (file)
--- a/tests/atspecific.m4
+++ b/tests/atspecific.m4
@@ -221,7 +221,7 @@ m4_define([AT_CHECK_AUTOHEADER],
 
 # AT_CHECK_CONFIGURE(END-COMMAND,
 #                    [EXIT-STATUS = 0],
-#                    [SDOUT = IGNORE], STDERR)
+#                    [STDOUT = IGNORE], STDERR)
 # --------------------------------------------
 # `abs_top_srcdir' is needed so that `./configure' finds install-sh.
 # Using --srcdir is more expensive.