diff --git a/configure.in b/configure.in index 08bbd165a..539c4eee8 100644 --- a/configure.in +++ b/configure.in @@ -79,100 +79,12 @@ fi AM_CONDITIONAL(PKINIT, test "$enable_pk_init" != no) -rk_TEST_PACKAGE(krb4,[#include ],-lkrb,-ldes,/usr/athena, KRB4, krb4-config) +dnl no kerberos4 any more +with_krb4=no +AC_SUBST(INCLUDE_krb4) +AC_SUBST(LIB_krb4) +AM_CONDITIONAL(KRB4, false) -LIB_kdb= -if test "$with_krb4" != "no"; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $INCLUDE_krb4" - save_LIBS="$LIBS" - LIBS="$LIB_krb4 $LIBS" - EXTRA_LIB45=lib45.a - AC_SUBST(EXTRA_LIB45) - AC_CACHE_CHECK(for four valued krb_put_int, ac_cv_func_krb_put_int_four, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ - char tmp[4]; - krb_put_int(17, tmp, 4, sizeof(tmp));]])], - [ac_cv_func_krb_put_int_four=yes], - [ac_cv_func_krb_put_int_four=no]) - ]) - if test "$ac_cv_func_krb_put_int_four" = yes; then - AC_DEFINE(HAVE_FOUR_VALUED_KRB_PUT_INT, 1, - [define if krb_put_int takes four arguments.]) - fi - AH_BOTTOM([#if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4) -#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S)) -#else -#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (S)) -#endif -]) - AC_CACHE_CHECK(for KRB_VERIFY_SECURE, ac_cv_func_krb_verify_secure, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ - int x = KRB_VERIFY_SECURE]])], - [ac_cv_func_krb_verify_secure=yes], - [ac_cv_func_krb_verify_secure=no]) - ]) - if test "$ac_cv_func_krb_verify_secure" != yes; then - AC_DEFINE(KRB_VERIFY_SECURE, 1, - [Define to one if your krb.h doesn't]) - AC_DEFINE(KRB_VERIFY_SECURE_FAIL, 2, - [Define to two if your krb.h doesn't]) - fi - AC_CACHE_CHECK(for KRB_VERIFY_NOT_SECURE, - ac_cv_func_krb_verify_not_secure, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ - int x = KRB_VERIFY_NOT_SECURE]])], - [ac_cv_func_krb_verify_not_secure=yes], - [ac_cv_func_krb_verify_not_secure=no]) - ]) - if test "$ac_cv_func_krb_verify_not_secure" != yes; then - AC_DEFINE(KRB_VERIFY_NOT_SECURE, 0, - [Define to zero if your krb.h doesn't]) - fi - AC_FIND_FUNC(krb_enable_debug) - AC_FIND_FUNC(krb_disable_debug) - AC_FIND_FUNC(krb_get_our_ip_for_realm) - AC_FIND_FUNC(krb_kdctimeofday) - AH_BOTTOM( - [#ifndef HAVE_KRB_KDCTIMEOFDAY -#define krb_kdctimeofday(X) gettimeofday((X), NULL) -#endif]) - AC_FIND_FUNC(krb_get_kdc_time_diff) - AH_BOTTOM( - [#ifndef HAVE_KRB_GET_KDC_TIME_DIFF -#define krb_get_kdc_time_diff() (0) -#endif]) - AC_CACHE_CHECK([for KRB_SENDAUTH_VERS], - ac_cv_func_krb_sendauth_vers, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - #include ]], [[ - char *x = KRB_SENDAUTH_VERS]])], - [ac_cv_func_krb_sendauth_vers=yes], - [ac_cv_func_krb_sendauth_vers=no]) - ]) - if test "$ac_cv_func_krb_sendauth_vers" != yes; then - AC_DEFINE(KRB_SENDAUTH_VERS, ["AUTHV0.1"], - [This is the krb4 sendauth version.]) - fi - AC_CACHE_CHECK(for krb_mk_req with const arguments, - ac_cv_func_krb_mk_req_const, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - int krb_mk_req(KTEXT a, const char *s, const char *i, - const char *r, int32_t checksum) - { return 17; }]], [[]])], - [ac_cv_func_krb_mk_req_const=yes], - [ac_cv_func_krb_mk_req_const=no]) - ]) - if test "$ac_cv_func_krb_mk_req_const" = "yes"; then - AC_DEFINE(KRB_MK_REQ_CONST, 1, - [Define if krb_mk_req takes const char *]) - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - LIB_kdb="-lkdb -lkrb" -fi -AM_CONDITIONAL(KRB4, test "$with_krb4" != "no") AM_CONDITIONAL(KRB5, true) AM_CONDITIONAL(do_roken_rename, true)