sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

build: s4 wants config.h in include/

Browse Source
This commit is contained in:
Andrew Tridgell 2010-02-23 08:09:46 +11:00
parent 4ed59b826c
commit 13cbd9f919
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/replace/wafsamba.py
View File

@ -51,9 +51,9 @@ def CHECK_FUNCS_IN(conf, list, library):
################################################# #################################################
# write out config.h in the right directory # write out config.h in the right directory
@conf @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')): 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)
############################################################## ##############################################################

14
source4/wscript
View File

@ -17,18 +17,6 @@ def configure(conf):
conf.ADD_CFLAGS('-I.. -I../lib -I../../lib -I../.. -I../include -Idefault/source4') 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../../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.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.DEFUN('HAVE_KRB5', 1)
conf.SAMBA_CONFIG_H() conf.SAMBA_CONFIG_H('include/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}')