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

diff --git a/source3/configure.in b/source3/configure.in
index ea212f603ecc167836da8221d460e0baf29f06f8..938f2a344ce5ec528847d6d7c39df9c0ea4c53f1 100644 (file)
--- 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 b47d71a49ccd897fb969f00d467ca0458c4326e5..4fe0535386df06573296c2c42a749f5201078465 100644 (file)
--- 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 a9ba14f8caccd22fda6a2af1f907469c9ef421e0..eab2cf3abd3dca36d898567d6b33c40905377f21 100644 (file)
--- 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')