* 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 9546f0aa7ef13d46f727c232447e0c9f9124c6b3..5bf09add8da426e65938a9577462ad2b56921d7c 100644 (file)
--- 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 f603b4b13e9fae448db7d08849b53278fed49390..c6c1afc47ccfb0f5d3669f4a2e1b5156cf52d488 100644 (file)
--- 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 67f10fabe5978b0c74a9cf99136de00f10ebc971..d3de306878a90a3c6a525011042c55b648aecab3 100755 (executable)
--- 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