The branch, master has been updated
via 002694c s3 waf: Use upper case uselib_store parameter, otherwise
the following checks won't find it
from 7fff4e7 s3:dbwrap: remove m_all marshall buffer from ctdb
transaction.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 002694c38d6b4e9231c19e8f830697f02d814923
Author: Kai Blin <[email protected]>
Date: Wed Oct 12 08:17:02 2011 +0200
s3 waf: Use upper case uselib_store parameter, otherwise the following
checks won't find it
Autobuild-User: Kai Blin <[email protected]>
Autobuild-Date: Wed Oct 12 09:49:50 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/wscript | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index 47ef847..82434a5 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -487,7 +487,7 @@ msg.msg_acctrightslen = sizeof(fd);
# 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")
+ package="", uselib_store="CUPS")
conf.CHECK_HEADERS('cups/cups.h cups/language.h', 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'):
@@ -554,7 +554,7 @@ msg.msg_acctrightslen = sizeof(fd);
conf.find_program('krb5-config', var='KRB5_CONFIG')
if conf.env.KRB5_CONFIG:
conf.check_cfg(path="krb5-config", args="--cflags --libs",
- package="gssapi", uselib_store="krb5")
+ package="gssapi", uselib_store="KRB5")
conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h
gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h', lib='krb5')
--
Samba Shared Repository
