diff options
| -rw-r--r-- | buildtools/wafsamba/samba3.py | 6 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_third_party.py | 6 | ||||
| -rw-r--r-- | wscript | 6 | ||||
| -rw-r--r-- | wscript_build | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py index fd063ad8c47..64cd8c7453c 100644 --- a/buildtools/wafsamba/samba3.py +++ b/buildtools/wafsamba/samba3.py @@ -94,12 +94,6 @@ 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/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py index 408d5579a7e..36b98cb049a 100644 --- a/buildtools/wafsamba/samba_third_party.py +++ b/buildtools/wafsamba/samba_third_party.py @@ -11,12 +11,6 @@ def CHECK_FOR_THIRD_PARTY(conf): Build.BuildContext.CHECK_FOR_THIRD_PARTY = CHECK_FOR_THIRD_PARTY @conf -def CHECK_INIPARSER(conf): - return conf.CHECK_BUNDLED_SYSTEM('iniparser', checkfunctions='iniparser_load', headers='iniparser.h') - -Build.BuildContext.CHECK_INIPARSER = CHECK_INIPARSER - -@conf def CHECK_ZLIB(conf): version_check=''' #if (ZLIB_VERNUM >= 0x1230) @@ -122,15 +122,9 @@ def configure(conf): conf.RECURSE('dynconfig') if conf.CHECK_FOR_THIRD_PARTY(): - conf.RECURSE('third_party/iniparser/src') conf.RECURSE('third_party/zlib') conf.RECURSE('third_party/popt') else: - if not conf.CHECK_INIPARSER(): - raise Utils.WafError('iniparser development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') - else: - conf.define('USING_SYSTEM_INIPARSER', 1) - if not conf.CHECK_ZLIB(): raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') else: diff --git a/wscript_build b/wscript_build index b0718177c54..5abfa51a2c1 100644 --- a/wscript_build +++ b/wscript_build @@ -72,7 +72,6 @@ bld.RECURSE('lib/socket_wrapper') bld.RECURSE('lib/nss_wrapper') bld.RECURSE('lib/uid_wrapper') if bld.CHECK_FOR_THIRD_PARTY(): - bld.RECURSE('third_party/iniparser/src') bld.RECURSE('third_party/zlib') bld.RECURSE('third_party/popt') bld.RECURSE('source4/lib/stream') |