From d8086bc22032b86cde2a9fea39dfe2c81e21cd6b Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Mon, 2 Oct 2006 11:47:35 +0000
Subject: [PATCH] * bootstrap: Undo last change to this file, since now
 gnulib-tool sticks with the automake default in generating dependencies.

---
 ChangeLog | 5 +++++
 bootstrap | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7104ccbed..f82bf80ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Jim Meyering  <jim@meyering.net>
+
+	* bootstrap: Undo last change to this file, since now gnulib-tool
+	sticks with the automake default in generating dependencies.
+
 2006-09-30  Jim Meyering  <jim@meyering.net>
 
 	Version 6.3.
diff --git a/bootstrap b/bootstrap
index a9124017a..93cfd623c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -326,13 +326,10 @@ slurp() {
       if test $file = Makefile.am; then
         copied=$copied${sep}gnulib.mk; sep=$nl
 	remove_intl='/^[^#].*\/intl/s/^/#/'
-	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 || {
+        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
 	  echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
 	  rm -f $dir/gnulib.mk &&
-	  sed "$sed_xform" $1/$dir/$file >$dir/gnulib.mk
+	  sed "$remove_intl" $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 |