summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-02 00:06:06 +0000
committerColin Watson <cjwatson@debian.org>2010-01-02 00:06:06 +0000
commitae25b169c7d44f3ce670752bbb4a9bc93dc83268 (patch)
tree8a8b102d23d60a03fa4c38ead61317ddb8635c3a
parentdf03186a4f9e0c2ece398b5c0571cb6263d7a752 (diff)
parentcadac134eda6ed97478afdc528a68dd33f31dbc5 (diff)
merge from gssapi branch
-rwxr-xr-xconfigure126
1 files changed, 63 insertions, 63 deletions
diff --git a/configure b/configure
index 1fe8a20e9..e8831e5cc 100755
--- a/configure
+++ b/configure
@@ -7302,26 +7302,19 @@ cat >>confdefs.h <<\_ACEOF
7302#define SSH_TUN_PREPEND_AF 1 7302#define SSH_TUN_PREPEND_AF 1
7303_ACEOF 7303_ACEOF
7304 7304
7305 7305 { echo "$as_me:$LINENO: checking if we have the Security Authorization Session API" >&5
7306 { echo "$as_me:$LINENO: checking whether AU_IPv4 is declared" >&5 7306echo $ECHO_N "checking if we have the Security Authorization Session API... $ECHO_C" >&6; }
7307echo $ECHO_N "checking whether AU_IPv4 is declared... $ECHO_C" >&6; } 7307 cat >conftest.$ac_ext <<_ACEOF
7308if test "${ac_cv_have_decl_AU_IPv4+set}" = set; then
7309 echo $ECHO_N "(cached) $ECHO_C" >&6
7310else
7311 cat >conftest.$ac_ext <<_ACEOF
7312/* confdefs.h. */ 7308/* confdefs.h. */
7313_ACEOF 7309_ACEOF
7314cat confdefs.h >>conftest.$ac_ext 7310cat confdefs.h >>conftest.$ac_ext
7315cat >>conftest.$ac_ext <<_ACEOF 7311cat >>conftest.$ac_ext <<_ACEOF
7316/* end confdefs.h. */ 7312/* end confdefs.h. */
7317$ac_includes_default 7313#include <Security/AuthSession.h>
7318int 7314int
7319main () 7315main ()
7320{ 7316{
7321#ifndef AU_IPv4 7317SessionCreate(0, 0);
7322 (void) AU_IPv4;
7323#endif
7324
7325 ; 7318 ;
7326 return 0; 7319 return 0;
7327} 7320}
@@ -7343,48 +7336,39 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7343 test -z "$ac_c_werror_flag" || 7336 test -z "$ac_c_werror_flag" ||
7344 test ! -s conftest.err 7337 test ! -s conftest.err
7345 } && test -s conftest.$ac_objext; then 7338 } && test -s conftest.$ac_objext; then
7346 ac_cv_have_decl_AU_IPv4=yes 7339 ac_cv_use_security_session_api="yes"
7347else
7348 echo "$as_me: failed program was:" >&5
7349sed 's/^/| /' conftest.$ac_ext >&5
7350
7351 ac_cv_have_decl_AU_IPv4=no
7352fi
7353
7354rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7355fi
7356{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_AU_IPv4" >&5
7357echo "${ECHO_T}$ac_cv_have_decl_AU_IPv4" >&6; }
7358if test $ac_cv_have_decl_AU_IPv4 = yes; then
7359 :
7360else
7361
7362cat >>confdefs.h <<\_ACEOF
7363#define AU_IPv4 0
7364_ACEOF
7365
7366 #include <bsm/audit.h>
7367 7340
7368cat >>confdefs.h <<\_ACEOF 7341cat >>confdefs.h <<\_ACEOF
7369#define LASTLOG_WRITE_PUTUTXLINE 1 7342#define USE_SECURITY_SESSION_API 1
7370_ACEOF 7343_ACEOF
7371 7344
7345 LIBS="$LIBS -framework Security"
7346 { echo "$as_me:$LINENO: result: yes" >&5
7347echo "${ECHO_T}yes" >&6; }
7348else
7349 echo "$as_me: failed program was:" >&5
7350sed 's/^/| /' conftest.$ac_ext >&5
7372 7351
7352 ac_cv_use_security_session_api="no"
7353 { echo "$as_me:$LINENO: result: no" >&5
7354echo "${ECHO_T}no" >&6; }
7373fi 7355fi
7374 7356
7375 { echo "$as_me:$LINENO: checking if we have the Security Authorization Session API" >&5 7357rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7376echo $ECHO_N "checking if we have the Security Authorization Session API... $ECHO_C" >&6; } 7358 { echo "$as_me:$LINENO: checking if we have an in-memory credentials cache" >&5
7359echo $ECHO_N "checking if we have an in-memory credentials cache... $ECHO_C" >&6; }
7377 cat >conftest.$ac_ext <<_ACEOF 7360 cat >conftest.$ac_ext <<_ACEOF
7378/* confdefs.h. */ 7361/* confdefs.h. */
7379_ACEOF 7362_ACEOF
7380cat confdefs.h >>conftest.$ac_ext 7363cat confdefs.h >>conftest.$ac_ext
7381cat >>conftest.$ac_ext <<_ACEOF 7364cat >>conftest.$ac_ext <<_ACEOF
7382/* end confdefs.h. */ 7365/* end confdefs.h. */
7383#include <Security/AuthSession.h> 7366#include <Kerberos/Kerberos.h>
7384int 7367int
7385main () 7368main ()
7386{ 7369{
7387SessionCreate(0, 0); 7370cc_context_t c;
7371 (void) cc_initialize (&c, 0, NULL, NULL);
7388 ; 7372 ;
7389 return 0; 7373 return 0;
7390} 7374}
@@ -7406,39 +7390,49 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7406 test -z "$ac_c_werror_flag" || 7390 test -z "$ac_c_werror_flag" ||
7407 test ! -s conftest.err 7391 test ! -s conftest.err
7408 } && test -s conftest.$ac_objext; then 7392 } && test -s conftest.$ac_objext; then
7409 ac_cv_use_security_session_api="yes"
7410 7393
7411cat >>confdefs.h <<\_ACEOF 7394cat >>confdefs.h <<\_ACEOF
7412#define USE_SECURITY_SESSION_API 1 7395#define USE_CCAPI 1
7413_ACEOF 7396_ACEOF
7414 7397
7415 LIBS="$LIBS -framework Security" 7398 LIBS="$LIBS -framework Security"
7416 { echo "$as_me:$LINENO: result: yes" >&5 7399 { echo "$as_me:$LINENO: result: yes" >&5
7417echo "${ECHO_T}yes" >&6; } 7400echo "${ECHO_T}yes" >&6; }
7401 if test "x$ac_cv_use_security_session_api" = "xno"; then
7402 { { echo "$as_me:$LINENO: error: *** Need a security framework to use the credentials cache API ***" >&5
7403echo "$as_me: error: *** Need a security framework to use the credentials cache API ***" >&2;}
7404 { (exit 1); exit 1; }; }
7405 fi
7418else 7406else
7419 echo "$as_me: failed program was:" >&5 7407 echo "$as_me: failed program was:" >&5
7420sed 's/^/| /' conftest.$ac_ext >&5 7408sed 's/^/| /' conftest.$ac_ext >&5
7421 7409
7422 ac_cv_use_security_session_api="no" 7410 { echo "$as_me:$LINENO: result: no" >&5
7423 { echo "$as_me:$LINENO: result: no" >&5
7424echo "${ECHO_T}no" >&6; } 7411echo "${ECHO_T}no" >&6; }
7412
7425fi 7413fi
7426 7414
7427rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 7415rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7428 { echo "$as_me:$LINENO: checking if we have an in-memory credentials cache" >&5 7416
7429echo $ECHO_N "checking if we have an in-memory credentials cache... $ECHO_C" >&6; } 7417 { echo "$as_me:$LINENO: checking whether AU_IPv4 is declared" >&5
7430 cat >conftest.$ac_ext <<_ACEOF 7418echo $ECHO_N "checking whether AU_IPv4 is declared... $ECHO_C" >&6; }
7419if test "${ac_cv_have_decl_AU_IPv4+set}" = set; then
7420 echo $ECHO_N "(cached) $ECHO_C" >&6
7421else
7422 cat >conftest.$ac_ext <<_ACEOF
7431/* confdefs.h. */ 7423/* confdefs.h. */
7432_ACEOF 7424_ACEOF
7433cat confdefs.h >>conftest.$ac_ext 7425cat confdefs.h >>conftest.$ac_ext
7434cat >>conftest.$ac_ext <<_ACEOF 7426cat >>conftest.$ac_ext <<_ACEOF
7435/* end confdefs.h. */ 7427/* end confdefs.h. */
7436#include <Kerberos/Kerberos.h> 7428$ac_includes_default
7437int 7429int
7438main () 7430main ()
7439{ 7431{
7440cc_context_t c; 7432#ifndef AU_IPv4
7441 (void) cc_initialize (&c, 0, NULL, NULL); 7433 (void) AU_IPv4;
7434#endif
7435
7442 ; 7436 ;
7443 return 0; 7437 return 0;
7444} 7438}
@@ -7460,29 +7454,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
7460 test -z "$ac_c_werror_flag" || 7454 test -z "$ac_c_werror_flag" ||
7461 test ! -s conftest.err 7455 test ! -s conftest.err
7462 } && test -s conftest.$ac_objext; then 7456 } && test -s conftest.$ac_objext; then
7457 ac_cv_have_decl_AU_IPv4=yes
7458else
7459 echo "$as_me: failed program was:" >&5
7460sed 's/^/| /' conftest.$ac_ext >&5
7461
7462 ac_cv_have_decl_AU_IPv4=no
7463fi
7464
7465rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7466fi
7467{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_AU_IPv4" >&5
7468echo "${ECHO_T}$ac_cv_have_decl_AU_IPv4" >&6; }
7469if test $ac_cv_have_decl_AU_IPv4 = yes; then
7470 :
7471else
7463 7472
7464cat >>confdefs.h <<\_ACEOF 7473cat >>confdefs.h <<\_ACEOF
7465#define USE_CCAPI 1 7474#define AU_IPv4 0
7466_ACEOF 7475_ACEOF
7467 7476
7468 LIBS="$LIBS -framework Security" 7477 #include <bsm/audit.h>
7469 { echo "$as_me:$LINENO: result: yes" >&5 7478
7470echo "${ECHO_T}yes" >&6; } 7479cat >>confdefs.h <<\_ACEOF
7471 if test "x$ac_cv_use_security_session_api" = "xno"; then 7480#define LASTLOG_WRITE_PUTUTXLINE 1
7472 { { echo "$as_me:$LINENO: error: *** Need a security framework to use the credentials cache API ***" >&5 7481_ACEOF
7473echo "$as_me: error: *** Need a security framework to use the credentials cache API ***" >&2;}
7474 { (exit 1); exit 1; }; }
7475 fi
7476else
7477 echo "$as_me: failed program was:" >&5
7478sed 's/^/| /' conftest.$ac_ext >&5
7479 7482
7480 { echo "$as_me:$LINENO: result: no" >&5
7481echo "${ECHO_T}no" >&6; }
7482 7483
7483fi 7484fi
7484 7485
7485rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7486 ;; 7486 ;;
7487*-*-dragonfly*) 7487*-*-dragonfly*)
7488 SSHDLIBS="$SSHDLIBS -lcrypt" 7488 SSHDLIBS="$SSHDLIBS -lcrypt"