From: Akim Demaille <akim@epita.fr>
Date: Mon, 27 Mar 2000 11:44:22 +0000 (+0000)
Subject: * acgeneral.m4 (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Fix the DOS
X-Git-Tag: autoconf-2.50~994
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb84983e286f9fcc19166c49da2d5f9679a119b4;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Fix the DOS
absolute path pattern: s/?:[[/\]]/?:[[/\]]*/.
---

diff --git a/ChangeLog b/ChangeLog
index 71077fb44..accebcc34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-27  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
+
+	* acgeneral.m4 (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Fix the DOS
+	absolute path pattern: s/?:[[/\\]]/?:[[/\\]]*/.
+
 2000-03-25  Akim Demaille  <akim@epita.fr>
 
 	* acgeneral.m4 (_AC_CANONICAL_TARGET, _AC_CANONICAL_BUILD): Rename
diff --git a/THANKS b/THANKS
index c1cb4594a..76c36fdd1 100644
--- a/THANKS
+++ b/THANKS
@@ -91,6 +91,7 @@ Pavel Roskin		pavel_roskin@geocities.com
 Philipp Thomas		kthomas@gwdg.de
 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 Stallman	rms@gnu.org
 Robert S. Maier		rsm@math.arizona.edu
diff --git a/acgeneral.m4 b/acgeneral.m4
index 5b61120ae..4aeb24898 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1288,7 +1288,7 @@ if test "$ac_init_help" = "recursive"; then
     case "$srcdir" in
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
-    [[/\\]]* | ?:[[/\\]] ) # Absolute path.
+    [[/\\]]* | ?:[[/\\]]* ) # Absolute path.
       ac_sub_srcdir=$srcdir/$ac_subdir ;;
     *) # Relative path.
       ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
@@ -4616,7 +4616,7 @@ dnl to be created too).
     case "$srcdir" in
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
-    [[/\\]]* | ?:[[/\\]] ) # Absolute path.
+    [[/\\]]* | ?:[[/\\]]* ) # Absolute path.
       ac_sub_srcdir=$srcdir/$ac_subdir ;;
     *) # Relative path.
       ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
diff --git a/configure b/configure
index 770c23650..ae21ee489 100755
--- a/configure
+++ b/configure
@@ -54,9 +54,10 @@ ac_includes_default="\
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
+ac_unique_file="acgeneral.m4"
 
 # Initialize some variables set by options.
-ac_init_help=false
+ac_init_help=
 ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
@@ -166,7 +167,12 @@ do
     with_gas=yes ;;
 
   -help | --help | --hel | --he | -h)
-    ac_init_help=: ;;
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
   -host | --host | --hos | --ho)
     ac_prev=host ;;
   -host=* | --host=* | --hos=* | --ho=*)
@@ -395,13 +401,13 @@ if test -z "$srcdir"; then
   ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
-  if test ! -r $srcdir/acgeneral.m4; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/acgeneral.m4; then
+if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "configure: error: cannot find sources in $ac_confdir or .." 1>&2; exit 1; }
   else
@@ -413,7 +419,7 @@ srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
 #
 # Report the --help message.
 #
-if $ac_init_help; then
+if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<\EOF
@@ -466,7 +472,6 @@ Host type:
   --host=HOST        configure for HOST [guessed]
   --target=TARGET    configure for TARGET [TARGET=HOST]
 EOF
-
   cat <<\EOF
 
 Program names:
@@ -474,8 +479,47 @@ Program names:
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
 EOF
-  exit 0
 fi
