X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_kerb.git;a=blobdiff_plain;f=configure.in;h=f49ec33cb99e007582a0cd0c82becb5dfc7c83d1;hp=4a838202c4dd36baf973f78266603c8a30008683;hb=HEAD;hpb=eb701ed73512b4f0f8da03d935eb3daa779f9825

diff --git a/configure.in b/configure.in
index 4a83820..f49ec33 100644
--- a/configure.in
+++ b/configure.in
@@ -1,19 +1,13 @@
-# 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_CONFIG_SRCDIR([src/mod_auth_kerb.c])
+AC_INIT(mod_auth_gssapi, 1.0, 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)
+AC_PROG_INSTALL
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -24,122 +18,118 @@ 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
 #
-krb5_config_command=krb5-config
 SPNEGO_SRCS=""
 
-AC_ARG_WITH(krb5,
-  AC_HELP_STRING([--with-krb5=dir],[use krb5 in dir]),
-  [ with_krb5="$withval" ])
+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_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"; 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 -z "$KRB5_LDFLAGS"; then
-     #try MIT
-     TMP_KRB5_LDFLAGS="-L$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="-L$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 "$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
-     #Try Heimdal on OpenBSD
-     TMP_KRB5_LDFLAGS="-L$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 "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
+fi
+LIBS="$LIBS $TMP_GSS_LDFLAGS"
+AC_CHECK_LIB(
+	[gssapi_krb5], gss_accept_sec_context,
+ 	[found_gssapi=yes
+		LIBS="-lgssapi_krb5 $LIBS"],
+	[AC_CHECK_LIB(gssapi, gss_accept_sec_context, [ found_gssapi=yes
+	 	LIBS="$LIBS -lgssapi"],
+		[LIBS="$ac_save_LIBS"])])
+if test -z "$found_gssapi"; then
+   AC_MSG_ERROR([failed to find a GSS-API library])
+fi
 
-  if test -z "$KRB5_LDFLAGS"; then
-     with_krb5=no
-  else
-     with_krb5=yes
-     AC_DEFINE(KRB5)
+# 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)
 
-     # 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"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$GSS_CPPFLAGS"
 
-     if test -n "$have_heimdal"; then
-	SPNEGO_SRCS="\
-		spnegokrb5/init_sec_context.c      \
-		spnegokrb5/accept_sec_context.c    \
-		spnegokrb5/encapsulate.c           \
-		spnegokrb5/decapsulate.c           \
-		spnegokrb5/external.c"
-     else
-	SPNEGO_SRCS="\
+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
+     AC_TRY_RUN([
+#include <string.h>
+#include <gssapi.h>
+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,1,[GSS-API implementation has its own 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     \
@@ -156,99 +146,12 @@ if test "x$with_krb5" != "xno" ; then
         	spnegokrb5/encapsulate.c           \
         	spnegokrb5/decapsulate.c           \
         	spnegokrb5/external.c"
-     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" != "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,
@@ -257,9 +160,15 @@ 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)
+AC_SUBST(PACKAGE_VERSION)
+AC_SUBST(PACKAGE_TARNAME)
+
 
 AC_CONFIG_FILES([Makefile])