build: s4 wants config.h in include/
authorAndrew Tridgell <tridge@samba.org>
Mon, 22 Feb 2010 21:09:46 +0000 (08:09 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 6 Apr 2010 10:26:35 +0000 (20:26 +1000)
lib/replace/wafsamba.py
source4/wscript

index ffa013de22860d328a041996357f163bb7daa319..e1fae6211974589c709a0709e25137744b83c880 100644 (file)
@@ -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)
 
 
 ##############################################################
index ecbcdc21591df8c4a38dd93d5b7e2d6b13aec31c..16f49ad040d91e8d1c7adebe03ae746491218673 100644 (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../../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')