AC_PREREQ([2.69])
-AC_INIT([mod_auth_gssapi], [0.0.1], [simo@redhat.com])
+AC_INIT([mod_auth_gssapi], [1.2.0], [simo@redhat.com])
AC_CONFIG_SRCDIR([src/mod_auth_gssapi.c])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC_STDC
AC_PROG_LIBTOOL
AC_SUBST(INCLTDL)
[AC_PATH_PROGS(APXS, [apxs2 apxs])])
AS_IF([test "x${APXS}" != "x" -a -x "${APXS}"],
[AC_MSG_NOTICE([apxs found at $APXS])
- APXS_CPPFLAGS=`${APXS} -q CFLAGS`
- AC_SUBST(APXS_CPPFLAGS)
- APXS_LDFLAGS=`${APXS} -q LDFLAGS_SHLIB`
- AC_SUBST(APXS_LDFLAGS)
- APXS_LIBS=`${APXS} -q LIBS_SHLIB`
- AC_SUBST(APXS_LIBS)
- APXS_INCLUDES=-I`${APXS} -q INCLUDEDIR`
- AC_SUBST(APXS_INCLUDES)
- APXS_CPPFLAGS_SHLIB=`${APXS} -q CFLAGS_SHLIB`
- AC_SUBST(APXS_CPPFLAGS_SHLIB)
- APXS_LD_SHLIB=`${APXS} -q LD_SHLIB`
- AC_SUBST(APXS_LD_SHLIB)
APXS_LIBEXECDIR=`${APXS} -q LIBEXECDIR`
- AC_SUBST(APXS_LIBEXECDIR)
- APXS_SYSCONFDIR=`${APXS} -q SYSCONFDIR`
- AC_SUBST(APXS_SYSCONFDIR)
- APXS_PREFIX=`${APXS} -q PREFIX`
- AC_SUBST(APXS_PREFIX)],
+ AC_SUBST(APXS_LIBEXECDIR)],
[AC_MSG_FAILURE(["apxs not found. Use --with-apxs"])])
AC_ARG_WITH([apr],
AC_SUBST(APR_LDFLAGS)],
[AC_MSG_FAILURE(["apr-1-config not found. Use --with-apr"])])
-AC_CHECK_HEADERS([gssapi/gssapi.h],,[AC_MSG_ERROR([Could not find GSSAPI headers])])
+PKG_CHECK_MODULES([OPENSSL], [openssl])
+AC_SUBST([OPENSSL_CFLAGS])
+AC_SUBST([OPENSSL_LIBS])
+
+AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h],
+ ,[AC_MSG_ERROR([Could not find GSSAPI headers])])
AC_PATH_PROG(KRB5_CONFIG, krb5-config, failed)
if test x$KRB5_CONFIG = xfailed; then
AC_MSG_ERROR([Could not find GSSAPI development libraries])
[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])
-AC_CONFIG_FILES([Makefile src/Makefile])
+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_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