autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

autoconf & DJGPP: SHELL, ${ac_make}, IFS=:


From: Richard Dawe
Subject: autoconf & DJGPP: SHELL, ${ac_make}, IFS=:
Date: Mon, 24 Feb 2003 18:44:07 +0000

Hello.

Below are some patches to improve autoconf's operation with DJGPP.
They are against CVS HEAD.

Thanks, bye, Rich =]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/autoconf/autoconf/ChangeLog,v
retrieving revision 1.2114
diff -p -u -3 -r1.2114 ChangeLog
--- ChangeLog   23 Feb 2003 23:00:56 -0000      1.2114
+++ ChangeLog   24 Feb 2003 18:38:36 -0000
@@ -1,3 +1,28 @@
+2003-02-24  Richard Dawe  <address@hidden>
+
+       * 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.
+       * 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-24  Kevin Ryde  <address@hidden>
 
        * doc/autoconf.texi (Limitations of Builtins): Add notes on printf
Index: bin/autoheader.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoheader.in,v
retrieving revision 1.126
diff -p -u -3 -r1.126 autoheader.in
--- bin/autoheader.in   22 Oct 2002 11:14:44 -0000      1.126
+++ bin/autoheader.in   24 Feb 2003 18:38:37 -0000
@@ -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 exists $ENV{'DJGPP'};
 }
 
 use Autom4te::General;
Index: bin/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autom4te.in,v
retrieving revision 1.79
diff -p -u -3 -r1.79 autom4te.in
--- bin/autom4te.in     3 Dec 2002 08:30:12 -0000       1.79
+++ bin/autom4te.in     24 Feb 2003 18:38:43 -0000
@@ -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 exists $ENV{'DJGPP'};
 }
 
 ## --------- ##
Index: bin/autoreconf.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoreconf.in,v
retrieving revision 1.111
diff -p -u -3 -r1.111 autoreconf.in
--- bin/autoreconf.in   20 Feb 2003 17:04:11 -0000      1.111
+++ bin/autoreconf.in   24 Feb 2003 18:38:43 -0000
@@ -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 exists $ENV{'DJGPP'};
 }
 
 use Autom4te::General;
Index: bin/autoscan.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoscan.in,v
retrieving revision 1.89
diff -p -u -3 -r1.89 autoscan.in
--- bin/autoscan.in     7 Nov 2002 14:11:31 -0000       1.89
+++ bin/autoscan.in     24 Feb 2003 18:38:45 -0000
@@ -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 exists $ENV{'DJGPP'};
 }
 
 use Autom4te::General;
Index: bin/autoupdate.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autoupdate.in,v
retrieving revision 1.41
diff -p -u -3 -r1.41 autoupdate.in
--- bin/autoupdate.in   25 Oct 2002 08:24:16 -0000      1.41
+++ bin/autoupdate.in   24 Feb 2003 18:38:51 -0000
@@ -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 exists $ENV{'DJGPP'};
 }
 
 use File::Basename;
Index: bin/ifnames.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/ifnames.in,v
retrieving revision 1.27
diff -p -u -3 -r1.27 ifnames.in
--- bin/ifnames.in      2 Jul 2002 20:31:22 -0000       1.27
+++ bin/ifnames.in      24 Feb 2003 18:38:51 -0000
@@ -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 exists $ENV{'DJGPP'};
 }
 
 use Autom4te::General;
@@ -53,7 +59,8 @@ space-separated list of the files in whi
   -h, --help      print this help, then exit
   -V, --version   print version number, then exit
 
-Report bugs to <address@hidden>.";
+Report bugs to <address@hidden>.
+";
 
 
 # $VERSION
@@ -64,7 +71,8 @@ Written by David J. MacKenzie and Paul E
 
 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 ()
Index: lib/autoconf/programs.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v
retrieving revision 1.13
diff -p -u -3 -r1.13 programs.m4
--- lib/autoconf/programs.m4    31 Oct 2002 13:15:03 -0000      1.13
+++ lib/autoconf/programs.m4    24 Feb 2003 18:38:53 -0000
@@ -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:
Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.32
diff -p -u -3 -r1.32 status.m4
--- lib/autoconf/status.m4      12 Nov 2002 10:54:46 -0000      1.32
+++ lib/autoconf/status.m4      24 Feb 2003 18:39:00 -0000
@@ -523,14 +523,14 @@ for ac_file in : $CONFIG_HEADERS; do tes
       [[\\/$]]*)
          # 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])
@@ -979,14 +979,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])
Index: tests/atspecific.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/atspecific.m4,v
retrieving revision 1.75
diff -p -u -3 -r1.75 atspecific.m4
--- tests/atspecific.m4 31 Oct 2002 13:57:37 -0000      1.75
+++ tests/atspecific.m4 24 Feb 2003 18:39:02 -0000
@@ -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.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]