Automatically generated dependencies are important even

when all of the sources in a directory come from gnulib.
* bootstrap (gnulib_tool): Remove the "no-dependencies" automake
option that gnulib-tool adds to what becomes our lib/gnulib.mk.

diff --git a/ChangeLog b/ChangeLog
index 524b245..e5a3539 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-28  Jim Meyering  <jim@meyering.net>
 
+       Automatically generated dependencies are important even
+       when all of the sources in a directory come from gnulib.
+       * bootstrap (gnulib_tool): Remove the "no-dependencies" automake
+       option that gnulib-tool adds to what becomes our lib/gnulib.mk.
+
        * tests/rm/fail-eperm: Enable Perl's (-T) taint checking.
        Ensure that IFS is set properly and unset PATH.
        Sanitize inputs.

diff --git a/bootstrap b/bootstrap
index 93cfd62..a912401 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -326,10 +326,13 @@ slurp() {
       if test $file = Makefile.am; then
         copied=$copied${sep}gnulib.mk; sep=$nl
        remove_intl='/^[^#].*\/intl/s/^/#/'
-        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
+       no_dep=no-dependencies
+       remove_no_dep="/^AUTOMAKE_OPTIONS =.* $no_dep/s/ $no_dep//"
+       sed_xform="$remove_intl;$remove_no_dep"
+        sed "$sed_xform" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
          echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
          rm -f $dir/gnulib.mk &&
-         sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk
+         sed "$sed_xform" $1/$dir/$file >$dir/gnulib.mk
        }
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
           grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |