X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=b00c43c12f050c2a1bee81e6b205763ffcb9578a;hb=8cd1c3fe01d71282c52e3c2661f14024ddda08ea;hp=fc8a93ec4f2ee349fa68e6f0d7ba1e03f19e4c95;hpb=575dec83227dadc563ada2d9bdc980c5b2c67f3b;p=mod_auth_kerb.cvs%2F.git

diff --git a/configure.in b/configure.in
index fc8a93e..b00c43c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,300 +1,351 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Apache Kerberos Module,
-        alpha2,
-        modauthkerb-developers@lists.sourceforge.net,
-        mod_auth_kerb)
-AC_CANONICAL_HOST
-
-
-dnl OS specific options.
-case "$host" in
-*-*-netbsd*)
-	need_dash_r=1
-	;;
-*-*-solaris*)
-	need_dash_r=1
-	;;
-esac
-
-
-dnl Custom args we care about.
-AC_ARG_WITH(api,
-[  --with-api=API                      api to use (apache1, apache2)],
-[
-	case $withval in
-		'apache1')
-			ac_api=apache1
-			ac_apidefs="-DAPXS1"
-			;;
-		'apache2')
-			ac_api=apache2
-			ac_apidefs="-DAPXS2"
-			;;
-		*)
-			AC_ERROR(You can only specify apache1 or apache2.)
-			;;
-	esac
-]
-)
-
-AC_ARG_WITH(apxs,
-[  --with-apxs=PATH                    path to apxs],
-[
-	if test -e $withval ; then
-		APXS="$withval"
-	else
-		AC_ERROR(Specified apxs path does not exist.)
-	fi
-]
-)
-
-AC_ARG_WITH(static,
-[  --with-static                       module is to be statically linked],
-[
-	ac_static="yes"
-]
-)
-
-AC_ARG_WITH(krb5,
-[  --with-krb5=DIR                     path to Kerberos 5 install],
-[
-	CFLAGS="$CFLAGS -I$withval/include -I$withval/include/kerberosIV"
-	CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/include/kerberosIV"
-	LDFLAGS="$LDFLAGS -L$withval/lib"
-	if test -n "${need_dash_r}"; then
-		LDFLAGS="$LDFLAGS -R$withval/lib"
-	fi
-]
-)
-
-AC_ARG_WITH(krb5-include,
-[    --with-krb5-include=DIR           include path to Kerberos 5 install],
-[
-	CFLAGS="$CFLAGS -I$withval -I$withval/kerberosIV"
-	CPPFLAGS="$CPPFLAGS -I$withval -I$withval/kerberosIV"
-]
-)
-
-AC_ARG_WITH(krb5-lib,
-[    --with-krb5-lib=DIR               lib path to Kerberos 5 install],
-[
-	LDFLAGS="$LDFLAGS -L$withval"
-	if test -n "${need_dash_r}"; then
-		LDFLAGS="$LDFLAGS -R$withval"
-	fi
-]
-)
-
-AC_ARG_ENABLE(krb5,
-[  --disable-krb5                      force disabling of krb5 support],
-[
-	if test "$enable_krb5" = "no" ; then
-		ac_krb5_disable="yes"
-	fi
-],
-)
-
-AC_ARG_WITH(krb4,
-[  --with-krb4=DIR                     path to Kerberos 4 install],
-[
-	CFLAGS="$CFLAGS -I$withval/include"
-	CPPFLAGS="$CPPFLAGS -I$withval/include"
-	LDFLAGS="$LDFLAGS -L$withval/lib"
-	if test -n "${need_dash_r}"; then
-		LDFLAGS="$LDFLAGS -R$withval/lib"
-	fi
-]
-)
-
-AC_ARG_WITH(krb4-include,
-[    --with-krb4-include=DIR           include path to Kerberos 4 install],
-[
-	CFLAGS="$CFLAGS -I$withval"
-	CPPFLAGS="$CPPFLAGS -I$withval"
-]
-)
-
-AC_ARG_WITH(krb4-lib,
-[    --with-krb4-lib=DIR               lib path to Kerberos 4 install],
-[
-	LDFLAGS="$LDFLAGS -L$withval"
-	if test -n "${need_dash_r}"; then
-		LDFLAGS="$LDFLAGS -R$withval"
-	fi
-]
-)
-
-AC_ARG_ENABLE(krb4,
-[  --disable-krb4                      force disabling of krb4 support],
-[
-	if test "$enable_krb4" = "no" ; then
-		ac_krb4_disable="yes"
-	fi
-],
-)
-
-AC_ARG_WITH(gssapi,
-[  --with-gssapi=DIR                   path to GSSAPI install],
-[
-	CFLAGS="$CFLAGS -I$withval/include -I$withval/include/gssapi"
-	CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/include/gssapi"
-	LDFLAGS="$LDFLAGS -L$withval/lib"
-	if test -n "${need_dash_r}"; then
-		LDFLAGS="$LDFLAGS -R$withval/lib"
-	fi
-]
-)
-
-AC_ARG_WITH(gssapi-include,
-[    --with-gssapi-include=DIR         include path to GSSAPI install],
-[
-	CFLAGS="$CFLAGS -I$withval -I$withval/gssapi"
-	CPPFLAGS="$CPPFLAGS -I$withval -I$withval/gssapi"
-]
-)
-
-AC_ARG_WITH(gssapi-lib,
-[    --with-gssapi-lib=DIR             lib path to GSSAPI install],
-[
-	LDFLAGS="$LDFLAGS -L$withval"
-	if test -n "${need_dash_r}"; then
-		LDFLAGS="$LDFLAGS -R$withval"
-	fi
-]
-)
-
-AC_ARG_ENABLE(gssapi,
-[  --disable-gssapi                    force disabling of gssapi support],
-[
-	if test "$enable_gssapi" = "no" ; then
-		ac_gssapi_disable="yes"
-	fi
-]
-)
-
-
-
-dnl Checks for programs.
+# 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_CONFIG_HEADER([config.h])
+
+# Checks for programs.
 AC_PROG_CC
 AC_PROG_MAKE_SET
