Changeset 30 for trunk/samba/source/configure.in

Timestamp:

Apr 25, 2007, 9:44:55 AM (14 years ago)

Author:

Paul Smedley

Message:

Code updated to Samba 3.0.25rc2 level

File:

• trunk/samba/source/configure.in (modified) (4 diffs)

trunk/samba/source/configure.in

@@ -298 +298 @@
 AC_SUBST(INSTALL_PAM_MODULES)
 AC_SUBST(UNINSTALL_PAM_MODULES)
+AC_SUBST(NSS_MODULES)
 AC_SUBST(EXTRA_BIN_PROGS)
 AC_SUBST(SMBMOUNT_PROGS)
@@ -3526 +3527 @@
   AC_CHECK_FUNC_EXT(krb5_decode_ap_req, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(free_AP_REQ, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_verify_checksum, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_c_verify_checksum, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_principal_compare_any_realm, $KRB5_LIBS)
@@ -3562 +3564 @@
         AC_DEFINE(KRB5_TICKET_HAS_KEYINFO, 1,
             [Whether the krb5_ticket structure contains the kvno and enctype])
+  fi
+
+  AC_CACHE_CHECK(whether krb5_get_init_creds_opt_free takes a context argument,
+          smb_krb5_creds_opt_free_context,
+          [
+                AC_TRY_COMPILE([
+                    #include <krb5.h>],
+                    [
+                        krb5_context ctx;
+                        krb5_get_init_creds_opt *opt = NULL;
+                        krb5_get_init_creds_opt_free(ctx, opt);
+                    ],
+                    [smb_krb5_creds_opt_free_context=yes],
+                    [smb_krb5_creds_opt_free_context=no]
+                )
+          ])
+
+  if test x"$smb_krb5_creds_opt_free_context" = x"yes" ; then
+        AC_DEFINE(KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT, 1,
+            [Whether krb5_get_init_creds_opt_free takes a context argument])
   fi
 
@@ -5743 +5765 @@
 AC_SUBST(NSSSONAMEVERSIONSUFFIX)
 
+if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes"; then
+        NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
+fi
+
 AC_SUBST(SMB_KRB5_LOCATOR)