From 81d155af96104ce6b84d0e51f0fd052329551dc3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 20 Mar 2010 16:49:02 +1100 Subject: build: check libc first for several libraries --- lib/replace/wscript | 6 +++--- lib/util/charset/wscript_configure | 2 +- nsswitch/wscript_configure | 2 +- source4/auth/wscript_configure | 2 +- source4/heimdal_build/wscript_configure | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index 30c1f129aa..bfff2cb58c 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -196,11 +196,11 @@ def configure(conf): conf.CHECK_FUNCS('getpwent_r getpwnam_r getpwuid_r epoll_create') - conf.CHECK_FUNCS_IN('dlopen dlsym dlerror dlclose', 'dl') + conf.CHECK_FUNCS_IN('dlopen dlsym dlerror dlclose', 'dl', checklibc=True) conf.CHECK_FUNCS_IN('poptGetContext', 'popt') - conf.CHECK_FUNCS_IN('res_search', 'resolv') + conf.CHECK_FUNCS_IN('res_search', 'resolv', checklibc=True) conf.CHECK_FUNCS_IN('gettext', 'intl') - conf.CHECK_FUNCS_IN('pthread_create', 'pthread') + conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True) conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True) diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index f076bc0680..4dbb46d0fb 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -1,6 +1,6 @@ conf.CHECK_HEADERS('iconv.h') -conf.CHECK_FUNCS_IN('iconv_open', 'iconv') +conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=True) conf.CHECK_CODE(''' iconv_t cd = iconv_open("ASCII","UCS-2LE"); diff --git a/nsswitch/wscript_configure b/nsswitch/wscript_configure index 93ab5b107a..cb559581e7 100644 --- a/nsswitch/wscript_configure +++ b/nsswitch/wscript_configure @@ -1,5 +1,5 @@ conf.CHECK_HEADERS('nss.h nss_common.h ns_api.h') conf.CHECK_HEADERS('security/pam_appl.h') -conf.CHECK_FUNCS_IN('pam_start', 'pam') +conf.CHECK_FUNCS_IN('pam_start', 'pam', checklibc=True) conf.CHECK_HEADERS('security/pam_modules.h pam/pam_modules.h') diff --git a/source4/auth/wscript_configure b/source4/auth/wscript_configure index 7a932697c6..c0ca7676c3 100644 --- a/source4/auth/wscript_configure +++ b/source4/auth/wscript_configure @@ -1,5 +1,5 @@ conf.CHECK_HEADERS('security/pam_appl.h') -conf.CHECK_FUNCS_IN('pam_start', 'pam') +conf.CHECK_FUNCS_IN('pam_start', 'pam', checklibc=True) if (conf.CHECK_HEADERS('sasl/sasl.h') and conf.CHECK_FUNCS_IN('sasl_client_init', 'sasl2')): diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 3991808391..be38fabc7b 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -34,11 +34,11 @@ conf.CHECK_DECLS('h_errno') conf.CHECK_DECLS('_res') conf.CHECK_HEADERS('arpa/nameser.h dns.h') -conf.CHECK_FUNCS_IN('res_search res_nsearch res_ndestroy dns_search dn_expand', 'resolv') +conf.CHECK_FUNCS_IN('res_search res_nsearch res_ndestroy dns_search dn_expand', 'resolv', checklibc=True) conf.CHECK_VARIABLE('_res') conf.CHECK_HEADERS('pty.h util.h libutil.h') -conf.CHECK_FUNCS_IN('openpty', 'util') -conf.CHECK_FUNCS_IN('gettext', 'intl') +conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True) +conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True) conf.DEFINE('HAVE_KRB5',1) -- cgit