[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Wed Feb 9 11:04:52 MST 2011
The branch, v3-6-test has been updated
via d0d92ce s3-waf: we check for attr in ../lib/util/script already, so we cannot set to EMPTY here.
via 2465fe4 s3-waf: as long as we dont have --with-featureX=yes|no|auto handling, avoid exiting.
via 0bde5e0 s3-waf: check k5crypto in some more locations.
via ef98f64 s3-waf: support non-default krb5-config and cups-config locations.
from dd7f8ae s3:utils enable sharesec for registry shares
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit d0d92ce9d4f68a0e1df7b0881f75987c8d3fd768
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 9 17:56:45 2011 +0100
s3-waf: we check for attr in ../lib/util/script already, so we cannot set to EMPTY here.
Hopefully fixes the irix build.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Feb 9 18:58:15 CET 2011 on sn-devel-104
(cherry picked from commit a0e576178b886a68af5b5fce7e315fda2516df6d)
commit 2465fe4bd321fff25a7dd155ed0230fd09a31ae4
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 9 17:37:40 2011 +0100
s3-waf: as long as we dont have --with-featureX=yes|no|auto handling, avoid exiting.
Guenther
(cherry picked from commit ada4c66ea3e91725e8ce950a71a4bbd8324b5e66)
commit 0bde5e0006fbd0cf0375e5aec4060edafe7ec20f
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 9 17:43:54 2011 +0100
s3-waf: check k5crypto in some more locations.
Guenther
(cherry picked from commit 9081cb0fd8580d3915d076d7a17af08cca3ef64f)
commit ef98f6434e67b6bbdc61b9c7bc4471768f25fcfa
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 9 17:43:30 2011 +0100
s3-waf: support non-default krb5-config and cups-config locations.
Guenther
(cherry picked from commit 62cd1e08b3df15ae1c35213f7ebf6d495ec5e703)
-----------------------------------------------------------------------
Summary of changes:
source3/wscript | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index e726dc4..7dd87d7 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -336,11 +336,9 @@ return acl_get_perm_np(permset_d, perm);
else:
conf.DEFINE('HAVE_NO_ACLS', 1)
conf.SET_TARGET_TYPE('acl', 'EMPTY')
- conf.SET_TARGET_TYPE('attr', 'EMPTY')
else:
conf.DEFINE('HAVE_NO_ACLS', 1)
conf.SET_TARGET_TYPE('acl', 'EMPTY')
- conf.SET_TARGET_TYPE('attr', 'EMPTY')
if conf.CHECK_FUNCS('dirfd'):
conf.DEFINE('HAVE_DIRFD_DECL', 1)
@@ -605,10 +603,11 @@ msg.msg_acctrightslen = sizeof(fd);
conf.DEFINE('WITH_ADS', '1')
# Look for CUPS
- conf.find_program('cups-config', var='CUPS_CONFIG')
- if conf.env.CUPS_CONFIG and Options.options.with_cups:
- conf.check_cfg(path="cups-config", args="--cflags --ldflags --libs",
- package="", uselib_store="cups")
+ 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",
+ 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')
@@ -621,7 +620,6 @@ msg.msg_acctrightslen = sizeof(fd);
conf.DEFINE('HAVE_IPRINT', '1')
else:
print "--enable-iprint=yes but cups support not sufficient"
- sys.exit(1)
if Options.options.with_syslog:
conf.DEFINE('WITH_SYSLOG', '1')
if Options.options.with_automount:
@@ -667,9 +665,10 @@ msg.msg_acctrightslen = sizeof(fd);
conf.SET_TARGET_TYPE('lber', 'EMPTY')
# Check for kerberos
- conf.find_program('krb5-config', var='KRB5_CONFIG')
- if conf.env.KRB5_CONFIG and Options.options.with_krb5:
- conf.check_cfg(path="krb5-config", args="--cflags --libs",
+ if Options.options.with_krb5:
+ 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")
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 com_err.h', lib='krb5')
@@ -704,7 +703,7 @@ krb5_get_init_creds_opt_free krb5_get_init_creds_opt_get_error
krb5_enctype_to_string krb5_fwd_tgt_creds krb5_auth_con_set_req_cksumtype
krb5_get_creds_opt_alloc krb5_get_creds_opt_set_impersonate krb5_get_creds
krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
- lib='krb5')
+ lib='krb5 k5crypto')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
krb5_auth_con_set_req_cksumtype''',
headers='krb5.h', always=True)
@@ -770,7 +769,7 @@ krb5_enctype_to_string(1, buf, 256);
return 0;
}''',
'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG',
- headers='krb5.h', lib='krb5',
+ headers='krb5.h', lib='krb5 k5crypto',
addmain=False, cflags='-Werror',
msg="Checking whether krb5_enctype_to_string takes size_t argument")
@@ -902,12 +901,10 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
print "--with-pam=yes but pam_appl.h not found"
- sys.exit(1)
conf.CHECK_FUNCS_IN('pam_get_data', 'pam', mandatory=True)
conf.CHECK_HEADERS('security/pam_modules.h pam/pam_modules.h')
if not conf.CONFIG_SET('HAVE_SECURITY_PAM_MODULES_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_MODULES_H'):
print "--with-pam=yes but pam_modules.h not found"
- sys.exit(1)
conf.CHECK_HEADERS('security/pam_ext.h security/_pam_macros.h')
conf.CHECK_HEADERS('pam/pam_ext.h pam/_pam_macros.h')
conf.CHECK_FUNCS_IN('pam_vsyslog', 'pam')
@@ -1016,7 +1013,6 @@ int i; i = PAM_RADIO_TYPE;
conf.CHECK_FUNCS_IN('uuid_generate', 'uuid')
if not conf.CONFIG_SET('HAVE_UUID_UUID_H') and not conf.CONFIG_SET('HAVE_UUID_GENERATE'):
print "--with-dnsupdate=yes but uuid support not sufficient"
- sys.exit(1)
conf.DEFINE('WITH_DNS_UPDATES', 1)
else:
conf.SET_TARGET_TYPE('uuid', 'EMPTY')
--
Samba Shared Repository
More information about the samba-cvs
mailing list