Simplify configure.ac and makefile.am files

[mod_auth_gssapi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e65a44a..fe3ce9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 AC_PREREQ([2.69])
 AC_INIT([mod_auth_gssapi], [0.0.1], [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])
 
@@ -30,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],
@@ -80,6 +65,9 @@ AC_CHECK_FUNCS(gss_store_cred_into)
 AC_SUBST([GSSAPI_CFLAGS])
 AC_SUBST([GSSAPI_LIBS])
 
+CFLAGS="`${APXS} -q CFLAGS` `${APR} --cflags` ${GSSAPI_CFLAGS} -I`${APXS} -q INCLUDEDIR` -I`${APR} --includes`"
+LIBS="`${APR} --link-libtool --libs` ${GSSAPI_LIBS}"
+
 AC_CONFIG_FILES([Makefile src/Makefile])
 
 AC_OUTPUT