X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_gssapi.git;a=blobdiff_plain;f=configure.ac;h=7065b64f0489887d7d1809c9957ab5dcb8cff95b;hp=be8c6e1c5f8d663c8893d284766aa5ea24ff5511;hb=13a936819b2f77140b641357052c972681fb4efb;hpb=0d0734893fa73d377649da3b342221c040d0ce47

diff --git a/configure.ac b/configure.ac
index be8c6e1..7065b64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([mod_auth_gssapi], [1.0.0], [simo@redhat.com])
+AC_INIT([mod_auth_gssapi], [1.3.2], [simo@redhat.com])
 AC_CONFIG_SRCDIR([src/mod_auth_gssapi.c])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
 # Checks for programs.
-AC_PROG_CC
+AC_PROG_CC_STDC
 
 AC_PROG_LIBTOOL
 AC_SUBST(INCLTDL)
@@ -53,7 +53,9 @@ PKG_CHECK_MODULES([OPENSSL], [openssl])
 AC_SUBST([OPENSSL_CFLAGS])
 AC_SUBST([OPENSSL_LIBS])
 
-AC_CHECK_HEADERS([gssapi/gssapi.h],,[AC_MSG_ERROR([Could not find GSSAPI headers])])
+AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h],
+                 ,[AC_MSG_ERROR([Could not find GSSAPI headers])])
+AC_CHECK_HEADERS([gssapi/gssapi_ntlmssp.h])
 AC_PATH_PROG(KRB5_CONFIG, krb5-config, failed)
 if test x$KRB5_CONFIG = xfailed; then
     AC_MSG_ERROR([Could not find GSSAPI development libraries])
@@ -65,13 +67,22 @@ AC_CHECK_LIB([gssapi_krb5], [gss_accept_sec_context], [],
              [AC_MSG_ERROR([GSSAPI library check failed])])
 AC_CHECK_FUNCS(gss_acquire_cred_from)
 AC_CHECK_FUNCS(gss_store_cred_into)
+AC_CHECK_FUNCS(gss_acquire_cred_with_password)
+AC_CHECK_FUNCS(gss_krb5_ccache_name)
 
 AC_SUBST([GSSAPI_CFLAGS])
 AC_SUBST([GSSAPI_LIBS])
 
-CFLAGS="`${APXS} -q CFLAGS` `${APR} --cflags` ${GSSAPI_CFLAGS} ${OPENSSL_CFLAGS} -I`${APXS} -q INCLUDEDIR` -I`${APR} --includes`"
-LIBS="`${APR} --link-libtool --libs` ${GSSAPI_LIBS} ${OPENSSL_LIBS}"
+MAG_CFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CPPFLAGS` `${APR} --cflags` ${GSSAPI_CFLAGS} ${OPENSSL_CFLAGS} -I`${APXS} -q INCLUDEDIR` `${APR} --includes`"
+MAG_LIBS="`${APR} --libs` ${GSSAPI_LIBS} ${OPENSSL_LIBS}"
+LIBTOOL="`${APXS} -q LIBTOOL`"
+MAG_LIBDIR="`${APXS} -q libexecdir`"
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_SUBST([MAG_CFLAGS])
+AC_SUBST([MAG_LIBS])
+AC_SUBST([LIBTOOL])
+AC_SUBST([MAG_LIBDIR])
+
+AC_CONFIG_FILES([Makefile src/Makefile src/asn1c/Makefile])
 
 AC_OUTPUT