* acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS): Properly

handle absolute input file names.
From Alexandre Oliva.

diff --git a/ChangeLog b/ChangeLog
index d4c5425282686897e86560f0ade8fc10b3d3c94f..afa00c122bad11107e5acd6fae0fc763f98e6b38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-13  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS): Properly
+       handle absolute input file names.
+       From Alexandre Oliva.
+
 2000-07-12 Martin Wilck <martin@tropos.de>
 
        * aclang.m4 (AC_PROG_F77): Delete AC_BEFORE(AC_PROG_CPP) that

diff --git a/acgeneral.m4 b/acgeneral.m4
index e1bfe11de7bc79592026f5f697ee137c5af704de..f835aecf286974801504fbb951148166dd0e9bf5 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -4635,21 +4635,26 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
-     for f in $ac_file_in; do
-       case $f in
-       -) echo $tmp/stdin ;;
-       *) if test -f "$f"; then
-           # Build tree or absolute
-            echo $f
-          elif test -f "$ac_given_srcdir/$f"; then
-            # Source tree
-            echo $ac_given_srcdir/$f
-          else
-            # /dev/null tree
-            AC_MSG_ERROR([cannot find input file \\`$f'])
-          fi;;
-       esac
-     done`
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [[\\/$]]* | ?:[[\\/]]*)
+         # Absolute
+         test -f "$f" || AC_MSG_ERROR([cannot find input file \\`$f'])
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$ac_given_srcdir/$f"; then
+           # Source tree
+           echo $ac_given_srcdir/$f
+         else
+           # /dev/null tree
+           AC_MSG_ERROR([cannot find input file \\`$f'])
+         fi;;
+      esac
+    done`
 EOF
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.
@@ -4777,21 +4782,26 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
-     for f in $ac_file_in; do
-       case $f in
-       -) echo $tmp/stdin ;;
-       *) if test -f "$f"; then
-            # Build tree or absolute
-            echo $f
-          elif test -f "$ac_given_srcdir/$f"; then
-            # Source tree
-            echo $ac_given_srcdir/$f
-          else
-            # /dev/null tree
-            AC_MSG_ERROR([cannot find input file \\`$f'])
-          fi;;
-       esac
-     done`
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [[\\/$]]* | ?:[[\\/]]*)
+         # Absolute
+         test -f "$f" || AC_MSG_ERROR([cannot find input file \\`$f'])
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$ac_given_srcdir/$f"; then
+           # Source tree
+           echo $ac_given_srcdir/$f
+         else
+           # /dev/null tree
+           AC_MSG_ERROR([cannot find input file \\`$f'])
+         fi;;
+      esac
+    done`
   # Remove the trailing spaces.
   sed 's/[[    ]]*$//' $ac_file_inputs >$tmp/in
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index e1bfe11de7bc79592026f5f697ee137c5af704de..f835aecf286974801504fbb951148166dd0e9bf5 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -4635,21 +4635,26 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
-     for f in $ac_file_in; do
-       case $f in
-       -) echo $tmp/stdin ;;
-       *) if test -f "$f"; then
-           # Build tree or absolute
-            echo $f
-          elif test -f "$ac_given_srcdir/$f"; then
-            # Source tree
-            echo $ac_given_srcdir/$f
-          else
-            # /dev/null tree
-            AC_MSG_ERROR([cannot find input file \\`$f'])
-          fi;;
-       esac
-     done`
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [[\\/$]]* | ?:[[\\/]]*)
+         # Absolute
+         test -f "$f" || AC_MSG_ERROR([cannot find input file \\`$f'])
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$ac_given_srcdir/$f"; then
+           # Source tree
+           echo $ac_given_srcdir/$f
+         else
+           # /dev/null tree
+           AC_MSG_ERROR([cannot find input file \\`$f'])
+         fi;;
+      esac
+    done`
 EOF
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.
@@ -4777,21 +4782,26 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # First look for the input files in the build tree, otherwise in the
   # src tree.
   ac_file_inputs=`IFS=:
-     for f in $ac_file_in; do
-       case $f in
-       -) echo $tmp/stdin ;;
-       *) if test -f "$f"; then
-            # Build tree or absolute
-            echo $f
-          elif test -f "$ac_given_srcdir/$f"; then
-            # Source tree
-            echo $ac_given_srcdir/$f
-          else
-            # /dev/null tree
-            AC_MSG_ERROR([cannot find input file \\`$f'])
-          fi;;
-       esac
-     done`
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [[\\/$]]* | ?:[[\\/]]*)
+         # Absolute
+         test -f "$f" || AC_MSG_ERROR([cannot find input file \\`$f'])
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$ac_given_srcdir/$f"; then
+           # Source tree
+           echo $ac_given_srcdir/$f
+         else
+           # /dev/null tree
+           AC_MSG_ERROR([cannot find input file \\`$f'])
+         fi;;
+      esac
+    done`
   # Remove the trailing spaces.
   sed 's/[[    ]]*$//' $ac_file_inputs >$tmp/in