summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-09 17:43:30 +0100
committerGünther Deschner <gd@samba.org>2011-02-09 18:14:19 +0100
commit62cd1e08b3df15ae1c35213f7ebf6d495ec5e703 (patch)
tree3152ebd6b7d19c87d2d1423ce0c5e26b353f29e7 /source3
parentdcd6764dad7ec636201faf724b011cf03edd4beb (diff)
downloadsamba-62cd1e08b3df15ae1c35213f7ebf6d495ec5e703.tar.gz
samba-62cd1e08b3df15ae1c35213f7ebf6d495ec5e703.tar.bz2
samba-62cd1e08b3df15ae1c35213f7ebf6d495ec5e703.zip
s3-waf: support non-default krb5-config and cups-config locations.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript16
1 files changed, 9 insertions, 7 deletions
diff --git a/source3/wscript b/source3/wscript
index e726dc4069..211c8b68c5 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -605,10 +605,11 @@ msg.msg_acctrightslen = sizeof(fd);
conf.DEFINE('WITH_ADS', '1')
# Look for CUPS
- conf.find_program('cups-config', var='CUPS_CONFIG')
- if conf.env.CUPS_CONFIG and Options.options.with_cups:
- conf.check_cfg(path="cups-config", args="--cflags --ldflags --libs",
- package="", uselib_store="cups")
+ if Options.options.with_cups:
+ conf.find_program('cups-config', var='CUPS_CONFIG')
+ if conf.env.CUPS_CONFIG:
+ conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags --libs",
+ package="", uselib_store="cups")
conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups')
conf.CHECK_LIB('cups')
conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', 'cups')
@@ -667,9 +668,10 @@ msg.msg_acctrightslen = sizeof(fd);
conf.SET_TARGET_TYPE('lber', 'EMPTY')
# Check for kerberos
- conf.find_program('krb5-config', var='KRB5_CONFIG')
- if conf.env.KRB5_CONFIG and Options.options.with_krb5:
- conf.check_cfg(path="krb5-config", args="--cflags --libs",
+ if Options.options.with_krb5:
+ conf.find_program('krb5-config', var='KRB5_CONFIG')
+ if conf.env.KRB5_CONFIG:
+ conf.check_cfg(path="krb5-config", args="--cflags --libs",
package="gssapi", uselib_store="krb5")
conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h com_err.h', lib='krb5')