X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.in;h=96f93309d5ef05c537d3d3b633ad87b08b29eaed;hb=7cbd50dab4c420858f650f821538869787daea61;hp=9b39138c23d6b6da26c4e60e055bb6e7a8e216b4;hpb=45a3fc1f8130947837a9c112deb822e7808cd2c5;p=mod_auth_kerb.git

diff --git a/configure.in b/configure.in
index 9b39138..96f9330 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.57)
-AC_INIT(mod_auth_kerb, 0.5-rc6, modauthkerb-developers@lists.sourceforge.net)
+AC_INIT(mod_auth_kerb, 5.3, modauthkerb-developers@lists.sourceforge.net)
 AC_CONFIG_SRCDIR([src/mod_auth_kerb.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -132,23 +132,59 @@ if test "x$with_krb5" != "xno" ; then
      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.
+# SPNEGO is supported as of Heimdal 0.7, and MIT 1.5.
      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 <gssapi.h>],
-		       [ 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
+
+     ac_save_CFLAGS="$CFLAGS"
+     CFLAGS="$KRB5_CPPFLAGS"
+     ac_save_LDFLAGS="$LDFLAGS"
+     LDFLAGS=$KRB5_LDFLAGS
+
+     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="\
@@ -281,7 +317,10 @@ AC_ARG_WITH(apache,
 
 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])
+   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)