Bug fix

diff --git a/ChangeLog b/ChangeLog
index 2bfa9c7cd6e8fd5df7e1a1b961142aa5a8e19a1c..3747b865c066d56fe27c7e06e00fd5ca4e42a442 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 16 08:27:04 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (handle_configure): config.status is in
+       $(top_builddir), not $(top_srcdir).  Reported by Anthony Green.
+
+       * automake.in (scan_configure): Recognize (AC|fp)_FUNC_FNMATCH.
+
 Thu Feb 15 09:12:45 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in: (seen_prog_yacc): New variable.

diff --git a/automake.in b/automake.in
index 135df5718516abc150495389aea7a03a69f7bf72..eacecb1e7d502d1615f2138206fcdd645f7e8e59 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1281,7 +1281,7 @@ sub handle_configure
        $output_rules .= ($local . ': '
                          . '$(top_builddir)/config.status ' . $input . "\n"
                          . "\t"
-                         . 'cd $(top_srcdir) && CONFIG_FILES='
+                         . 'cd $(top_builddir) && CONFIG_FILES='
                          . ($relative_dir eq '.' ? '' : '$(subdir)/')
                          . '$@ CONFIG_HEADERS= ./config.status'
                          . "\n");
@@ -1589,6 +1589,11 @@ sub scan_configure
        {
            $libsources{'fileblocks.c'} = 1;
        }
+       elsif (/(AC|fp)_FUNC_FNMATCH/)
+       {
+           # AC_FUNC_FNMATCH is just wishful thinking at this point.
+           $libsources{'fnmatch.c'} = 1;
+       }
        elsif (/AC_REPLACE_FUNCS\s*\((.*)\)/)
        {
            foreach (split (/\s+/, $1))