From 0234ac4e3cd44ce1990e034782fa14347a884cba Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Feb 2011 12:16:03 +1100 Subject: s3-waf: use Logs.warn() not print for configure warnings this highlights the warning for the user Pair-Programmed-With: Andrew Bartlett --- source3/wscript | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'source3') diff --git a/source3/wscript b/source3/wscript index 7567ea4c50..3339823d12 100644 --- a/source3/wscript +++ b/source3/wscript @@ -298,7 +298,7 @@ utimensat vsyslog _write __write __xstat # checks for OSes. import sys host_os = sys.platform - print "building on %s" % host_os + Logs.info("building on %s" % host_os) # Python doesn't have case switches... :/ # FIXME: original was *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*) @@ -326,7 +326,7 @@ utimensat vsyslog _write __write __xstat conf.DEFINE('STAT_ST_BLOCKSIZE', '512') # FIXME: Add more checks here. else: - print "Unknown host_os '%s', please report this to samba-technical@samba.org" % host_os + Logs.warn("Unknown host_os '%s', please report this to samba-technical@samba.org" % host_os) #FIXME: add more checks if Options.options.with_acl_support: @@ -547,7 +547,7 @@ msg.msg_acctrightslen = sizeof(fd); if conf.CONFIG_SET('HAVE_CUPS'): conf.DEFINE('HAVE_IPRINT', '1') else: - print "--enable-iprint=yes but cups support not sufficient" + Logs.warn("--enable-iprint=yes but cups support not sufficient") if Options.options.with_syslog: conf.DEFINE('WITH_SYSLOG', '1') if Options.options.with_automount: @@ -796,26 +796,26 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); use_ads=True if not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and \ not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC'): - print "arcfour-hmac-md5 encryption type not found in -lkrb5" + Logs.warn("arcfour-hmac-md5 encryption type not found in -lkrb5") use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_MK_REQ_EXTENDED'): - print "krb5_mk_req_extended not found in -lkrb5" + Logs.warn("krb5_mk_req_extended not found in -lkrb5") use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \ not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'): - print "no CREATE_KEY_FUNCTIONS detected" + Logs.warn("no CREATE_KEY_FUNCTIONS detected") use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_GET_PERMITTED_ENCTYPES') and \ not conf.CONFIG_SET('HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES'): - print "no GET_ENCTYPES_FUNCTIONS detected" + Logs.warn("no GET_ENCTYPES_FUNCTIONS detected") use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_KT_FREE_ENTRY') and \ not conf.CONFIG_SET('HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS'): - print "no KT_FREE_FUNCTION detected" + Logs.warn("no KT_FREE_FUNCTION detected") use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM') and \ not conf.CONFIG_SET('HAVE_KRB5_VERIFY_CHECKSUM'): - print "no KRB5_VERIFY_CHECKSUM_FUNCTION detected" + Logs.warn("no KRB5_VERIFY_CHECKSUM_FUNCTION detected") use_ads=False if not conf.CONFIG_SET('KRB5_TICKET_HAS_KEYINFO'): # We only need the following functions if we can't get the enctype @@ -824,7 +824,7 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); print "no KRB5_AP_REQ_FREE_FUNCTION detected" use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_DECODE_AP_REQ'): - print "no KRB5_AP_REQ_DECODING_FUNCTION detected" + Logs.warn("no KRB5_AP_REQ_DECODING_FUNCTION detected") use_ads=False if use_ads: conf.DEFINE('WITH_ADS', '1') @@ -832,7 +832,7 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); if have_gssapi: conf.DEFINE('HAVE_GSSAPI', '1') else: - print "krb5 libs don't have all features required for Active Directory support" + Logs.warn("krb5 libs don't have all features required for Active Directory support") conf.undefine('HAVE_KRB5_H') conf.undefine('HAVE_GSSAPI_H') conf.undefine('HAVE_GSSAPI_GSSAPI_GENERIC_H') @@ -891,12 +891,12 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): - print "--with-pam=yes but pam_appl.h not found" + Logs.warn("--with-pam=yes but pam_appl.h not found") use_pam=False conf.CHECK_FUNCS_IN('pam_get_data', 'pam') conf.CHECK_HEADERS('security/pam_modules.h pam/pam_modules.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_MODULES_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_MODULES_H'): - print "--with-pam=yes but pam_modules.h not found" + Logs.warn("--with-pam=yes but pam_modules.h not found") use_pam=False conf.CHECK_HEADERS('security/pam_ext.h security/_pam_macros.h') conf.CHECK_HEADERS('pam/pam_ext.h pam/_pam_macros.h') @@ -1006,9 +1006,9 @@ int i; i = PAM_RADIO_TYPE; conf.CHECK_HEADERS('uuid/uuid.h') conf.CHECK_FUNCS_IN('uuid_generate', 'uuid') if not conf.CONFIG_SET('HAVE_UUID_UUID_H') and not conf.CONFIG_SET('HAVE_UUID_GENERATE'): - print "--with-dnsupdate=yes but uuid support not sufficient" + Logs.warn("--with-dnsupdate=yes but uuid support not sufficient") elif not conf.CONFIG_SET('HAVE_GSSAPI'): - print "--with-dnsupdate=yes but gssapi support not sufficient" + Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") else: conf.DEFINE('WITH_DNS_UPDATES', 1) else: -- cgit