* acspecific.m4 (AC_INT_16_BITS, AC_LONG_64_BITS): s/ac_check/ac_cv/.

diff --git a/ChangeLog b/ChangeLog
index 1ee8bc93c6b9d6e9b53f054385730276c7c6bb38..ee944a30ce7121c7da6fac6666caf04275f88d92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-11  Akim Demaille  <akim@epita.fr>
+
+       * acspecific.m4 (AC_INT_16_BITS, AC_LONG_64_BITS): s/ac_check/ac_cv/.
+
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS): Look for
+       the input files first in $builddir, then $srcdir.
+       Suggested by Lars J. Aas, designed by Alexandre Oliva.
+
 2000-07-10  Lars J. Aas  <larsa@sim.no>
 
        * acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS):

diff --git a/acgeneral.m4 b/acgeneral.m4
index 973c4afcf608de812a33990aef61b9a90d006994..bf05b0fa6479cee58beada86a2ea268e5cb284b7 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -4631,18 +4631,25 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 
   # Don't redirect the output to AC_FILE directly: use `mv' so that
   # updating is atomic, and doesn't need trapping.
+
+  # 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 ;;
-                    *) echo $ac_given_srcdir/$f ;;
-                    esac
-                  done`
-  for ac_file_input in $ac_file_inputs;
-  do
-    test -f "$ac_file_input" ||
-        AC_MSG_ERROR(cannot find input file `$ac_file_input')
-  done
+     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`
 EOF
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.
@@ -4767,18 +4774,24 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
 
   test x"$ac_file" != x- && echo creating $ac_file
 
+  # 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 ;;
-                    *) echo $ac_given_srcdir/$f ;;
-                    esac
-                  done`
-  for ac_file_input in $ac_file_inputs;
-  do
-    test -f "$ac_file_input" ||
-        AC_MSG_ERROR(cannot find input file `$ac_file_input')
-  done
+     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`
   # Remove the trailing spaces.
   sed 's/[[    ]]*$//' $ac_file_inputs >$tmp/in
 

diff --git a/acspecific.m4 b/acspecific.m4
index c3a31148875d9a217d478558ef150d07c3fc943e..a8f1db46d01af205750d62081c332af98391a5ce 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -691,7 +691,7 @@ AC_WARNING([$0:
         your code should no longer depend upon `INT_16_BITS', but upon
         `SIZEOF_INT'.  Remove this AC_WARNING and the `AC_DEFINE' when you
         adjust the code.])dnl
-test $ac_check_sizeof_int = 2 &&
+test $ac_cv_sizeof_int = 2 &&
   AC_DEFINE(INT_16_BITS, 1,
             [Define if `sizeof (int)' = 2.  Obsolete, use `SIZEOF_INT'.])
 ])
@@ -705,7 +705,7 @@ AC_WARNING([$0:
         your code should no longer depend upon `LONG_64_BITS', but upon
         `SIZEOF_LONG_INT'.  Remove this AC_WARNING and the `AC_DEFINE' when
         you adjust the code.])dnl
-test $ac_check_sizeof_long_int = 8 &&
+test $ac_cv_sizeof_long_int = 8 &&
   AC_DEFINE(LONG_64_BITS, 1,
             [Define if `sizeof (long int)' = 8.  Obsolete, use
              `SIZEOF_LONG_INT'.])

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 973c4afcf608de812a33990aef61b9a90d006994..bf05b0fa6479cee58beada86a2ea268e5cb284b7 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -4631,18 +4631,25 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
 
   # Don't redirect the output to AC_FILE directly: use `mv' so that
   # updating is atomic, and doesn't need trapping.
+
+  # 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 ;;
-                    *) echo $ac_given_srcdir/$f ;;
-                    esac
-                  done`
-  for ac_file_input in $ac_file_inputs;
-  do
-    test -f "$ac_file_input" ||
-        AC_MSG_ERROR(cannot find input file `$ac_file_input')
-  done
+     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`
 EOF
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.
@@ -4767,18 +4774,24 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
 
   test x"$ac_file" != x- && echo creating $ac_file
 
+  # 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 ;;
-                    *) echo $ac_given_srcdir/$f ;;
-                    esac
-                  done`
-  for ac_file_input in $ac_file_inputs;
-  do
-    test -f "$ac_file_input" ||
-        AC_MSG_ERROR(cannot find input file `$ac_file_input')
-  done
+     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`
   # Remove the trailing spaces.
   sed 's/[[    ]]*$//' $ac_file_inputs >$tmp/in
 

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index c3a31148875d9a217d478558ef150d07c3fc943e..a8f1db46d01af205750d62081c332af98391a5ce 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -691,7 +691,7 @@ AC_WARNING([$0:
         your code should no longer depend upon `INT_16_BITS', but upon
         `SIZEOF_INT'.  Remove this AC_WARNING and the `AC_DEFINE' when you
         adjust the code.])dnl
-test $ac_check_sizeof_int = 2 &&
+test $ac_cv_sizeof_int = 2 &&
   AC_DEFINE(INT_16_BITS, 1,
             [Define if `sizeof (int)' = 2.  Obsolete, use `SIZEOF_INT'.])
 ])
@@ -705,7 +705,7 @@ AC_WARNING([$0:
         your code should no longer depend upon `LONG_64_BITS', but upon
         `SIZEOF_LONG_INT'.  Remove this AC_WARNING and the `AC_DEFINE' when
         you adjust the code.])dnl
-test $ac_check_sizeof_long_int = 8 &&
+test $ac_cv_sizeof_long_int = 8 &&
   AC_DEFINE(LONG_64_BITS, 1,
             [Define if `sizeof (long int)' = 8.  Obsolete, use
              `SIZEOF_LONG_INT'.])