diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-21 13:58:13 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-22 02:51:09 +0100 |
| commit | 15c04403496bb940c5981dca0b960ec45e47c7d8 (patch) | |
| tree | fdcab88ccfdb628c1e0b8d4a1c8afb0711739ce4 | |
| parent | f180e1ab7c3957b9d387ea0b3219b1805b2bde77 (diff) | |
| download | samba-15c04403496bb940c5981dca0b960ec45e47c7d8.tar.gz samba-15c04403496bb940c5981dca0b960ec45e47c7d8.tar.bz2 samba-15c04403496bb940c5981dca0b960ec45e47c7d8.zip | |
s3-waf: work around broken cups-config --libs output
"cups-config --libs" returns -lgssapi_krb5, which ties it to the
system krb5 library. It should get this via the indirect dependency of
libcups.so instead.
Work around this by using 'cups' as the library and avoid using --libs
in the cups-config command
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/wscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript index bf4536b92f..d3c41b624e 100644 --- a/source3/wscript +++ b/source3/wscript @@ -530,10 +530,13 @@ msg.msg_acctrightslen = sizeof(fd); 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", + # we would normally use --libs here, but cups-config incorrectly adds + # gssapi_krb5 and other libraries to its --libs output. That breaks the use + # of an in-tree heimdal kerberos + conf.check_cfg(path=conf.env.CUPS_CONFIG, args="--cflags --ldflags", package="", uselib_store="cups") conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups') - conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', conf.env.LIB_cups) + conf.CHECK_FUNCS_IN('httpConnect httpConnectEncrypt', 'cups') if conf.CONFIG_SET('HAVE_CUPS_CUPS_H') and conf.CONFIG_SET('HAVE_CUPS_LANGUAGE_H'): conf.DEFINE('HAVE_CUPS', '1') else: |