s3-waf: Fix the CUPS dependency

diff --git a/source3/wscript b/source3/wscript
index 4716008e0b1c3b06ba8ae7e9a9e24749a2990f03..5b582b5f49145ea6c5d41e7083e0f8504a3713da 100644 (file)
--- 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 5c86f8f9436facc3aac49d11643a381f28bc292b..2611b630b82e356cb24db6a17bfd7218fdaebd17 100644 (file)
--- 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())