Merge branch 'master' into arc-autoconf-ng-13-4

Author: yadij

acinclude/krb5.m4

@@ -5,6 +5,27 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
+dnl check whether the Kerberos context has a memory cache
+AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE],[
+  AC_REQUIRE([SQUID_STATE_SAVE])
+  AC_REQUIRE([SQUID_STATE_ROLLBACK])
+  AC_REQUIRE([SQUID_DEFINE_BOOL])
+  AC_CACHE_CHECK([for Kerberos context memory cache],squid_cv_krb5_memory_cache,[
+    SQUID_STATE_SAVE(squid_krb5_test)
+    CPPFLAGS="-I${srcdir:-.} $CPPFLAGS"
+    AC_RUN_IFELSE([
+      AC_LANG_PROGRAM([[#include "compat/krb5.h"]],[[
+        krb5_context c;
+        krb5_ccache cc;
+        krb5_init_context(&c);
+        return krb5_cc_resolve(c, "MEMORY:test_cache", &cc);
+      ]])
+    ],[squid_cv_krb5_memory_cache=yes],[squid_cv_krb5_memory_cache=no],[:])
+    SQUID_STATE_ROLLBACK(squid_krb5_test)
+  ])
+  SQUID_DEFINE_BOOL(HAVE_KRB5_MEMORY_CACHE,$squid_cv_krb5_memory_cache,[kerberos has MEMORY: cache support])
+]) dnl SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE
+
 dnl check whether the Kerberos context has a memory keytab
 AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_KEYTAB],[
   AC_REQUIRE([SQUID_STATE_SAVE])
@@ -63,29 +84,6 @@ AC_DEFUN([SQUID_CHECK_SOLARIS_KRB5],[
   ])
 ])
 
-dnl check whether the kerberos context has a memory cache. Sets
-dnl squid_cv_memory_cache if that's the case.
-AC_DEFUN([SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE],[
-  AC_CACHE_CHECK([for memory cache], squid_cv_memory_cache, [
-    SQUID_STATE_SAVE(squid_krb5_test)
-    CPPFLAGS="-I${srcdir:-.} $CPPFLAGS"
-    AC_RUN_IFELSE([
-      AC_LANG_SOURCE([[
-#include "compat/krb5.h"
-int main(int argc, char *argv[])
-{
-    krb5_context context;
-    krb5_ccache cc;
-
-    krb5_init_context(&context);
-    return krb5_cc_resolve(context, "MEMORY:test_cache", &cc);
-}
-      ]])
-    ], [ squid_cv_memory_cache=yes ], [ squid_cv_memory_cache=no ], [:])
-    SQUID_STATE_ROLLBACK(squid_krb5_test)
-  ])
-])
-
 dnl check for PAC requirements
 AC_DEFUN([SQUID_CHECK_KRB5_PAC_SUPPORT],[
   AC_CHECK_TYPE(krb5_pac,[
@@ -273,9 +271,6 @@ AC_DEFUN([SQUID_CHECK_KRB5_FUNCS],[
   SQUID_STATE_ROLLBACK(squid_krb5_test)
 
   SQUID_CHECK_KRB5_CONTEXT_MEMORY_CACHE
-  SQUID_DEFINE_BOOL(HAVE_KRB5_MEMORY_CACHE,$squid_cv_memory_cache,
-       [Define if kerberos has MEMORY: cache support])
-
   SQUID_CHECK_KRB5_CONTEXT_MEMORY_KEYTAB
 
   SQUID_CHECK_WORKING_GSSAPI