diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-13 11:26:24 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-13 04:41:05 +0100 |
| commit | 3bf922111a29277e390361c6f4cf7580ff4453e3 (patch) | |
| tree | 4a824b57a9e528ef1aedb4358236b9d48ae5ad27 | |
| parent | 4a0d1b5ac6c2a42fd5df969acf91bb8e60af06e1 (diff) | |
| download | samba-3bf922111a29277e390361c6f4cf7580ff4453e3.tar.gz samba-3bf922111a29277e390361c6f4cf7580ff4453e3.tar.bz2 samba-3bf922111a29277e390361c6f4cf7580ff4453e3.zip | |
s3-build: expliticly require gssapi for HAVE_KRB5 and remove HAVE_GSSAPI
The requirement for gss functions already make this happen, but
this is clearer. No code depends on HAVE_GSSAPI any more.
Andrew Bartlett
| -rw-r--r-- | source3/configure.in | 3 | ||||
| -rw-r--r-- | source3/wscript | 4 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/source3/configure.in b/source3/configure.in index ea212f603e..938f2a344c 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4488,9 +4488,6 @@ if test x"$with_ads_support" != x"no"; then if test x"$use_ads" = x"yes"; then AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support]) AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support]) - if test x"$have_gssapi" = x"yes"; then - AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]) - fi else if test x"$with_ads_support" = x"yes"; then AC_MSG_ERROR(krb5 libs don't have all features required for Active Directory support) diff --git a/source3/wscript b/source3/wscript index b47d71a49c..4fe0535386 100644 --- a/source3/wscript +++ b/source3/wscript @@ -815,8 +815,6 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); if use_ads: conf.DEFINE('WITH_ADS', '1') conf.DEFINE('HAVE_KRB5', '1') - if have_gssapi: - conf.DEFINE('HAVE_GSSAPI', '1') if conf.CONFIG_SET('HAVE_LDAP'): conf.env['HAVE_ADS'] = '1' else: @@ -995,7 +993,7 @@ 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'): Logs.warn("--with-dnsupdate=yes but uuid support not sufficient") - elif not conf.CONFIG_SET('HAVE_GSSAPI'): + elif not conf.CONFIG_SET('HAVE_KRB5'): Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") else: conf.DEFINE('WITH_DNS_UPDATES', 1) diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index a9ba14f8ca..eab2cf3abd 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -62,7 +62,6 @@ conf.CHECK_DECLS('_res', headers='netinet/in.h arpa/nameser.h resolv.h') conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h') conf.DEFINE('HAVE_KRB5',1) -conf.DEFINE('HAVE_GSSAPI',1) conf.CHECK_FUNCS('dirfd', headers='dirent.h') conf.CHECK_DECLS('dirfd', reverse=True, headers='dirent.h') |