-if test -z "$ac_static" ; then
-	AC_PATH_PROG(APXS, apxs)
-	if test -z "$APXS" ; then
-		echo "No apxs found.  Defaulting to static module generation."
-		ac_static="yes"
-	fi
-fi
 
+# 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)
 
-dnl Checks for libraries.
-if test -z "$ac_krb5_disable" ; then
-	AC_CHECK_LIB(krb5, krb5_get_in_tkt_with_password, [
-		ac_krb5="yes"
-		ac_krbdefs="-DKRB5"
-		ac_krblibs="-lkrb5"
-		AC_CHECK_LIB(k5crypto, krb5_string_to_key, [
-			ac_krblibs="$ac_krblibs -lk5crypto"
-		], [
-			AC_CHECK_LIB(crypto, krb5_string_to_key, [
-				ac_krblibs="$ac_krblibs -lcrypto"
-			], [
-				ac_krblibs=""
-			], "-lcom_err")
-		], "-lcom_err")
-		ac_krblibs="$ac_krblibs -lcom_err"
-		
-		if test -z "$ac_krb4_disable" ; then
-			if test -n "$ac_krblibs" ; then
-				AC_CHECK_LIB(krb4, krb_get_pw_in_tkt, [
-					ac_krb4="yes"
-					ac_krbdefs="$ac_krbdefs -DKRB4"
-					ac_krblibs="-lkrb4 $ac_krblibs"
-				],, $ac_krblibs)
-			fi
-		fi
-	],, "-lcom_err")
-fi
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([limits.h netdb.h stddef.h stdlib.h string.h unistd.h])
 
-if test -z "$ac_krb4_disable" -a -z "$ac_krb4" ; then
-	AC_CHECK_LIB(krb, krb_get_pw_in_tkt, [
-		ac_krb4="yes"
-		ac_krbdefs="-DKRB4"
-		ac_krblibs="$ac_krblibs -lkrb -lcom_err"
-	],, "-lcom_err")
-fi
+# Checks for typedefs, structures, and compiler characteristics.
+#AC_C_CONST
+AC_TYPE_SIZE_T
+AC_STRUCT_TM
 
