summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildtools/wafsamba/samba3.py6
-rw-r--r--lib/iniparser/src/wscript21
-rw-r--r--lib/iniparser/src/wscript_build7
-rw-r--r--nsswitch/wscript_build2
-rwxr-xr-xsource3/wscript_build2
-rwxr-xr-xwscript1
-rwxr-xr-xwscript_build2
7 files changed, 31 insertions, 10 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 7f05ffe40d3..b6a9f1bd3fe 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -92,6 +92,12 @@ def s3_fix_kwargs(bld, kwargs):
else:
extra_includes += [ '../lib/popt' ]
+ if bld.CONFIG_SET('USING_SYSTEM_INIPARSER'):
+ (iniparser_includes, iniparser_ldflags, iniparser_cpppath) = library_flags(bld, 'iniparser')
+ extra_includes += iniparser_cpppath
+ else:
+ extra_includes += [ '../lib/iniparser' ]
+
# s3 builds assume that they will have a bunch of extra include paths
includes = []
for d in extra_includes:
diff --git a/lib/iniparser/src/wscript b/lib/iniparser/src/wscript
new file mode 100644
index 00000000000..c66f2980486
--- /dev/null
+++ b/lib/iniparser/src/wscript
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import Options
+
+def configure(conf):
+ conf.CHECK_HEADERS('float.h')
+
+ if conf.CHECK_BUNDLED_SYSTEM('iniparser', checkfunctions='iniparser_load', headers='iniparser.h'):
+ conf.define('USING_SYSTEM_INIPARSER', 1)
+
+def build(bld):
+ if bld.CONFIG_SET('USING_SYSTEM_INIPARSER'):
+ return
+
+ bld.SAMBA_LIBRARY('iniparser',
+ source='''../../iniparser_build/iniparser.c
+ ../../iniparser_build/dictionary.c
+ ../../iniparser_build/strlib.c''',
+ cflags='',
+ deps='replace',
+ private_library=True)
diff --git a/lib/iniparser/src/wscript_build b/lib/iniparser/src/wscript_build
deleted file mode 100644
index aa15c9f66e5..00000000000
--- a/lib/iniparser/src/wscript_build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('LIBINIPARSER',
- source='../../iniparser_build/iniparser.c ../../iniparser_build/dictionary.c ../../iniparser_build/strlib.c',
- deps='replace',
- cflags=''
- )
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index f740fdf25f0..0802687eebc 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -24,7 +24,7 @@ bld.SAMBA_LIBRARY('nss_winbind',
if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
bld.SAMBA_LIBRARY('pamwinbind',
source='pam_winbind.c',
- deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
+ deps='intl talloc wbclient winbind-client iniparser pam',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_winbind.so',
install_path='${PAMMODULESDIR}'
diff --git a/source3/wscript_build b/source3/wscript_build
index 5e85b790cb4..ad19c3390f8 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1527,7 +1527,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
deps='''
talloc
krb5samba
- LIBINIPARSER
+ iniparser
libsmb
popt_samba3
LIBNTLMSSP gse gensec''',
diff --git a/wscript b/wscript
index 337643621c9..15ac7f57c7c 100755
--- a/wscript
+++ b/wscript
@@ -105,6 +105,7 @@ def configure(conf):
conf.RECURSE('lib/socket_wrapper')
conf.RECURSE('lib/uid_wrapper')
conf.RECURSE('lib/popt')
+ conf.RECURSE('lib/iniparser/src')
conf.RECURSE('lib/subunit/c')
conf.RECURSE('libcli/smbreadline')
conf.RECURSE('lib/crypto')
diff --git a/wscript_build b/wscript_build
index ea242d5c812..e35ddaeb9cc 100755
--- a/wscript_build
+++ b/wscript_build
@@ -48,7 +48,6 @@ bld.RECURSE('source4/libnet')
bld.RECURSE('source4/auth')
bld.RECURSE('auth')
bld.RECURSE('auth/kerberos')
-bld.RECURSE('lib/iniparser/src')
bld.RECURSE('nsswitch')
bld.RECURSE('nsswitch/libwbclient')
bld.RECURSE('source4/lib/samba3')
@@ -63,6 +62,7 @@ bld.RECURSE('lib/socket_wrapper')
bld.RECURSE('lib/nss_wrapper')
bld.RECURSE('lib/uid_wrapper')
bld.RECURSE('lib/popt')
+bld.RECURSE('lib/iniparser/src')
bld.RECURSE('source4/lib/stream')
bld.RECURSE('lib/util')
bld.RECURSE('lib/tdb_wrap')