summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-09 10:59:15 +0200
committerAndrew Bartlett <abartlet@samba.org>2011-05-09 11:21:09 +0200
commit7e8f086798c36f64581ed7444df535e85fa0b5af (patch)
tree511f0050a8c0e072e13c2b6c2de7bd641f34ca6c
parent8aab926c2804230b633e0eb29655f4e32226aa4f (diff)
downloadsamba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.gz
samba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.bz2
samba-7e8f086798c36f64581ed7444df535e85fa0b5af.zip
s3-build: Move generated config.h and config.h.in to include/autoconf
This ensures that these are not found by the waf build, which causes issues when the wrong config.h is used by the recursive smbtorture build Andrew Bartlett
-rw-r--r--.gitignore4
-rw-r--r--source3/Makefile-smbtorture42
-rw-r--r--source3/Makefile.in10
-rw-r--r--source3/configure.in4
-rw-r--r--source3/include/autoconf/README5
-rw-r--r--source3/script/mkbuildoptions.awk2
6 files changed, 16 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index a8eacd562f..383bb1e098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,8 +71,8 @@ source3/exports/libtalloc.syms
source3/exports/libtdb.syms
source3/exports/libwbclient.syms
source3/include/build_env.h
-source3/include/config.h
-source3/include/config.h.in
+source3/include/autoconf/config.h
+source3/include/autoconf/config.h.in
source3/include/includes.h.gch
source3/include/stamp-h
source3/include/version.h
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 355c1461c1..0dc4706944 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump"
samba4-configure:
@(cd .. && \
CFLAGS='' $(WAF) reconfigure || \
- CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --disable-s3build --enable-developer)
+ CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-developer)
.PHONY: samba4-configure
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 456d4f5571..55a32016d1 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1766,16 +1766,16 @@ lib/version.o: lib/version.c include/version.h
echo "$(COMPILE_CC_PATH)" 1>&2;\
$(COMPILE_CC_PATH) >/dev/null 2>&1
-smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h
+smbd/build_options.o: smbd/build_options.c Makefile include/autoconf/config.h include/build_env.h include/proto.h
@echo Compiling $*.c
@$(COMPILE_CC_PATH) && exit 0;\
echo "The following command failed:" 1>&2;\
echo "$(COMPILE_CC_PATH)" 1>&2;\
$(COMPILE_CC_PATH) >/dev/null 2>&1
-smbd/build_options.c: include/config.h.in script/mkbuildoptions.awk
+smbd/build_options.c: include/autoconf/config.h.in script/mkbuildoptions.awk
@echo Generating $@
- @dir=smbd $(MAKEDIR) && $(AWK) -f $(srcdir)/script/mkbuildoptions.awk > $(builddir)/smbd/build_options.c < $(srcdir)/include/config.h.in
+ @dir=smbd $(MAKEDIR) && $(AWK) -f $(srcdir)/script/mkbuildoptions.awk > $(builddir)/smbd/build_options.c < $(srcdir)/include/autoconf/config.h.in
bin/.dummy:
@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
@@ -3362,12 +3362,12 @@ realclean:: clean
distclean:: realclean
-rm -f smbadduser
- -rm -f include/config.h Makefile
+ -rm -f include/autoconf/config.h Makefile
-rm -f config.status config.cache so_locations
-rm -rf .deps TAGS
realdistclean:: distclean
- -rm -f include/config.h.in
+ -rm -f include/autoconf/config.h.in
-rm -f include/version.h
-rm -f configure
diff --git a/source3/configure.in b/source3/configure.in
index 11dbc2872e..82cd664165 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.54)
AC_INIT([Samba],[3],[samba-technical@samba.org])
AC_CONFIG_SRCDIR([include/includes.h])
-AC_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADER(include/autoconf/config.h)
AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
case "$PATH" in
@@ -34,7 +34,7 @@ done
AC_SUBST(LIBTEVENT_OBJ0)
LIBS="${LIBS} ${TEVENT_LIBS}"
-SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
+SAMBA_CPPFLAGS="-Iinclude/autoconf -Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
diff --git a/source3/include/autoconf/README b/source3/include/autoconf/README
new file mode 100644
index 0000000000..21afbc70ea
--- /dev/null
+++ b/source3/include/autoconf/README
@@ -0,0 +1,5 @@
+This directory added so that the autoconf build can generate a
+config.h in a location that the recursive waf build for smbtorture
+won't find.
+
+Andrew Bartlett \ No newline at end of file
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index 3cd0dace21..0b1b2ef3ab 100644
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions.awk
@@ -235,7 +235,7 @@ function output(ARRAY, ELEMENTS, TITLE) {
END {
##################################################
# add code to show various options
- print "/* Output various other options (as gleaned from include/config.h.in) */";
+ print "/* Output various other options (as gleaned from include/autoconf/config.h.in) */";
output(sys_ary, sys_i, "System Headers");
output(headers_ary, headers_i, "Headers");
output(utmp_ary, utmp_i, "UTMP Options");