X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=76da0fc01f0e796fff2a233454609bf6a2449f8d;hb=50bd29d18e08460c3a2eeed2c95ece18b8aa685a;hp=0cd9bcc42a034acf9e8c3cc20503440f55687d0b;hpb=c73c46260aff78170a43fd9d157161645b99301a;p=mod_auth_kerb.git

diff --git a/configure.in b/configure.in
index 0cd9bcc..76da0fc 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, 0.5-rc6, modauthkerb-developers@lists.sourceforge.net)
 AC_CONFIG_SRCDIR([src/mod_auth_kerb.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -81,7 +81,7 @@ if test "x$with_krb5" != "xno" ; then
   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"
@@ -119,33 +119,49 @@ if test "x$with_krb5" != "xno" ; then
      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)
@@ -244,52 +260,10 @@ AC_ARG_WITH(apache,
   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])