diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-24 17:38:12 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:38 +1000 |
| commit | 24511472a344749f67fd90ca5c7e76d6c290f93a (patch) | |
| tree | 4a263de48e9dff990cc2182ef3a913853363bc18 /source4 | |
| parent | 07eeed33f63754b4fa4ab629e52e423b04b59bb6 (diff) | |
| download | samba-24511472a344749f67fd90ca5c7e76d6c290f93a.tar.gz samba-24511472a344749f67fd90ca5c7e76d6c290f93a.tar.bz2 samba-24511472a344749f67fd90ca5c7e76d6c290f93a.zip | |
build: DEFUN->DEFINE, and fixed CFLAGS handling
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/wscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/wscript b/source4/wscript index 16f49ad040..211f30b157 100644 --- a/source4/wscript +++ b/source4/wscript @@ -9,14 +9,15 @@ def set_options(opt): opt.recurse(LIBLDB_DIR) def configure(conf): - conf.DEFUN('_SAMBA_BUILD_', 4) + conf.DEFINE('_SAMBA_BUILD_', 4) conf.sub_config(LIBREPLACE_DIR) conf.sub_config(LIBLDB_DIR) + conf.sub_config('heimdal_build') - conf.DEFUN('CONFIG_H_IS_FROM_SAMBA', 1) + conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1) 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('include/config.h') |