diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-28 18:33:25 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:13 +1000 |
| commit | 20146b3fe03f08c72db313973b75019e13198534 (patch) | |
| tree | 2600bd88981ad2d7a13b97013cef72155583f5b8 | |
| parent | 32ac04c0286edc5e3afe6f5cef18ccbbc79af4fd (diff) | |
| download | samba-20146b3fe03f08c72db313973b75019e13198534.tar.gz samba-20146b3fe03f08c72db313973b75019e13198534.tar.bz2 samba-20146b3fe03f08c72db313973b75019e13198534.zip | |
build: fixed popt subsystem on systems without popt
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 14 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index ff2fa012c4..b98d9645a2 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -387,7 +387,7 @@ def library_flags(conf, libs): @conf -def CHECK_LIB(conf, libs, mandatory=False): +def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True): '''check if a set of libraries exist''' liblist = TO_LIST(libs) @@ -402,8 +402,9 @@ def CHECK_LIB(conf, libs, mandatory=False): if mandatory: print("Mandatory library '%s' not found for functions '%s'" % (lib, list)) sys.exit(1) - # if it isn't a mandatory library, then remove it from dependency lists - SET_TARGET_TYPE(conf, lib, 'EMPTY') + if empty_decl: + # if it isn't a mandatory library, then remove it from dependency lists + SET_TARGET_TYPE(conf, lib, 'EMPTY') ret = False else: conf.define('HAVE_LIB%s' % lib.upper().replace('-','_'), 1) @@ -426,7 +427,8 @@ def CHECK_LIB(conf, libs, mandatory=False): # # optionally check for the functions first in libc @conf -def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False, headers=None, link=None): +def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False, + headers=None, link=None, empty_decl=True): remaining = TO_LIST(list) liblist = TO_LIST(library) @@ -443,11 +445,11 @@ def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False, header if remaining == []: for lib in liblist: - if GET_TARGET_TYPE(conf, lib) != 'SYSLIB': + if GET_TARGET_TYPE(conf, lib) != 'SYSLIB' and empty_decl: SET_TARGET_TYPE(conf, lib, 'EMPTY') return True - conf.CHECK_LIB(liblist) + conf.CHECK_LIB(liblist, empty_decl=empty_decl) for lib in liblist[:]: if not GET_TARGET_TYPE(conf, lib) == 'SYSLIB': if mandatory: diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 6e3753a790..a494907af0 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -59,7 +59,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', conf.env[found] = True return True if checkfunctions is not None: - if conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers): + if conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers, empty_decl=False): conf.env[found] = True return True conf.env[found] = False |