s3: remove dependency on automake for "make everything"

the dependency was introduced by 737a1c9b96a4ba8d8688f4dba1df6d931e10e64d

We now call auto* in examples/VFS from within the main autogen.sh.

This fixes bug #8978.

Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Tue Jun  5 17:32:22 CEST 2012 on sn-devel-104
(cherry picked from commit 5cc86fd560568202bef069eb89f5906f20050085)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2c28e2bc4545354e6e3297201a1634fbae5a5e13..1a7ad8a30691a6f1739da23415de0c04574db781 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3557,7 +3557,6 @@ bin/ndrdump4: $(BINARY_PREREQS)
 vfs_examples:
        ( \
        cd ../examples/VFS && \
-       ./autogen.sh && \
        ./configure && \
        make clean && \
        make \

diff --git a/source3/autogen.sh b/source3/autogen.sh
index d9f603090029b6e71cb6d297c428ed7230084112..52b5fa62f775eb2a5499681954dd00eb92286551 100755 (executable)
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -75,6 +75,15 @@ $AUTOCONF $IPATHS || exit 1
 
 rm -rf autom4te*.cache
 
+( cd ../examples/VFS || exit 1
+  echo "$0: running $AUTOHEADER in ../examples/VFS/"
+  $AUTOHEADER || exit 1
+  echo "$0: running $AUTOCONF in ../examples/VFS/"
+  $AUTOCONF || exit 1
+  rm -rf autom4te*.cache
+) || exit 1
+
+
 if gcc -E tests/preproc-dummy.c -o /dev/null ;
 then
     PIDL_OUTPUTDIR="librpc/gen_ndr" CPP="gcc -E" PIDL=../pidl/pidl \