From adfd1db476cb1c399d5146b47f432199c585666c Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Thu, 8 Apr 2010 08:09:11 +0200 Subject: s3-waf: Fix the CUPS dependency --- source3/wscript | 6 ++++-- source3/wscript_build | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source3/wscript b/source3/wscript index 4716008e0b..5b582b5f49 100644 --- a/source3/wscript +++ b/source3/wscript @@ -276,8 +276,10 @@ yp_get_default_domain # Look for CUPS conf.find_program('cups-config', var='CUPS_CONFIG') if conf.env.CUPS_CONFIG: - conf.check_cfg(path="cups-config", args="--cflags --ldflags --libs", package="", uselib_store="CUPS") - conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='CUPS') + conf.check_cfg(path="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') # Check for LDAP conf.CHECK_HEADERS('ldap.h lber.h') diff --git a/source3/wscript_build b/source3/wscript_build index 5c86f8f943..2611b630b8 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -683,7 +683,8 @@ bld.SAMBA_MKVERSION('include/version.h') bld.SAMBA_BINARY('smbd/smbd', source=SMBD_SRC, - deps='tdb DYNCONFIG tevent popt dl krb5 ldap gssapi gssapi_krb5 NSS_WRAPPER LIBWBCLIENT crypt nsl', + deps='''tdb DYNCONFIG tevent popt dl krb5 ldap gssapi gssapi_krb5 + NSS_WRAPPER LIBWBCLIENT crypt nsl cups cap''', includes='lib', vars=locals()) -- cgit