[PATCH] aclocal: Make missing 'dir' in -Idir a warning instead of a fatal error.

[Ben Pfaff]

The process for bootstrapping some software from a version control system
checkout involves running aclocal before the m4 directory exists, then
populating the m4 directory and running aclocal again.  This is what
happens with, for example, the "tracker" program that can be checked out
via git://git.gnome.org/tracker: removing the "m4" directory from this
checkout (which was added as a dummy just to suppress this problem) and
running "autoreconf -vfi" will fail with a fatal error from aclocal:

    autoreconf2.50: Entering directory `.'
    autoreconf2.50: configure.ac: not using Gettext
    autoreconf2.50: running: aclocal --force -I m4
    aclocal: couldn't open directory `m4': No such file or directory
    autoreconf2.50: aclocal failed with exit status: 1

With this commit, the autoreconf step can be completed.

This problem was reported by Michael Biebl <address@hidden> as a bug
against the Debian packaging of Autoconf.  The Debian bug log is available
at <http://bugs.debian.org/565663>.
---
 ChangeLog  |    6 ++++++
 aclocal.in |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 aclocal.in

diff --git a/ChangeLog b/ChangeLog
index 5fbc889..d0d8ccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-27  Ben Pfaff  <address@hidden>
+
+       Make -Idir a warning instead of a fatal error if 'dir' does not
+       exist.
+       * aclocal.in (scan_m4_dirs): Demote fatal error to warning.
+
 2010-02-24  Antonio Diaz Diaz  <address@hidden>  (tiny change)
            Ralf Wildenhues  <address@hidden>
 
diff --git a/aclocal.in b/aclocal.in
old mode 100644
new mode 100755
index dc84762..6d6156e
--- a/aclocal.in
+++ b/aclocal.in
@@ -311,7 +311,8 @@ sub scan_m4_dirs ($@)
     {
       if (! opendir (DIR, $m4dir))
        {
-         fatal "couldn't open directory `$m4dir': $!";
+         msg ('unsupported', "couldn't open directory `$m4dir': $!");
+         next;
        }
 
       # We reverse the directory contents so that foo2.m4 gets
-- 
1.6.5


-- 
"...In the UNIX world, people tend to interpret `non-technical user'
 as meaning someone who's only ever written one device driver."
--Daniel Pead