# 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, 0.5-rc6, modauthkerb-developers@lists.sourceforge.net)
AC_CONFIG_SRCDIR([src/mod_auth_kerb.c])
AC_CONFIG_HEADER([config.h])
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"
+ LIBS="$LIBS $TMP_KRB5_LDFLAGS $LIB_resolv"
AC_CHECK_LIB(krb5, krb5_init_context,
[ KRB5_LDFLAGS="$TMP_KRB5_LDFLAGS" ])
LIBS="$ac_save_LIBS"
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 <krb5.h>],
[ char *tmp = heimdal_version; ],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(HEIMDAL) ],
+ AC_DEFINE(HEIMDAL) ]
+ have_heimdal=yes,
[ AC_MSG_RESULT(no) ])
CFLAGS="$ac_save_CFLAGS"
- 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"
+ 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
AC_SUBST(KRB5_CPPFLAGS)
AC_HELP_STRING([--with-apache=dir],[use apache in dir]),
[ with_apache="$withval" ])
-AC_MSG_CHECKING([for Apache installation])
-HTTPD=""
-APXS=""
-if test -n "$with_apache"; then
- apache_dirs="$with_apache/sbin $with_apache/bin"
-else
-# XXX the PATH variable should be used rather
- apache_dirs="/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin"
-fi
-
-for dir in $apache_dirs; do
- if test -z "$HTTPD"; then
- for name in apache2 apache httpd; do
- if test -x "$dir/$name"; then
- HTTPD="$dir/$name"
- break
- fi
- done
- fi
- if test -z "$APXS"; then
- for name in apxs2 apxs; do
- if test -x "$dir/$name"; then
- APXS="$dir/$name"
- break
- fi
- done
- fi
-done
-
-if test -z "$HTTPD"; then
- AC_MSG_ERROR([failed to find apache httpd executable])
-fi
+AC_PATH_PROG([APXS], [apxs], [], [$with_apache/bin:$with_apache/sbin:$PATH])
if test -z "$APXS"; then
AC_MSG_ERROR([failed to find apache apxs executable])
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])