From: Tom Tromey Date: Fri, 16 Feb 1996 18:52:49 +0000 (+0000) Subject: Bug fix X-Git-Tag: Release-0-30~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8869e041be024068b1e09f2ea6d02474ced3f4d8;p=thirdparty%2Fautomake.git Bug fix --- diff --git a/ChangeLog b/ChangeLog index 2bfa9c7cd..3747b865c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 16 08:27:04 1996 Tom Tromey + + * 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 * automake.in: (seen_prog_yacc): New variable. diff --git a/automake.in b/automake.in index 135df5718..eacecb1e7 100755 --- 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))