+
+if test -n "$ac_init_help"; then
+
+  cat <<\EOF
+EOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $subdirs; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed -e 's%^\./%%;s%[^/]$%&/%;s%[^/]*/%../%g'`
+
+    case "$srcdir" in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [/\\]* | ?:[/\\]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "configure: warning: no configuration information is in $ac_subdir" 1>&2
+    fi
+    cd $ac_popdir
+  done
+fi
+
+test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\EOF
 configure (Autoconf 2.14a) 2.14a
@@ -628,7 +672,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6
-echo "configure:556: checking for a BSD compatible install" 1>&5
+echo "configure:594: checking for a BSD compatible install" 1>&5
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
@@ -685,7 +729,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6
-echo "configure:608: checking whether build environment is sane" 1>&5
+echo "configure:646: checking whether build environment is sane" 1>&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -742,7 +786,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6
-echo "configure:661: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
+echo "configure:699: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
@@ -785,7 +829,7 @@ EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ECHO_N "checking for working aclocal... $ECHO_C" 1>&6
-echo "configure:699: checking for working aclocal" 1>&5
+echo "configure:737: checking for working aclocal" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -798,7 +842,7 @@ else
 fi
 
 echo $ECHO_N "checking for working autoconf... $ECHO_C" 1>&6
-echo "configure:711: checking for working autoconf" 1>&5
+echo "configure:749: checking for working autoconf" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -811,7 +855,7 @@ else
 fi
 
 echo $ECHO_N "checking for working automake... $ECHO_C" 1>&6
-echo "configure:723: checking for working automake" 1>&5
+echo "configure:761: checking for working automake" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -824,7 +868,7 @@ else
 fi
 
 echo $ECHO_N "checking for working autoheader... $ECHO_C" 1>&6
-echo "configure:735: checking for working autoheader" 1>&5
+echo "configure:773: checking for working autoheader" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -837,7 +881,7 @@ else
 fi
 
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" 1>&6
-echo "configure:747: checking for working makeinfo" 1>&5
+echo "configure:785: checking for working makeinfo" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -856,7 +900,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:764: checking for $ac_word" 1>&5
+echo "configure:802: checking for $ac_word" 1>&5
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -890,7 +934,7 @@ done
 test -n "$M4" || M4="m4"
 
 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" 1>&6
-echo "configure:796: checking whether m4 supports frozen files" 1>&5
+echo "configure:834: checking whether m4 supports frozen files" 1>&5
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -911,7 +955,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:816: checking for $ac_word" 1>&5
+echo "configure:854: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -944,7 +988,7 @@ test -n "$AWK" && break
 done
 
 echo $ECHO_N "checking for working help2man... $ECHO_C" 1>&6
-echo "configure:847: checking for working help2man" 1>&5
+echo "configure:885: checking for working help2man" 1>&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -959,7 +1003,7 @@ fi
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:861: checking for $ac_word" 1>&5
+echo "configure:899: checking for $ac_word" 1>&5
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
 else
@@ -1007,7 +1051,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6
-echo "configure:907: checking for a BSD compatible install" 1>&5
+echo "configure:945: checking for a BSD compatible install" 1>&5
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" 1>&6
@@ -1376,7 +1420,7 @@ fi # test -n "$CONFIG_FILES"
 
 EOF
 cat >>$CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
   *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'`
@@ -1450,7 +1494,7 @@ s%@INSTALL@%$INSTALL%;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$ac_cs_root.out
   mv $ac_cs_root.out $ac_file
 
-fi; done
+done
 rm -f $ac_cs_root.s*
 EOF
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 5b61120ae..4aeb24898 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1288,7 +1288,7 @@ if test "$ac_init_help" = "recursive"; then
     case "$srcdir" in
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
-    [[/\\]]* | ?:[[/\\]] ) # Absolute path.
+    [[/\\]]* | ?:[[/\\]]* ) # Absolute path.
       ac_sub_srcdir=$srcdir/$ac_subdir ;;
     *) # Relative path.
       ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
@@ -4616,7 +4616,7 @@ dnl to be created too).
     case "$srcdir" in
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
-    [[/\\]]* | ?:[[/\\]] ) # Absolute path.
+    [[/\\]]* | ?:[[/\\]]* ) # Absolute path.
       ac_sub_srcdir=$srcdir/$ac_subdir ;;
     *) # Relative path.
       ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ff6494e27..c116f1e27 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -109,8 +109,7 @@ CLEANFILES = debug-*.sh macro configure configure.in config.status config.cache
 DISTCLEANFILES = atconfig testsuite
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  atconfig
-DIST_COMMON =  Makefile.am Makefile.in atconfig.in configure \
-configure.in
+DIST_COMMON =  Makefile.am Makefile.in atconfig.in
 
 
 PACKAGE = @PACKAGE@