From: Björn Jacke Date: Tue, 5 Jun 2012 13:37:00 +0000 (+0200) Subject: s3: remove dependency on automake for "make everything" X-Git-Url: http://git.samba.org/?p=ddiss%2Fsamba.git;a=commitdiff_plain;h=2041ef3df94842822102d371029cbb14a7f2c024 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 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 2c28e2bc454..1a7ad8a3069 100644 --- 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 d9f60309002..52b5fa62f77 100755 --- 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 \