-if test -z "$ac_krb4" -a -z "$ac_krb5" ; then
-	AC_ERROR(Neither Kerberos 5 nor 4 support available.)
-fi
+# Checks for library functions.
+#AC_FUNC_MALLOC
+#AC_FUNC_MEMCMP
+#AC_CHECK_FUNCS([gethostbyname memset putenv strcasecmp strchr strdup strerror])
 
+#
+# kerberos5 enviroment
+#
+SPNEGO_SRCS=""
 
-dnl Checks for header files.
-if test -n "$ac_krb5" ; then
-	AC_CHECK_HEADERS(krb5.h, [
-		ac_foundkrb5="yes"
-		break
-	])
+AC_ARG_WITH(krb5,
+  AC_HELP_STRING([--with-krb5=dir],[use krb5 in dir]),
+  [ with_krb5="$withval" ])
 
-	if test -z "$ac_foundkrb5" ; then
-		AC_MSG_RESULT(krb5.h not found... removing krb5 support.)
-		ac_krb5=""
-	fi
+if test "x$with_krb5" = "xyes" ; then
+  with_krb5=""
 fi
 
-if test -n "$ac_krb4" ; then
-	AC_CHECK_HEADERS(kerberosIV/krb.h krb.h, [
-		ac_foundkrb4="yes"
-		break
-	])
-
-	if test -z "$ac_foundkrb4" ; then
-		AC_MSG_RESULT(krb.h not found... removing krb4 support.)
-		ac_krb4=""
-	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"
+   
+  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 "$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) ])
+
+     # 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)
+		      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, and MIT 1.5.
+     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_TRY_RUN([
+#include <string.h>
+#include <krb5.h>
+#ifdef HEIMDAL
+#include <gssapi.h>
+#else
+#include <gssapi/gssapi.h>
+#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"
+
+     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)
 
-if test -z "$ac_krb4" -a -z "$ac_krb5" ; then
-	AC_ERROR(Neither Kerberos 5 nor 4 support available.)
-fi
+#
+# Kerberos4 enviroment
+#
 
+AC_ARG_WITH(krb4,
+  AC_HELP_STRING([--with-krb4=dir], [use krb4 in dir]),
+  [ with_krb4="$withval" ])
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-if test -z "$ac_api" ; then
-	if test -n "`$APXS -q bindir 2> /dev/null`" ; then
-		echo "API autodetected to be Apache 2.*"
-		ac_api=apache2
-		ac_apidefs="-DAPXS2"
-	else
-		echo "API autodetected to be Apache 1.*"
-		ac_api=apache1
-		ac_apidefs="-DAPXS1"
-	fi
+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)
 
-dnl Checks for library functions.
-
-
-dnl Last minute settings.
-LIBS="$LIBS $ac_krblibs"
-DEFS="$DEFS $ac_apidefs $ac_krbdefs"
-CFLAGS="$CFLAGS $DEFS"
 
+if test "x$with_krb5" = "xno" -a "x$with_krb4" = "xno"; then
+  AC_MSG_ERROR([No Kerberos enviroment found])
+fi
 
-dnl Create files necessary to compile mod_auth_kerb.
-if test "$ac_static" = "yes" ; then
-	echo ""
-	echo ""
-	echo "This module is to be built statically into Apache.  You will need"
-	echo "to place it into the appropriate location in the source tree and"
-	echo "compile Apache accordingly.  You can look at the online docs at"
-	echo "http://modauthkerb.sourceforge.net/ or README.static for more"
-	echo "information."
-	echo ""
-	echo ""
-else
-	AC_OUTPUT(Makefile)
-	AC_OUTPUT(src/Makefile)
+#
+# Apache enviroment
+#
+AC_ARG_WITH(apache,
+  AC_HELP_STRING([--with-apache=dir],[use apache in dir]),
+  [ with_apache="$withval" ])
+
+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_SUBST(APXS)
+
+AC_CONFIG_FILES([Makefile])
 
-exit 0
+AC_OUTPUT