merge updates from OPENSSH_4_4P1_SIMON_20061002_HPN to trunk

[gssapi-openssh.git] / openssh / configure.ac

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 06f34a8d14636b2db0c757455c9b93a83fce8db6..deebb72743b658faa7dd6da7710e5881a4e30926 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -259,36 +259,36 @@ int main(void) { exit(0); }
        AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE_UNQUOTED(BIND_8_COMPAT, 1,
                [Define if your resolver libs need this for getrrsetbyname])
-       AC_MSG_CHECKING(if we have the Security Authorization Session API)
-       AC_TRY_COMPILE([#include <Security/AuthSession.h>],
-               [SessionCreate(0, 0);],
-               [ac_cv_use_security_session_api="yes"
-                AC_DEFINE(USE_SECURITY_SESSION_API, 1, 
-                       [platform has the Security Authorization Session API])
-                LIBS="$LIBS -framework Security"
-                AC_MSG_RESULT(yes)],
-               [ac_cv_use_security_session_api="no"
-                AC_MSG_RESULT(no)])
-       AC_MSG_CHECKING(if we have an in-memory credentials cache)
-       AC_TRY_COMPILE(
-               [#include <Kerberos/Kerberos.h>],
-               [cc_context_t c;
-                (void) cc_initialize (&c, 0, NULL, NULL);],
-               [AC_DEFINE(USE_CCAPI, 1, 
-                       [platform uses an in-memory credentials cache])
-                LIBS="$LIBS -framework Security"
-                AC_MSG_RESULT(yes)
-                if test "x$ac_cv_use_security_session_api" = "xno"; then
-                       AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***)
-               fi],
-               [AC_MSG_RESULT(no)]
-       )
        AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD way])
        AC_DEFINE(SSH_TUN_COMPAT_AF, 1,
            [Use tunnel device compatibility to OpenBSD])
        AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
            [Prepend the address family to IP tunnel traffic])
-       ;;
+       AC_MSG_CHECKING(if we have the Security Authorization Session API)
+       AC_TRY_COMPILE([#include <Security/AuthSession.h>],
+               [SessionCreate(0, 0);],
+               [ac_cv_use_security_session_api="yes"
+                AC_DEFINE(USE_SECURITY_SESSION_API, 1, 
+                       [platform has the Security Authorization Session API])
+                LIBS="$LIBS -framework Security"
+                AC_MSG_RESULT(yes)],
+               [ac_cv_use_security_session_api="no"
+                AC_MSG_RESULT(no)])
+       AC_MSG_CHECKING(if we have an in-memory credentials cache)
+       AC_TRY_COMPILE(
+               [#include <Kerberos/Kerberos.h>],
+               [cc_context_t c;
+                (void) cc_initialize (&c, 0, NULL, NULL);],
+               [AC_DEFINE(USE_CCAPI, 1, 
+                       [platform uses an in-memory credentials cache])
+                LIBS="$LIBS -framework Security"
+                AC_MSG_RESULT(yes)
+                if test "x$ac_cv_use_security_session_api" = "xno"; then
+                       AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***)
+               fi],
+               [AC_MSG_RESULT(no)]
+       )
+       ;;
 *-*-dragonfly*)
        SSHDLIBS="$SSHDLIBS -lcrypt"
        ;;