X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c7243fed4a47330d70f42fcbc47e5ad15b15f839;hb=798ab2c61f44443549520f62bb8cc8c87ff4e33c;hp=85c72ae49ed64d4be989ac4cc053b30433d3625a;hpb=82b32d097d2e3f4e5b9c9f6c87a5ca016139d562;p=mod_auth_gssapi.git

diff --git a/configure.ac b/configure.ac
index 85c72ae..c7243fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ([2.69])
-AC_INIT([mod_auth_gssapi], [0.0.1], [simo@redhat.com])
+AC_INIT([mod_auth_gssapi], [1.0.1], [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])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
 
 # Checks for programs.
 AC_PROG_CC
@@ -31,24 +31,8 @@ AC_ARG_WITH([apxs],
             [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],
@@ -65,6 +49,10 @@ AS_IF([test "x${APR}" != "x" -a -x "${APR}"],
        AC_SUBST(APR_LDFLAGS)],
       [AC_MSG_FAILURE(["apr-1-config not found. Use --with-apr"])])
 
+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_PATH_PROG(KRB5_CONFIG, krb5-config, failed)
 if test x$KRB5_CONFIG = xfailed; then
@@ -81,6 +69,9 @@ AC_CHECK_FUNCS(gss_store_cred_into)
 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}"
+
 AC_CONFIG_FILES([Makefile src/Makefile])
 
 AC_OUTPUT