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:
--- /dev/null
+#!/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)
+++ /dev/null
-#!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('LIBINIPARSER',
- source='../../iniparser_build/iniparser.c ../../iniparser_build/dictionary.c ../../iniparser_build/strlib.c',
- deps='replace',
- cflags=''
- )
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}'
deps='''
talloc
krb5samba
- LIBINIPARSER
+ iniparser
libsmb
popt_samba3
LIBNTLMSSP gse gensec''',
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')
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')
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')