From: Eric Blake <ebb9@byu.net>
Date: Wed, 26 Oct 2005 14:26:35 +0000 (+0000)
Subject: * Makefile.am (vcl-tmp): Avoid warnings from diff.
X-Git-Tag: release-2-1b~447
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a95ceab95ad4421ab9e486fc4c660a9278ca6290;p=thirdparty%2Flibtool.git

* Makefile.am (vcl-tmp): Avoid warnings from diff.
* bootstrap: Avoid warnings from find.
(lt_tab): Use to prevent editor whitespace "cleanup".
---

diff --git a/ChangeLog b/ChangeLog
index 9546f0aa7..5bf09add8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-26  Eric Blake  <ebb9@byu.net>,
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (vcl-tmp): Avoid warnings from diff.
+	* bootstrap: Avoid warnings from find.
+	(lt_tab): Use to prevent editor whitespace "cleanup".
+
 2005-10-26  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtoolize.m4sh: Put back the func_serial_update callback for
diff --git a/Makefile.am b/Makefile.am
index f603b4b13..c6c1afc47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,7 +138,7 @@ $(srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog
 vcl-tmp:
 	@set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
 	echo "$$1" > vcl.tmp; \
-	diff vcl.tmp $(srcdir)/stamp-vcl >/dev/null \
+	diff vcl.tmp $(srcdir)/stamp-vcl >/dev/null 2>/dev/null \
 	  || (echo "Updating stamp-vcl"; cp vcl.tmp $(srcdir)/stamp-vcl)
 	-@rm -f vcl.tmp
 
diff --git a/bootstrap b/bootstrap
index 67f10fabe..d3de30687 100755
--- a/bootstrap
+++ b/bootstrap
@@ -44,13 +44,14 @@ test -f ./configure.ac || {
 
 
 # Extract auxdir and m4dir from configure.ac:
+lt_tab='	'
 my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
-    	/AC_CONFIG_AUX_DIR[^_]/  {
-	    s,^.*AC_CONFIG_AUX_DIR([[ 	]*\([^])]*\).*$,auxdir=\1,; p;
-        };
-    	/AC_CONFIG_MACRO_DIR/   {
-	    s,^.*AC_CONFIG_MACRO_DIR([[ 	]*\([^])]*\).*$,m4dir=\1,; p;
-        };
+	/AC_CONFIG_AUX_DIR[^_]/  {
+	    s,^.*AC_CONFIG_AUX_DIR([[ '"$lt_tab"']*\([^])]*\).*$,auxdir=\1,; p;
+	};
+	/AC_CONFIG_MACRO_DIR/   {
+	    s,^.*AC_CONFIG_MACRO_DIR([[ '"$lt_tab"']*\([^])]*\).*$,m4dir=\1,; p;
+	};
 	d;'
 eval `cat configure.ac 2>/dev/null | $SED "$my_sed_traces"`
 
@@ -65,7 +66,7 @@ WARNING: them with all m4 file as shipped with this distribution (except
 WARNING: `lt~obsolete.m4').  After that, retry this bootstrap.
 EOF
 
-find . \( -name autom4te.cache -o -name libtool \) -depth -print \
+find . -depth \( -name autom4te.cache -o -name libtool \) -print \
   | grep -v '{arch}' \
   | xargs rm -rf