diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-23 08:09:46 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:35 +1000 |
| commit | 13cbd9f919a3cf6ea83cdc80c3e6891d9d276fe4 (patch) | |
| tree | cf0b2a3a48c7887c7aaf137477a6dabc14840c9e | |
| parent | 4ed59b826c9cbf05542faadc1f29544b2613781a (diff) | |
| download | samba-13cbd9f919a3cf6ea83cdc80c3e6891d9d276fe4.tar.gz samba-13cbd9f919a3cf6ea83cdc80c3e6891d9d276fe4.tar.bz2 samba-13cbd9f919a3cf6ea83cdc80c3e6891d9d276fe4.zip | |
build: s4 wants config.h in include/
| -rw-r--r-- | lib/replace/wafsamba.py | 4 | ||||
| -rw-r--r-- | source4/wscript | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/lib/replace/wafsamba.py b/lib/replace/wafsamba.py index ffa013de22..e1fae62119 100644 --- a/lib/replace/wafsamba.py +++ b/lib/replace/wafsamba.py @@ -51,9 +51,9 @@ def CHECK_FUNCS_IN(conf, list, library): ################################################# # write out config.h in the right directory @conf -def SAMBA_CONFIG_H(conf): +def SAMBA_CONFIG_H(conf, path='config.h'): if os.path.normpath(conf.curdir) == os.path.normpath(os.environ.get('PWD')): - conf.write_config_header('config.h', top=True) + conf.write_config_header(path, top=True) ############################################################## diff --git a/source4/wscript b/source4/wscript index ecbcdc2159..16f49ad040 100644 --- a/source4/wscript +++ b/source4/wscript @@ -17,18 +17,6 @@ def configure(conf): conf.ADD_CFLAGS('-I.. -I../lib -I../../lib -I../.. -I../include -Idefault/source4') conf.ADD_CFLAGS('-I../../lib/socket_wrapper -I../../lib/talloc -I../../lib/replace -I../../lib/tevent') - conf.ADD_CFLAGS('-I../heimdal_build -I../heimdal/lib/krb5 -I../heimdal/lib/asn1 -I../heimdal/lib/com_err -I -I../heimdal/lib/hx509 -I../heimdal/lib/roken -I../heimdal/lib/hx509 -I../heimdal/lib/asn1 -I../heimdal/lib/hcrypto -I../heimdal/lib -I../heimdal/lib/hcrypto/imath -I../heimdal/lib/wind') conf.DEFUN('HAVE_KRB5', 1) - conf.SAMBA_CONFIG_H() - -def build(bld): - bld.add_subdirs(LIBREPLACE_DIR) - bld.add_subdirs(LIBLDB_DIR) - bld.add_subdirs('dsdb') - bld.add_subdirs('smbd') - - # some of source wants include/config.h, so - # create a link from the real config.h - bld(target='include/config.h', - rule='ln -sf ../../config.h ${TGT}') + conf.SAMBA_CONFIG_H('include/config.h') |