diff options
| author | Kai Blin <kai@samba.org> | 2010-04-08 08:09:11 +0200 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2010-05-20 22:16:13 +0200 |
| commit | adfd1db476cb1c399d5146b47f432199c585666c (patch) | |
| tree | e25968e37af71177e843db1f4710256956cd69e0 | |
| parent | 419873f2ee9997edd06f95758f7ab10aa1a8d15b (diff) | |
| download | samba-adfd1db476cb1c399d5146b47f432199c585666c.tar.gz samba-adfd1db476cb1c399d5146b47f432199c585666c.tar.bz2 samba-adfd1db476cb1c399d5146b47f432199c585666c.zip | |
s3-waf: Fix the CUPS dependency
| -rw-r--r-- | source3/wscript | 6 | ||||
| -rw-r--r-- | 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()) |