X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=1f120b7387572e8801d9ad22c3b0190ffae066fa;hb=a293921843753a2c6b60af90a41fcb3028f6ae1b;hp=f16a345c6b49080123b79b47ddd09017250fc96b;hpb=d6db8e85bf9fa86bfe7af9eb463b95d99148bcdf;p=mod_auth_kerb.git diff --git a/configure.in b/configure.in index f16a345..1f120b7 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_REVISION($Revision$) -AC_PREREQ(2.53) -AC_INIT(mod_auth_kerb, 0.5-rc4, modauthkerb-developers@lists.sourceforge.net) +AC_PREREQ(2.57) +AC_INIT(mod_auth_kerb, 5.2, modauthkerb-developers@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/mod_auth_kerb.c]) AC_CONFIG_HEADER([config.h]) @@ -32,78 +32,200 @@ AC_STRUCT_TM # # kerberos5 enviroment # -KRB5_CPPFLAGS="" -KRB5_LDFLAGS="" krb5_config_command=krb5-config -DO_KRB5= +SPNEGO_SRCS="" AC_ARG_WITH(krb5, AC_HELP_STRING([--with-krb5=dir],[use krb5 in dir]), [ with_krb5="$withval" ]) if test "x$with_krb5" != "xno" ; then - AC_MSG_CHECKING([for Kerberos5 installation]) - if test "x$with_krb5" != "x"; then + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + ac_save_LIBS="$LIBS" + + if test -n "$with_krb5"; then if test -x "$with_krb5/bin/krb5-config"; then krb5_config_command="$with_krb5/bin/krb5-config" - else - # quick fix for OpenBSD installations where krb5-config is missing. - # OpenBSD uses Heimdal, so add openbsd-specific configuration - # libs for Heimdal - KRB5_CPPFLAGS="-I$with_krb5/include" - KRB5_LDFLAGS="-L$with_krb5/lib -lgssapi -lkrb5 -lasn1 -ldes -lcrypt" + else krb5_config_command="" fi fi - if test -n "$krb5_config_command"; then - KRB5_CPPFLAGS=`$krb5_config_command --cflags gssapi 2>/dev/null` - KRB5_LDFLAGS=`$krb5_config_command --libs gssapi 2>/dev/null` + dnl + dnl find header files + dnl + + if test -z "$KRB5_CPPFLAGS"; then + TMP_KRB5_CPPFLAGS="" + if test -n "$krb5_config_command"; then + TMP_KRB5_CPPFLAGS=`$krb5_config_command --cflags gssapi 2>/dev/null` + fi + if test -z "$TMP_KRB5_CPPFLAGS"; then + TMP_KRB5_CPPFLAGS="-I$with_krb5/include" + fi + CPPFLAGS="$CPPFLAGS $TMP_KRB5_CPPFLAGS" + AC_CHECK_HEADERS(gssapi.h, + [ KRB5_CPPFLAGS="$TMP_KRB5_CPPFLAGS" ]) + if test -z "$KRB5_CPPFLAGS"; then + AC_CHECK_HEADERS(gssapi/gssapi.h, + [ KRB5_CPPFLAGS="$TMP_KRB5_CPPFLAGS" ]) + fi + CPPFLAGS="$ac_save_CPPFLAGS" + fi + + dnl + dnl find libraries + dnl + + if test -z "$KRB5_LDFLAGS" -a -n "$krb5_config_command"; then + TMP_KRB5_LDFLAGS=`$krb5_config_command --libs gssapi 2>/dev/null` + if test -n "$TMP_KRB5_LDFLAGS"; then + LIBS="$LIBS $TMP_KRB5_LDFLAGS $LIB_resolv" + AC_CHECK_LIB(krb5, krb5_init_context, + [ KRB5_LDFLAGS="$TMP_KRB5_LDFLAGS" ]) + LIBS="$ac_save_LIBS" + fi fi - if test "x$KRB5_LDFLAGS" = "x"; then + + if test -z "$KRB5_LDFLAGS"; then + #try MIT + TMP_KRB5_LDFLAGS="-L$with_krb5/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" + LIBS="$LIBS $TMP_KRB5_LDFLAGS $LIB_resolv" + AC_CHECK_LIB(krb5, krb5_init_context, [ KRB5_LDFLAGS="$TMP_KRB5_LDFLAGS" ]) + LIBS="$ac_save_LIBS" + fi + + if test -z "$KRB5_LDFLAGS"; then + #Try Heimdal + TMP_KRB5_LDFLAGS="-L$with_krb5/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt" + LIBS="$LIBS $TMP_KRB5_LDFLAGS $LIB_resolv" + AC_CHECK_LIB(krb5, krb5_init_context, [ KRB5_LDFLAGS="$TMP_KRB5_LDFLAGS" ]) + LIBS="$ac_save_LIBS" + fi + + if test -z "$KRB5_LDFLAGS"; then + #Try Heimdal on OpenBSD + TMP_KRB5_LDFLAGS="-L$with_krb5/lib -lgssapi -lkrb5 -lasn1 -ldes -lcrypto" + LIBS="$LIBS $TMP_KRB5_LDFLAGS $LIB_resolv" + AC_CHECK_LIB(krb5, krb5_init_context, [ KRB5_LDFLAGS="$TMP_KRB5_LDFLAGS" ]) + LIBS="$ac_save_LIBS" + fi + + if test -z "$KRB5_LDFLAGS"; then with_krb5=no - AC_MSG_RESULT(no) else - AC_MSG_RESULT(yes) + with_krb5=yes + AC_DEFINE(KRB5) - ac_save_CFLAGS=$CFLAGS - ac_save_LDFLAGS=$LDFLAGS - ac_save_LIBS=$LIBS - CFLAGS="$CFLAGS $KRB5_CPPFLAGS" - LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" - LIBS="$LIBS $LDFLAGS $LIB_resolv" + # check for Heimdal + have_heimdal="" + AC_MSG_CHECKING(whether we are using Heimdal) + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$KRB5_CPPFLAGS" + AC_TRY_COMPILE([#include ], + [ char *tmp = heimdal_version; ], + [ AC_MSG_RESULT(yes) + AC_DEFINE(HEIMDAL) + have_heimdal=yes ], + [ AC_MSG_RESULT(no) ]) + CFLAGS="$ac_save_CFLAGS" - AC_CHECK_LIB(krb5, krb5_init_context, [], [with_krb5=no]) +# If SPNEGO is supported by the gssapi libraries, we shouln't build our support. +# SPNEGO is supported as of Heimdal 0.7, and MIT 1.5. + gssapi_supports_spnego="" + AC_MSG_CHECKING(whether the GSSAPI libraries support SPNEGO) - if test "x$with_krb5" != "xno"; then - # check if krb5_cc_gen_new() is implemented by the krb5 library - AC_CHECK_FUNC(krb5_cc_gen_new, [AC_DEFINE(HAVE_KRB5_CC_GEN_NEW)]) + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$KRB5_CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS=$KRB5_LDFLAGS - # check for Heimdal - AC_MSG_CHECKING(whether we are using Heimdal) - AC_TRY_COMPILE([#include ], - [ char *tmp = heimdal_version; ], - [ AC_MSG_RESULT(yes) - AC_DEFINE(HEIMDAL) ], - [ AC_MSG_RESULT(no) ]) - fi + AC_TRY_RUN([ +#include +#include +#ifdef HEIMDAL +#include +#else +#include +#endif +int main(int argc, char** argv) +{ + OM_uint32 major_status, minor_status; + gss_OID_set mech_set; + gss_OID_desc spnego_oid_desc = {6, (void *)"\x2b\x06\x01\x05\x05\x02"}; + int SPNEGO = 0; + + major_status = gss_indicate_mechs(&minor_status, &mech_set); + if (GSS_ERROR(major_status)) + return 1; + else { + unsigned int i; + for (i=0; i < mech_set->count && !SPNEGO; i++) { + gss_OID tmp_oid = &mech_set->elements[i]; + if (tmp_oid->length == spnego_oid_desc.length && + !memcmp(tmp_oid->elements, spnego_oid_desc.elements, + tmp_oid->length)) { + SPNEGO = 1; + break; + } + } + gss_release_oid_set(&minor_status, &mech_set); + return (!SPNEGO); + } +}], + [ if test $? -eq 0; then + AC_MSG_RESULT(yes) + AC_DEFINE(GSSAPI_SUPPORTS_SPNEGO) + gssapi_supports_spnego=yes + else + AC_MSG_RESULT(no) + fi], + [AC_MSG_RESULT(no)]) - CFLAGS=$ac_save_CFLAGS - LDFLAGS=$ac_save_LDFLAGS - LIBS=$ac_save_LIBS - AC_DEFINE(KRB5) - DO_KRB5=yes + CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + + if test -z "$gssapi_supports_spnego"; then + if test -n "$have_heimdal"; then SPNEGO_SRCS="\ + spnegokrb5/asn1_MechType.c \ + spnegokrb5/asn1_MechTypeList.c \ + spnegokrb5/asn1_ContextFlags.c \ + spnegokrb5/asn1_NegTokenInit.c \ + spnegokrb5/asn1_NegTokenTarg.c \ + spnegokrb5/init_sec_context.c \ + spnegokrb5/accept_sec_context.c \ + spnegokrb5/encapsulate.c \ + spnegokrb5/decapsulate.c \ + spnegokrb5/external.c" + else SPNEGO_SRCS="\ + spnegokrb5/asn1_MechType.c \ + spnegokrb5/asn1_MechTypeList.c \ + spnegokrb5/asn1_ContextFlags.c \ + spnegokrb5/asn1_NegTokenInit.c \ + spnegokrb5/asn1_NegTokenTarg.c \ + spnegokrb5/der_get.c \ + spnegokrb5/der_put.c \ + spnegokrb5/der_free.c \ + spnegokrb5/der_length.c \ + spnegokrb5/der_copy.c \ + spnegokrb5/timegm.c \ + spnegokrb5/init_sec_context.c \ + spnegokrb5/accept_sec_context.c \ + spnegokrb5/encapsulate.c \ + spnegokrb5/decapsulate.c \ + spnegokrb5/external.c" + fi + fi fi fi AC_SUBST(KRB5_CPPFLAGS) AC_SUBST(KRB5_LDFLAGS) -AC_SUBST(DO_KRB5) +AC_SUBST(SPNEGO_SRCS) # # Kerberos4 enviroment # -KRB4_CPPFLAGS="" -KRB4_LDFLAGS="" AC_ARG_WITH(krb4, AC_HELP_STRING([--with-krb4=dir], [use krb4 in dir]), @@ -124,7 +246,7 @@ if test "x$with_krb4" != "xno"; then else KRB4_CPPFLAGS=`krb4-config --cflags krb4 2>/dev/null` KRB4_LDFLAGS=`krb4-config --libs krb4 2>/dev/null` - if test "x$KRB4_LDFLAGS" = "x"; then + if test "x$KRB4_LDFLAGS" = "x" -a -n "$krb5_config_command"; then KRB4_CPPFLAGS=`$krb5_config_command --cflags krb4 2>/dev/null` KRB4_LDFLAGS=`$krb5_config_command --libs krb4 2>/dev/null` if test $? -ne 0; then @@ -193,37 +315,15 @@ AC_ARG_WITH(apache, AC_HELP_STRING([--with-apache=dir],[use apache in dir]), [ with_apache="$withval" ]) -AC_MSG_CHECKING([for Apache installation]) - -APXS="apxs" -HTTPD="httpd" -if test "x$with_apache" != "x"; then - if test ! -x "$with_apache/bin/httpd" -o ! -x "$with_apache/bin/apxs"; then - AC_MSG_ERROR([failed to find apache files in $with_apache]) - fi - APXS="$with_apache/bin/apxs" - if test ! -x $APXS; then - APXS="$with_apache/sbin/apxs" - fi - HTTPD="$with_apache/bin/httpd" - if test ! -x $HTTPD; then - HTTPD"$with_apache/sbin/httpd" - fi +AC_PATH_PROG([APXS], [apxs], [], [$with_apache/bin:$with_apache/sbin:$PATH]) +if test -z "$APXS"; then + AC_PATH_PROG([APXS], [apxs2], [], [$with_apache/bin:$with_apache/sbin:$PATH]) + if test -z "$APXS"; then + AC_MSG_ERROR([failed to find apache apxs executable]) + fi fi - -apache_v1_3=`$HTTPD -v | grep "^Server version: Apache/1.3."` -apache_v2_0=`$HTTPD -v | grep "^Server version: Apache/2.0."` -if test "x$apache_v1_3" = "x" -a "x$apache_v2_0" = "x"; then - AC_MSG_ERROR([cannot find valid apache installation on your system]) -fi -if test -n "$apache_v1_3"; then - AC_DEFINE(APXS1) -fi -AC_MSG_RESULT(yes) - AC_SUBST(APXS) -AC_CONFIG_FILES([Makefile - spnegokrb5/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT