From 3e7682ecb795c91bb6072b04605901ad5c690ae8 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 11 Jan 2001 14:18:48 +0000 Subject: [PATCH] * autoconf.sh (M4): Handle PC drive letters. * autoupdate.sh: Likewise. --- ChangeLog | 5 +++++ autoconf.in | 8 ++++---- autoconf.sh | 8 ++++---- bin/autoconf.in | 8 ++++---- man/autoconf.1 | 4 ++-- man/autoupdate.1 | 4 ++-- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dd1811b..edb666ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-01-11 Kelly Anderson + + * autoconf.sh (M4): Handle PC drive letters. + * autoupdate.sh: Likewise. + 2001-01-11 Steven G. Johnson * aclang.m4 (AC_PROG_F77): Add pgf90 to the list of compilers to diff --git a/autoconf.in b/autoconf.in index ff3aa0eb..4da21ea3 100644 --- a/autoconf.in +++ b/autoconf.in @@ -95,8 +95,8 @@ ac_LF_and_DOT=`echo; echo .` # Handle the case that m4 has moved since we were configured. # It may have been found originally in a build directory. : ${M4=@M4@} -case "$M4" in -/*) test -f "$M4" || M4=m4 ;; +case $M4 in +/*|[a-zA-Z]:*) test -f "$M4" || M4=m4 ;; esac # Some non-GNU m4's don't reject the --help option, so give them /dev/null. case `$M4 --help &1` in @@ -297,8 +297,8 @@ elif test ! -r "$infile"; then fi # Output is produced into FD 4. Prepare it. -case "x$outfile" in - x-) # Output to stdout +case $outfile in + -) # Output to stdout exec 4>&1 ;; * ) exec 4>$outfile;; diff --git a/autoconf.sh b/autoconf.sh index ff3aa0eb..4da21ea3 100644 --- a/autoconf.sh +++ b/autoconf.sh @@ -95,8 +95,8 @@ ac_LF_and_DOT=`echo; echo .` # Handle the case that m4 has moved since we were configured. # It may have been found originally in a build directory. : ${M4=@M4@} -case "$M4" in -/*) test -f "$M4" || M4=m4 ;; +case $M4 in +/*|[a-zA-Z]:*) test -f "$M4" || M4=m4 ;; esac # Some non-GNU m4's don't reject the --help option, so give them /dev/null. case `$M4 --help &1` in @@ -297,8 +297,8 @@ elif test ! -r "$infile"; then fi # Output is produced into FD 4. Prepare it. -case "x$outfile" in - x-) # Output to stdout +case $outfile in + -) # Output to stdout exec 4>&1 ;; * ) exec 4>$outfile;; diff --git a/bin/autoconf.in b/bin/autoconf.in index ff3aa0eb..4da21ea3 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -95,8 +95,8 @@ ac_LF_and_DOT=`echo; echo .` # Handle the case that m4 has moved since we were configured. # It may have been found originally in a build directory. : ${M4=@M4@} -case "$M4" in -/*) test -f "$M4" || M4=m4 ;; +case $M4 in +/*|[a-zA-Z]:*) test -f "$M4" || M4=m4 ;; esac # Some non-GNU m4's don't reject the --help option, so give them /dev/null. case `$M4 --help &1` in @@ -297,8 +297,8 @@ elif test ! -r "$infile"; then fi # Output is produced into FD 4. Prepare it. -case "x$outfile" in - x-) # Output to stdout +case $outfile in + -) # Output to stdout exec 4>&1 ;; * ) exec 4>$outfile;; diff --git a/man/autoconf.1 b/man/autoconf.1 index 7e41c20a..1b60f03f 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH AUTOCONF "1" "December 2000" "GNU autoconf 2.49c" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH AUTOCONF "1" "January 2001" "GNU autoconf 2.49c" FSF .SH NAME autoconf \- Generate configuration scripts .SH SYNOPSIS diff --git a/man/autoupdate.1 b/man/autoupdate.1 index ba6a4cbb..0219b09e 100644 --- a/man/autoupdate.1 +++ b/man/autoupdate.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH AUTOUPDATE "1" "December 2000" "GNU autoconf 2.49c" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH AUTOUPDATE "1" "January 2001" "GNU autoconf 2.49c" FSF .SH NAME autoupdate \- Update a configure.in to a newer Autoconf .SH SYNOPSIS