X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=ea8c2e7163aa43332af8b396428a4fd53b854ee5;hb=95bd55d2a2f8075711ee107d7e53b5725329b5c7;hp=1fb0447b09d3051ac75a0bdc335d8a44f02c296c;hpb=f1ca2dc9bc911b94aa9a9814a8feb2fd6cdab015;p=mod_auth_kerb.cvs%2F.git diff --git a/configure.in b/configure.in index 1fb0447..ea8c2e7 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-rc2, kouril@users.sourceforge.net) +AC_PREREQ(2.57) +AC_INIT(mod_auth_kerb, 5.0-rc7, modauthkerb-developers@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/mod_auth_kerb.c]) AC_CONFIG_HEADER([config.h]) @@ -16,12 +16,12 @@ AC_CHECK_LIB([resolv], [main], [LIB_resolv=-lresolv]) AC_SUBST(LIB_resolv) # Checks for header files. -#AC_HEADER_STDC -#AC_CHECK_HEADERS([limits.h netdb.h stddef.h stdlib.h string.h unistd.h]) +AC_HEADER_STDC +AC_CHECK_HEADERS([limits.h netdb.h stddef.h stdlib.h string.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. #AC_C_CONST -#AC_TYPE_SIZE_T +AC_TYPE_SIZE_T AC_STRUCT_TM # Checks for library functions. @@ -32,59 +32,164 @@ AC_STRUCT_TM # # kerberos5 enviroment # -KRB5_CPPFLAGS="" -KRB5_LDFLAGS="" krb5_config_command=krb5-config +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 - if test ! -x "$with_krb5/bin/krb5-config"; then - AC_MSG_ERROR([failed to find krb5-config in $with_krb5/bin]) + 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 + krb5_config_command="" fi - krb5_config_command="$with_krb5/bin/krb5-config" fi - KRB5_CPPFLAGS=`$krb5_config_command --cflags gssapi 2>/dev/null` - KRB5_LDFLAGS=`$krb5_config_command --libs gssapi 2>/dev/null` - if test "x$KRB5_LDFLAGS" = "x"; then - with_krb5=no - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) + dnl + dnl find header files + dnl - 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" + 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 - AC_CHECK_LIB(krb5, krb5_init_context, [], [with_krb5=no]) + dnl + dnl find libraries + dnl - 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)]) + 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 -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 - # check if you're using Heimdal - # ... + if test -z "$KRB5_LDFLAGS"; then + with_krb5=no + else + with_krb5=yes + AC_DEFINE(KRB5) + + # 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" + +# If SPNEGO is supported by the gssapi libraries, we shouln't build our support. +# SPNEGO is supported as of Heimdal 0.7, don't know about MIT. + gssapi_supports_spnego="" + AC_MSG_CHECKING(whether the GSSAPI libraries support SPNEGO) + # Invent some better test + if test "$have_heimdal" = yes; then + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$KRB5_CPPFLAGS" + AC_TRY_COMPILE([#include ], + [ gss_OID oid = GSS_SPNEGO_MECHANISM; ], + [ AC_MSG_RESULT(yes) + AC_DEFINE(GSSAPI_SUPPORTS_SPNEGO) + gssapi_supports_spnego=yes ], + [ AC_MSG_RESULT(no) ]) + CFLAGS="$ac_save_CFLAGS" + else + AC_MSG_RESULT(no) fi - CFLAGS=$ac_save_CFLAGS - LDFLAGS=$ac_save_LDFLAGS - LIBS=$ac_save_LIBS + 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(SPNEGO_SRCS) # # Kerberos4 enviroment # -KRB4_CPPFLAGS="" -KRB4_LDFLAGS="" AC_ARG_WITH(krb4, AC_HELP_STRING([--with-krb4=dir], [use krb4 in dir]), @@ -105,9 +210,13 @@ 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 + KRB4_CPPFLAGS="" + KRB4_LDFLAGS="" + fi fi fi if test "x$KRB4_LDFLAGS" = "x"; then @@ -117,41 +226,52 @@ if test "x$with_krb4" != "xno"; then AC_MSG_RESULT(yes) ac_save_CFLAGS=$CFLAGS + ac_save_CPPFLAGS=$CPPFLAGS ac_save_LDFLAGS=$LDFLAGS ac_save_LIBS=$LIBS CFLAGS="$CFLAGS $KRB4_CPPFLAGS" + CPPFLAGS="$CFLAGS $KRB4_CPPFLAGS" LDFLAGS="$LDFLAGS $KRB4_LDFLAGS" LIBS="$LIBS $LDFLAGS $LIB_resolv" - - AC_CHECK_LIB(krb4, krb_get_pw_in_tkt, [], [with_krb4=no]) + +# if not found krb.h suppose it's in the kerberosIV subdirectory + AC_CHECK_HEADER(krb.h, , with_krb4=no) if test "x$with_krb4" = "xno"; then - AC_CHECK_LIB(krb, krb_get_pw_in_tkt, [with_krb4=yes], - [with_krb4=no - KRB4_CPPFLAGS="" - KRB4_LDFLAGS=""]) + KRB4_CPPFLAGS="$KRB4_CPPFLAGS ${KRB4_CPPFLAGS}/kerberosIV" +# second run of AC_CHECK_HEADER for the same library returns the cached +# result created by previous run :-( + AC_CHECK_HEADER(kerberosIV/krb.h, with_krb4=yes, + [ with_krb4=no + KRB4_CPPFLAGS="" + KRB4_LDFLAGS=""]) + fi + + if test "x$with_krb4" != "xno"; then + AC_CHECK_LIB(krb4, krb_get_pw_in_tkt, [], [with_krb4=no]) + if test "x$with_krb4" = "xno"; then + AC_CHECK_LIB(krb, krb_get_pw_in_tkt, [with_krb4=yes], + [with_krb4=no + KRB4_CPPFLAGS="" + KRB4_LDFLAGS=""]) + fi fi CFLAGS=$ac_save_CFLAGS + CPPFLAGS=$ac_save_CPPFLAGS LDFLAGS=$ac_save_LDFLAGS LIBS=$ac_save_LIBS + + AC_DEFINE(KRB4) fi fi +AC_SUBST(KRB4_CPPFLAGS) +AC_SUBST(KRB4_LDFLAGS) + if test "x$with_krb5" = "xno" -a "x$with_krb4" = "xno"; then AC_MSG_ERROR([No Kerberos enviroment found]) fi -AC_SUBST(KRB5_CPPFLAGS) -AC_SUBST(KRB5_LDFLAGS) -AC_SUBST(KRB4_CPPFLAGS) -AC_SUBST(KRB4_LDFLAGS) -if test "x$with_krb5" != "xno"; then - AC_DEFINE(KRB5) -fi -if test "x$with_krb4" != "xno"; then - AC_DEFINE(KRB4) -fi - # # Apache enviroment # @@ -159,31 +279,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" - HTTPD="$with_apache/bin/httpd" -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) +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 -AC_MSG_RESULT(yes) - AC_SUBST(APXS) -AC_CONFIG_FILES([Makefile - spnegokrb5/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT