[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  4de3e73 s3-waf: fix cups checks when lib is there but headers aren't.
      from  5ecda05 s3-waf: better checks for gssapi support.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4de3e733da8d37a16bce0fb7383d176f8a7ac0b1
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 10 20:37:02 2011 +0100

    s3-waf: fix cups checks when lib is there but headers aren't.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Feb 10 21:24:37 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index f5fe52b..cb10fd5 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')


-- 
Samba Shared Repository