* acgeneral.m4 (_AC_OUTPUT_FILES): Ensure that config.status

exits if any input file is missing.
* tests/semantics.m4 (missing templates): Test it.

diff --git a/ChangeLog b/ChangeLog
index 233be6d2604b79205b9207f1270e185c2abeab21..9dad8ea452667bc3f62b2988a5a60a7da2bebf5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-21  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (_AC_OUTPUT_FILES): Ensure that config.status
+       exits if any input file is missing.
+       * tests/semantics.m4 (missing templates): Test it.
+
 2000-09-21  Pavel Roskin  <proski@gnu.org>
 
        * acgeneral.m4 (_AC_SHELL_TMPDIR): Don't check status of variable

diff --git a/acgeneral.m4 b/acgeneral.m4
index d2538dda20c477e127fa8fd13e6c840109e0b905..9ae6f5395a95ea67e2ddcb519e978a5623e995dc 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -4776,7 +4776,7 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
            AC_MSG_ERROR([cannot find input file \\`$f'])
          fi;;
       esac
-    done`
+    done` || exit 1
 EOF
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index d2538dda20c477e127fa8fd13e6c840109e0b905..9ae6f5395a95ea67e2ddcb519e978a5623e995dc 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -4776,7 +4776,7 @@ AC_PROVIDE_IFELSE([AC_PROG_INSTALL],
            AC_MSG_ERROR([cannot find input file \\`$f'])
          fi;;
       esac
-    done`
+    done` || exit 1
 EOF
 cat >>$CONFIG_STATUS <<EOF
 dnl Neutralize VPATH when `$srcdir' = `.'.

diff --git a/tests/semantics.m4 b/tests/semantics.m4
index e955a679f802d5fd945ed4bed2b0056a39fcfe72..891f3c50c7fa05ad402e0f1c97a704db546bb857 100644 (file)
--- a/tests/semantics.m4
+++ b/tests/semantics.m4
@@ -416,3 +416,26 @@ AT_CHECK([ls header file command link 2>/dev/null], [], [link
 ])
 
 AT_CLEANUP(header file link command header.in file.in link.in command.in configure config.status)
+
+
+
+## ------------------------------------------------------ ##
+## Check that config.status detects missing input files.  ##
+## ------------------------------------------------------ ##
+
+AT_SETUP(missing templates)
+
+AT_DATA(configure.in,
+[[AC_INIT
+AC_CONFIG_FILES([nonexistent])
+AC_OUTPUT
+]])
+
+AT_CHECK([../autoconf --autoconf-dir .. -l $at_srcdir], 0, [], [])
+AT_CHECK([./configure], 1, ignore,
+[[configure: error: cannot find input file `nonexistent.in'
+]])
+# Make sure that the output file doesn't exist
+AT_CHECK([test -f nonexistent], 1)
+
+AT_CLEANUP(configure config.status config.log config.cache config.h defs)