From 5cc86fd560568202bef069eb89f5906f20050085 Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Tue, 5 Jun 2012 15:37:00 +0200 Subject: s3: remove dependency on automake for "make everything" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- source3/Makefile.in | 1 - source3/autogen.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 093123c2b9..7b2783369c 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3388,7 +3388,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 3f46f5f7ae..15689e07e1 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="autoconf/librpc/gen_ndr" CPP="gcc -E" PIDL=../pidl/pidl \ -- cgit