[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon May 9 04:26:01 MDT 2011
The branch, master has been updated
via 14f9916 build: Remove --disable-s3build so we can rely on these subsystems
via 7e8f086 s3-build: Move generated config.h and config.h.in to include/autoconf
from 8aab926 tevent: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 14f99167f600ae9a3351d4ff7d089e54ca3149ac
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 9 11:00:18 2011 +0200
build: Remove --disable-s3build so we can rely on these subsystems
This will make it easier to write code that uses the whole codebase.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Mon May 9 12:25:33 CEST 2011 on sn-devel-104
commit 7e8f086798c36f64581ed7444df535e85fa0b5af
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 9 10:59:15 2011 +0200
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
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 ++--
selftest/wscript | 4 +---
source3/Makefile-smbtorture4 | 2 +-
source3/Makefile.in | 10 +++++-----
source3/configure.in | 4 ++--
source3/include/autoconf/README | 5 +++++
source3/script/mkbuildoptions.awk | 2 +-
source4/librpc/wscript_build | 7 +------
wscript | 11 +----------
wscript_build | 3 +--
10 files changed, 20 insertions(+), 32 deletions(-)
create mode 100644 source3/include/autoconf/README
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index a8eacd5..383bb1e 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/selftest/wscript b/selftest/wscript
index ce1be81..ab9f269 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -187,10 +187,8 @@ def cmd_testonly(opt):
if Options.options.TARGET:
env.SELFTEST_TARGET = Options.options.TARGET
- elif env.enable_s3build:
- env.SELFTEST_TARGET = "samba"
else:
- env.SELFTEST_TARGET = "samba4"
+ env.SELFTEST_TARGET = "samba"
if env.SELFTEST_TARGET == "samba4":
env.SELFTEST_DIR = "${srcdir}/source4/selftest"
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 355c146..0dc4706 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 456d4f5..55a3201 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 11dbc28..82cd664 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.54)
AC_INIT([Samba],[3],[samba-technical at 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 0000000..21afbc7
--- /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 3cd0dac..0b1b2ef 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");
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index ce015cc..e945607 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -92,11 +92,6 @@ bld.SAMBA_LIBRARY('dcerpc-samba4',
bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c')
-if bld.env.enable_s3build:
- s3_ndr = "NDR_WBINT"
-else:
- s3_ndr = ""
-
bld.SAMBA_SUBSYSTEM('ndr-table',
source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c',
public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS
@@ -109,7 +104,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
- NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG ''' + s3_ndr,
+ NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''',
depends_on='GEN_NDR_TABLES'
)
diff --git a/wscript b/wscript
index 04c4e91..92c2594 100755
--- a/wscript
+++ b/wscript
@@ -47,10 +47,6 @@ def set_options(opt):
help='enable special build farm options',
action='store_true', dest='BUILD_FARM')
- gr.add_option('--disable-s3build',
- help='disable build of s3 binaries',
- action='store_true', dest='S3BUILD')
-
opt.tool_options('python') # options for disabling pyc or pyo compilation
# enable options related to building python extensions
@@ -67,10 +63,6 @@ def configure(conf):
if Options.options.developer:
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
- conf.env.enable_s3build = True
- if Options.options.S3BUILD:
- conf.env.enable_s3build = False
-
# this enables smbtorture.static for s3 in the build farm
conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM')
@@ -115,8 +107,7 @@ def configure(conf):
conf.RECURSE('libcli/smbreadline')
conf.RECURSE('pidl')
conf.RECURSE('selftest')
- if conf.env.enable_s3build:
- conf.RECURSE('source3')
+ conf.RECURSE('source3')
# we don't want any libraries or modules to rely on runtime
# resolution of symbols
diff --git a/wscript_build b/wscript_build
index 5cbbc30..43e69a5 100644
--- a/wscript_build
+++ b/wscript_build
@@ -120,8 +120,7 @@ bld.RECURSE('source4/scripting')
bld.RECURSE('pidl')
bld.RECURSE('lib')
bld.RECURSE('libds/common')
-if bld.env.enable_s3build:
- bld.RECURSE('source3')
+bld.RECURSE('source3')
bld.RECURSE('testsuite/headers')
--
Samba Shared Repository
More information about the samba-cvs
mailing list