From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 21 Feb 2011 02:58:13 +0000 (+1100)
Subject: s3-waf: work around broken cups-config --libs output
X-Git-Tag: tevent-0.9.11~401
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15c04403496bb940c5981dca0b960ec45e47c7d8;p=thirdparty%2Fsamba.git

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>
---

diff --git a/source3/wscript b/source3/wscript
index bf4536b92f9..d3c41b624e8 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: