FYI: coreutils/lib once again has automatically-generated dependencies

[Jim Meyering]

Since switching coreutils to use gnulib-tool, the lib directory
has had no automatically-generated dependencies.
I finally noticed it today when modifying a lib/*.h header file
and finding that things weren't recompiled.

IMHO, gnulib-tool should leave the default (generate them),
but provide an option to suppress them.  At the very least,
it should provide an option to reenable dependencies if its
default remains as it is.

The following change fixes things via coreutils' bootstrap script:

2006-09-28  Jim Meyering  <address@hidden>

        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.

Index: bootstrap
===================================================================
RCS file: /fetish/cu/bootstrap,v
retrieving revision 1.17
diff -u -r1.17 bootstrap
--- bootstrap   23 Sep 2006 16:51:53 -0000      1.17
+++ bootstrap   28 Sep 2006 08:39:23 -0000
@@ -326,10 +326,13 @@
       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 |