From 4de3e733da8d37a16bce0fb7383d176f8a7ac0b1 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Feb 2011 20:37:02 +0100
Subject: s3-waf: fix cups checks when lib is there but headers aren't.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Feb 10 21:24:37 CET 2011 on sn-devel-104
---
 source3/wscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/wscript b/source3/wscript
index f5fe52bd85..cb10fd5699 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -606,8 +606,9 @@ msg.msg_acctrightslen = sizeof(fd);
 	    conf.check_cfg(path=conf.env.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')
         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:
         # define an empty subsystem for cups, to allow it to be used as an empty dependency
         conf.SET_TARGET_TYPE('cups', 'EMPTY')
-- 
cgit