Error if directory in SUBDIRS does not exist

diff --git a/ChangeLog b/ChangeLog
index 63e9736b72ad689e88e6e4cd34bba691355153d9..db73165802ef2c14561be1cd378de192c331c986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Feb  8 15:30:29 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (handle_subdirs): Error if directory in SUBDIRS does
+       not exist.
+
        * automake.in (handle_configure): Handle AC_OUTPUT ":" syntax.
 
        From Jim Meyering:

diff --git a/NEWS b/NEWS
index 578a8876ed9e9878adf3e0b5b8953eb5440ef5c9..32ab8f3a89094dcc78c001d3f15674988033df7a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 New in 0.30:
-* configure.in scanner knows about AC_PATH_XTRA
-* 
+* Bug fixes
+* configure.in scanner knows about AC_PATH_XTRA, AC_OUTPUT ":" syntax
 \f
 New in 0.29:
 * Many bug fixes

diff --git a/TODO b/TODO
index f97b47652645d1c5b8621502e29201b961bbd40b..9ec5be856002ec991a767f957f7f292d4cf846c6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,6 +23,7 @@ these files can't be de-ansified.  Not a problem?
 
 consider automatically adding -I$(srcdir) to INCLUDES.
 ditto path to config.h
+Noah Friedman says that -I. should come before -I$(srcdir)
 
 In general most .am files should be merged into automake.  For
 instance all the "clean" targets could be merged by keeping lists of

diff --git a/automake.in b/automake.in
index d682a887a4ab4251512d309bcd6001aa91626578..568d54752e592c5e6477df9d1ee927098b66bc20 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1057,6 +1057,14 @@ sub handle_subdirs
 
     return if ! defined $contents{'SUBDIRS'};
 
+    # Make sure each directory mentioned in SUBDIRS actually exists.
+    local ($dir);
+    foreach $dir (split (/\s+/, $contents{'SUBDIRS'}))
+    {
+       &am_error ("required directory $relative_dir/$dir does not exist")
+           if ! -d $relative_dir . '/' . $dir;
+    }
+
     $output_rules .= &file_contents ('subdirs');
 
     # Push a bunch of phony targets.