X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_kerb.cvs%2F.git;a=blobdiff_plain;f=configure.in;fp=configure.in;h=a189bf89a963b00b7068d6bcfd9b023dfb708ba3;hp=b00c43c12f050c2a1bee81e6b205763ffcb9578a;hb=5e863ddff6ef99a59acfb3c41f0b86ebc1468be7;hpb=7c92ff8cae4ec80da12dec0304b4fcef3fc30e14 diff --git a/configure.in b/configure.in index b00c43c..a189bf8 100644 --- a/configure.in +++ b/configure.in @@ -1,20 +1,14 @@ # Process this file with autoconf to produce a configure script. AC_REVISION($Revision$) AC_PREREQ(2.57) -AC_INIT(mod_auth_kerb, 5.4, modauthkerb-developers@lists.sourceforge.net) -AC_CONFIG_SRCDIR([src/mod_auth_kerb.c]) +AC_INIT(mod_auth_gssapi, 0.1, modauthkerb-developers@lists.sourceforge.net) +AC_CONFIG_SRCDIR([mod_auth_gssapi.c]) AC_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lresolv': -LIB_resolv="" -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]) @@ -24,149 +18,76 @@ AC_CHECK_HEADERS([limits.h netdb.h stddef.h stdlib.h string.h unistd.h]) AC_TYPE_SIZE_T AC_STRUCT_TM -# Checks for library functions. -#AC_FUNC_MALLOC -#AC_FUNC_MEMCMP -#AC_CHECK_FUNCS([gethostbyname memset putenv strcasecmp strchr strdup strerror]) - # -# kerberos5 enviroment +# GSS-API enviroment # SPNEGO_SRCS="" -AC_ARG_WITH(krb5, - AC_HELP_STRING([--with-krb5=dir],[use krb5 in dir]), - [ with_krb5="$withval" ]) - -if test "x$with_krb5" = "xyes" ; then - with_krb5="" +AC_ARG_WITH(gss, + AC_HELP_STRING([--with-gss=dir],[use gss in dir]), + [ with_gss="$withval" ]) +if test "x$with_gss" = "xyes" ; then + with_gss="" fi -if test "x$with_krb5" != "xno" ; then - - AC_PATH_PROG(krb5_config_command,krb5-config,:,[$PATH:/usr/kerberos/bin:/usr/krb5/bin]) - if test $krb5_config_command = : ; then - AC_MSG_ERROR(krb5-config not found) - fi - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" - ac_save_LIBS="$LIBS" +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 - fi - - 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" -a -n "with_krb5"; 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$with_krb5"="x"; then - tmp_lf_inc="" - else - tmp_lf_inc="-L" - fi - if test -z "$KRB5_LDFLAGS"; then - #try MIT - TMP_KRB5_LDFLAGS="$tmp_lf_inc$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="$tmp_lf_inc$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="$tmp_lf_inc$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 "$GSS_CPPFLAGS"; then + TMP_GSS_CPPFLAGS="" + if test -n "with_gss"; then + TMP_GSS_CPPFLAGS="-I$with_gss/include" + fi + CPPFLAGS="$CPPFLAGS $TMP_GSS_CPPFLAGS" + AC_CHECK_HEADERS(gssapi.h, + [ GSS_CPPFLAGS="$TMP_GSS_CPPFLAGS" ]) + if test -z "$GSS_CPPFLAGS"; then + AC_CHECK_HEADERS(gssapi/gssapi.h, + [ GSS_CPPFLAGS="$TMP_GSS_CPPFLAGS" ]) + fi + CPPFLAGS="$ac_save_CPPFLAGS" +fi - if test -z "$KRB5_LDFLAGS"; then - with_krb5=no - else - AC_DEFINE(KRB5) - AC_CHECK_LIB(krb5, - krb5_cc_new_unique, - [ AC_DEFINE(HAVE_KRB5_CC_NEW_UNIQUE) ]) +#if test "x$with_gss"="x"; then +# tmp_lf_inc="" +# else +# tmp_lf_inc="-L" +#fi +if test -z "$GSS_LDFLAGS"; then + TMP_GSS_LDFLAGS="" + if test -n "$with_gss"; then +# XXX think about lib64, etc + TMP_GSS_LDFLAGS="-L $with_gss/lib" + fi - # 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" + LIBS="$LIBS $TMP_GSS_LDFLAGS" + AC_CHECK_LIB(gssapi, gss_accept_sec_context, [ GSS_LDFLAGS="$TMP_GSS_LDFLAGS" ]) + LIBS="$ac_save_LIBS" +fi +if test -z "$GSS_LDFLAGS"; then + AC_MSG_ERROR([failed to find a GSS-API library]) +fi # 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) +gssapi_supports_spnego="" +AC_MSG_CHECKING(whether the GSSAPI libraries support SPNEGO) - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$KRB5_CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" - if test -n "$with_krb5"; then - LDFLAGS="$KRB5_LDFLAGS -Wl,-rpath -Wl,$with_krb5/lib" - else - LDFLAGS="$KRB5_LDFLAGS" - fi +ac_save_CFLAGS="$CFLAGS" +CFLAGS="$GSS_CPPFLAGS" + +ac_save_LDFLAGS=$LDFLAGS +LDFLAGS="$GSS_LDFLAGS" +# to make sure the testing binary can be launched: +if test -n "$with_gss"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$with_gss/lib" +fi +#XXX schovat nebo dat primo do LDFLAGS: +LIBS=-lgssapi AC_TRY_RUN([ #include -#include -#ifdef HEIMDAL #include -#else -#include -#endif int main(int argc, char** argv) { OM_uint32 major_status, minor_status; @@ -192,31 +113,21 @@ int main(int argc, char** argv) 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" - - 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="\ + [ 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" + +if test -z "$gssapi_supports_spnego"; then + SPNEGO_SRCS="\ spnegokrb5/asn1_MechType.c \ spnegokrb5/asn1_MechTypeList.c \ spnegokrb5/asn1_ContextFlags.c \ @@ -233,104 +144,12 @@ int main(int argc, char** argv) spnegokrb5/encapsulate.c \ spnegokrb5/decapsulate.c \ spnegokrb5/external.c" - fi - fi - fi fi -AC_SUBST(KRB5_CPPFLAGS) -AC_SUBST(KRB5_LDFLAGS) +AC_SUBST(GSS_CPPFLAGS) +AC_SUBST(GSS_LDFLAGS) AC_SUBST(SPNEGO_SRCS) # -# Kerberos4 enviroment -# - -AC_ARG_WITH(krb4, - AC_HELP_STRING([--with-krb4=dir], [use krb4 in dir]), - [ with_krb4="$withval" ]) - -if test "x$with_krb4" = "xyes" ; then - with_krb4="" -fi - -if test "x$with_krb4" != "xno"; then - AC_MSG_CHECKING([for Kerberos4 installation]) - if test "x$with_krb4" != "x"; then - if test -x "$with_krb4/bin/krb4-config"; then - KRB4_CPPFLAGS=`$with_krb4/bin/krb4-config --cflags krb4 2>/dev/null` - KRB4_LDFLAGS=`$with_krb4/bin/krb4-config --libs krb4 2>/dev/null` - elif test -x "$with_krb4/bin/krb5-config"; then - KRB4_CPPFLAGS=`$with_krb4/bin/krb5-config --cflags krb4 2>/dev/null` - KRB4_LDFLAGS=`$with_krb4/bin/krb5-config --libs krb4 2>/dev/null` - else - AC_MSG_ERROR([failed to find krb4-config or krb5-config in $with_krb4/bin]) - fi - 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" -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 - with_krb4=no - AC_MSG_RESULT(no) - else - 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" - -# 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 - 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 - -# # Apache enviroment # AC_ARG_WITH(apache,