AC_PREREQ([2.50])
-AC_INIT([shibboleth], [1.1], [mace-shib-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [1.3], [shibboleth-users@internet2.edu], [shibboleth])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(shibboleth, 1.1)
+AM_INIT_AUTOMAKE([shibboleth],[1.3])
sinclude(acx_pthread.m4)
sinclude(acx_rpctest.m4)
-AC_PROG_CC([gcc3 gcc cc])
-AC_PROG_CXX([g++3 g++ c++ CC])
+AC_ARG_ENABLE(debug,
+ AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)
+]),
+ enable_debug=$enableval, enable_debug=no)
+
+if test "$enable_debug" = "yes" ; then
+ GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
+ GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
+else
+ GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
+ GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
+fi
+
+AC_PROG_CC([gcc gcc3 cc])
+AC_PROG_CXX([g++ g++3 c++ CC])
+
+if test "$GCC" = "yes" ; then
+ CFLAGS="$GCC_CFLAGS"
+ CXXFLAGS="$GCC_CXXFLAGS"
+fi
+
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_LANG(C++)
+# C++ requirements
+AC_CXX_REQUIRE_STL
+AC_CXX_NAMESPACES
+
+AC_LANG(C)
+
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
# Checks for library functions.
AC_FUNC_STRFTIME
+AC_FUNC_STRERROR_R
AC_CHECK_FUNCS([strchr strdup strstr gmtime_r strtok_r strcasecmp])
AC_CHECK_HEADERS([dlfcn.h])
-# C++ requirements
-AC_CXX_REQUIRE_STL
-AC_CXX_NAMESPACES
-
-
# old_LIBS="$LIBS"
# AC_SEARCH_LIBS(xdr_uint64_t,nsl,,
# [CFLAGS="$CFLAGS -DNEED_XDR_LONGLONG"
CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
fi
-# Test RPC now -- deal with it later
+# Test RPC now -- finish dealing with it later
+AC_ARG_ENABLE(native-rpc,
+ AC_HELP_STRING([--enable-native-rpc], [use the OS-supplied Sun RPC library, default is NO, except Linux]),
+ [ if test "x$enableval" = "x" ; then
+ NATIVE_RPC=yes
+ else
+ NATIVE_RPC="$enableval"
+ fi
+ ], [ NATIVE_RPC=no ])
ACX_RPCTEST([rpctest="yes"],[rpctest="no"])
-
-# Determine whether to use TCP for the shar socket
-AC_ARG_ENABLE([tcp],
- AC_HELP_STRING([--enable-tcp], [enable the SHAR to use a TCP socket on Unix]),
- [tcp_enabled=$enableval], [tcp_enabled=default])
-
-if test "x$tcp_enabled" = "x" ; then
- tcp_enabled=yes
+AC_MSG_NOTICE([does the native Sun RPC library support svcfd_create...$rpctest])
+if test $NATIVE_RPC = "no"; then
+ case "${host}" in
+ *-*-linux*)
+ if test $rpctest = "yes"; then
+ AC_MSG_WARN([embedded Sun RPC library does not support Linux])
+ NATIVE_RPC="yes"
+ else
+ AC_MSG_ERROR([embedded Sun RPC library won't work, but neither will native version])
+ fi
+ ;;
+ esac
fi
-
-if test "$tcp_enabled" = "yes" ; then
- CFLAGS="$CFLAGS -DWANT_TCP_SHAR"
- CXXFLAGS="$CXXFLAGS -DWANT_TCP_SHAR"
+if test $NATIVE_RPC = "yes" && test $rpctest = "no"; then
+ AC_MSG_WARN([native Sun RPC won't work, using internal version])
+ NATIVE_RPC = "no"
+fi
+if test $NATIVE_RPC = "yes"; then
+ AC_CHECK_DECLS([svcfd_create],,,[#include <rpc/rpc.h>])
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE(
+ AC_LANG_PROGRAM(
+ [[#include <rpc/rpc.h>
+static SVCXPRT* xprt = NULL;]],
+ [[svc_destroy(xprt);]]),
+ AC_DEFINE(HAVE_WORKING_SVC_DESTROY,1,[Define if RPC SVC macros work on this platform]),)
+ AC_LANG_POP(C++)
+else
+ AC_CHECK_TYPES([struct rpcent],,,[#include <netdb.h>])
+ AC_CHECK_DECLS(sys_errlist)
+ AC_DEFINE(HAVE_DECL_SVCFD_CREATE,1,[ Define to 1 if you have the declaration of svcfd_create, and to 0 if you don't.])
+ AC_DEFINE(HAVE_WORKING_SVC_DESTROY,1,[Define if RPC SVC macros work on this platform])
fi
AC_ARG_WITH(dmalloc,
AC_MSG_ERROR([unable to find dmallocxx library]))
])
-AC_ARG_WITH(xerces,
- AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]),
- [if test x_$with_xerces != x_/usr; then
- LDFLAGS="-L${with_xerces}/lib $LDFLAGS"
- CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
- fi])
-
-
+# OpenSSL settings
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test "x$PKG_CONFIG" = x || test "x$PKG_CONFIG" = "xno" ; then
AC_ARG_WITH(openssl,
SSLLIBS="-L${with_openssl}/lib"
SSLFLAGS="-I${with_openssl}/include"
fi])
+ SSLLIBS="$SSLLIBS -lssl -lcrypto"
else
SSLLIBS="`$PKG_CONFIG --libs openssl`"
SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
fi
AC_MSG_CHECKING(for OpenSSL libraries)
AC_MSG_RESULT($SSLLIBS)
-LDFLAGS="$SSLLIBS $LDFLAGS"
+LIBS="$LIBS $SSLLIBS"
AC_MSG_CHECKING(for OpenSSL cflags)
AC_MSG_RESULT($SSLFLAGS)
CPPFLAGS="$SSLFLAGS $CPPFLAGS"
-AC_ARG_WITH(log4cpp,
- AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp is installed]),
- [if test x_$with_log4cpp != x_/usr; then
- LDFLAGS="-L${with_log4cpp}/lib $LDFLAGS"
- CPPFLAGS="-I${with_log4cpp}/include $CPPFLAGS"
- fi])
-
-AC_ARG_WITH(xmlsec,
- AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),
- [if test x_$with_xmlsec != x_/usr; then
- LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
- CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
- fi])
-
-AC_ARG_WITH(saml,
- AC_HELP_STRING([--with-saml=PATH], [where saml is installed]),
- [if test x_$with_saml != x_/usr; then
- LDFLAGS="-L${with_saml}/lib $LDFLAGS"
- CPPFLAGS="-I${with_saml}/include $CPPFLAGS"
- fi])
-
-AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,
- AC_MSG_ERROR([unable to find xerces header files]))
-saved_LIBS="$LIBS"
-LIBS="-lxerces-c $LIBS"
-AC_TRY_LINK(
- [#include <xercesc/util/PlatformUtils.hpp>],
- [xercesc::XMLPlatformUtils::Initialize()],
- [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
- [AC_MSG_ERROR([unable to link with Xerces])
- LIBS="$saved_LIBS"
- ])
-
AC_CHECK_HEADER([openssl/ssl.h],,
AC_MSG_ERROR([unable to find openssl header files]))
AC_MSG_CHECKING(for ERR_load_CRYPTO_string)
AC_MSG_ERROR([unable to link with openssl libraries]))
AC_MSG_RESULT(yes)
-#AC_CHECK_LIB([crypto], [ERR_load_CRYPTO_strings],,
-# AC_MSG_ERROR([unable to link with openssl libraries]))
-#AC_CHECK_LIB([ssl], [SSL_library_init],,
-# AC_MSG_ERROR([unable to link with openssl libraries]))
+AC_LANG(C++)
-AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,
- AC_MSG_ERROR([unable to find xsec header files]))
-saved_LIBS="$LIBS"
+# log4cpp settings
+AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
+AC_ARG_WITH(log4cpp,
+ AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp is installed]),
+ [LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config"])
+if test -f "${LOG4CPP_CONFIG}"; then
+ LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
+ CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
+else
+ AC_MSG_WARN([log4cpp-config not found, guessing at log4cpp build settings])
+ LIBS="-llog4cpp $LIBS"
+fi
+AC_CHECK_HEADER([log4cpp/Category.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
+AC_TRY_LINK(
+ [#include <log4cpp/Category.hh>],
+ [log4cpp::Category::getInstance("foo")],
+ [AC_DEFINE(HAVE_LIBLOG4CPP,1,[Define if log4cpp library was found])],
+ [AC_MSG_ERROR([unable to link with log4cpp])])
+
+# Xerces settings
+AC_ARG_WITH(xerces,
+ AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]),
+ [if test x_$with_xerces != x_/usr; then
+ LDFLAGS="-L${with_xerces}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
+ fi])
+LIBS="-lxerces-c $LIBS"
+AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,
+ AC_MSG_ERROR([unable to find xerces header files]))
+AC_MSG_CHECKING([Xerces version])
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
+[#if _XERCES_VERSION == 20601
+int i = 0;
+#else
+#error must use patched version 2.6.1 provided by Shibboleth project (http://wayf.internet2.edu/shibboleth/)
+#endif])],
+ [AC_MSG_RESULT(OK)],
+ [AC_MSG_ERROR([Shibboleth requires patched Xerces version 2.6.1 (http://wayf.internet2.edu/shibboleth/)])])
+AC_TRY_LINK(
+ [#include <xercesc/util/PlatformUtils.hpp>],
+ [xercesc::XMLPlatformUtils::Initialize()],
+ [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
+ [AC_MSG_ERROR([unable to link with Xerces])])
+
+
+# XML-Security settings
+AC_ARG_WITH(xmlsec,
+ AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),
+ [if test x_$with_xmlsec != x_/usr; then
+ LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
+ fi])
LIBS="-lxml-security-c $LIBS"
+AC_CHECK_HEADER([xsec/xenc/XENCEncryptionMethod.hpp],,AC_MSG_ERROR([unable to find xml-security 1.1 header files]),[#include <xercesc/dom/DOM.hpp>])
AC_TRY_LINK(
[#include <xsec/utils/XSECPlatformUtils.hpp>],
[XSECPlatformUtils::Initialise()],
[AC_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Sec library was found])],
- [AC_MSG_ERROR([unable to link with XML-Sec])
- LIBS="$saved_LIBS"
- ])
-
-AC_CHECK_HEADER([log4cpp/Category.hh],,
- AC_MSG_ERROR([unable to find log4cpp header files]))
+ [AC_MSG_ERROR([unable to link with xml-security])])
+# OpenSAML settings
+AC_ARG_WITH(saml,
+ AC_HELP_STRING([--with-saml=PATH], [where saml is installed]),
+ [if test x_$with_saml != x_/usr; then
+ LDFLAGS="-L${with_saml}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_saml}/include $CPPFLAGS"
+ fi])
AC_CHECK_HEADER([saml/saml.h],,
AC_MSG_ERROR([unable to find saml header files]))
-
-saved_LIBS="$LIBS"
-LIBS="-llog4cpp $LIBS"
-AC_TRY_LINK(
- [#include <log4cpp/Category.hh>],
- [log4cpp::Category::getInstance("foo")],
- [AC_DEFINE(HAVE_LIBLOG4CPP,1,[Define if log4cpp library was found])],
- [AC_MSG_ERROR([unable to link with log4cpp])
- LIBS="$saved_LIBS"
- ])
-
-saved_LIBS="$LIBS"
LIBS="-lsaml $LIBS"
AC_TRY_LINK(
- [#include <saml/saml.h>],
- [saml::SAMLConfig::getConfig()],
+ [#include <saml/saml.h>
+#include <saml/version.h>],
+ [#if _OPENSAML_VERSION >= 10100
+saml::SAMLConfig::getConfig();
+#else
+#error Need OpenSAML version 1.1 or higher
+#endif],
[AC_DEFINE(HAVE_SAML,1,[Define if saml library was found])],
- [AC_MSG_ERROR([unable to link with saml])
- LIBS="$saved_LIBS"
- ])
+ [AC_MSG_ERROR([unable to link with saml, or version too old])])
# output the underlying makefiles
-WANT_SUBDIRS="doc shib schemas configs shib-target shar siterefresh test"
+WANT_SUBDIRS="doc shib schemas configs shib-target shar siterefresh test xmlproviders"
AC_CONFIG_FILES([Makefile doc/Makefile shib/Makefile schemas/Makefile \
configs/Makefile oncrpc/Makefile oncrpc/rpc/Makefile \
shib-target/Makefile shar/Makefile siterefresh/Makefile \
- test/Makefile])
+ test/Makefile xmlproviders/Makefile selinux/Makefile])
+
# now deal with the rpc library, to see if we need to build our own
-if test $rpctest = "no"; then
+if test $NATIVE_RPC = "no"; then
WANT_SUBDIRS="oncrpc $WANT_SUBDIRS"
AC_DEFINE(USE_OUR_ONCRPC,1,[Define if using embedded version of ONC RPC.])
fi
-AM_CONDITIONAL(USE_OUR_ONCRPC,test "$rpctest" = "no")
+AM_CONDITIONAL(USE_OUR_ONCRPC,test "$NATIVE_RPC" = "no")
+
+#
+# Build NSAPI module?
+#
+AC_MSG_CHECKING(for NSAPI module option)
+AC_ARG_WITH(nsapi,
+ AC_HELP_STRING([--with-nsapi=DIR], [Build NSAPI module for Netscape/iPlanet/SunONE]),
+ [WANT_NSAPI=$withval],[WANT_NSAPI=no])
+AC_MSG_RESULT($WANT_NSAPI)
+
+if test "$WANT_NSAPI" != "no"; then
+ if test ! -d $WANT_NSAPI/bin ; then
+ AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR)
+ fi
+ AC_MSG_CHECKING(for NSAPI include files)
+ if test -d $WANT_NSAPI/include ; then
+ NSAPI_INCLUDE=$WANT_NSAPI/include
+ AC_MSG_RESULT(Netscape-Enterprise 3.x style)
+ AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+ NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
+ fi
+ if test -d $WANT_NSAPI/plugins/include ; then
+ test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE"
+ NSAPI_INCLUDE="$WANT_NSAPI/plugins/include"
+ AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style)
+ AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+ NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
+ fi
+ if test "$NSAPI_INCLUDE" = ""; then
+ AC_MSG_ERROR(Please check you have nsapi.h in either $WANT_NSAPI/include or $WANT_NSAPI/plugins/include)
+ fi
+fi
+
+AC_SUBST(NSAPI_INCLUDE)
-# Much of this is taken from mod_dav.
-# The basic idea is to use configure options to control whether/which types
-# of web server modules get built. We assume there may eventually be multiple
-# types (Apache 1/2, iPlanet, others).
+# always output the Makefile, even if you don't use it
+AC_CONFIG_FILES([nsapi_shib/Makefile])
+AM_CONDITIONAL(BUILD_NSAPI,test ! "$WANT_NSAPI" = "no")
+
+# add the NSAPI module to the list of wanted subdirs..
+if test ! "$WANT_NSAPI" = "no" ; then
+ WANT_SUBDIRS="$WANT_SUBDIRS nsapi_shib"
+fi
-# Apache 1.3 (mod_shire/mod_shibrm)
-# --with-apache-13 (static build, no idea how to do this yet, so not supported)
+
+# Apache 1.3 (mod_shib_13)
+# --enable-apache-13
# --with-apxs (DSO build, the normal way, uses apxs to derive build flags)
# --without-apxs (DSO build, you tell us how to build using the environment)
fi
fi
-if test "$WANT_APACHE_13" = "yes"; then
- AC_ARG_WITH(apreq,
- AC_HELP_STRING([--with-apreq=PATH], [where libapreq is installed]),
- [if test x_$with_apreq != x_/usr; then
- LDFLAGS="-L${with_apreq}/lib $LDFLAGS"
- CPPFLAGS="-I${with_apreq}/include $CPPFLAGS"
- fi])
-
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-I$APXS_INCLUDE $APXS_CFLAGS $CPPFLAGS"
- AC_TRY_COMPILE([#include <libapreq/apache_request.h>],
- [int i=0],
- test_apreq="yes",test_apreq="no")
- if test "$test_apreq" = "no"; then
- CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
- APXS_CFLAGS="$APXS_CFLAGS -U_XOPEN_SOURCE"
- AC_CHECK_HEADER([libapreq/apache_request.h],,
- AC_MSG_ERROR([unable to find a usable libapreq header]))
- fi
-
-dnl saved_LIBS="$LIBS"
-dnl LIBS="-lapreq $LIBS"
-dnl AC_TRY_LINK(
-dnl [#include <libapreq/apache_request.h>],
-dnl [ApacheRequest_expires],
-dnl [AC_DEFINE(HAVE_APREQ,1,[Define if apreq library was found])],
-dnl [AC_MSG_ERROR([unable to link with apreq])
-dnl ])
-dnl LIBS="$saved_LIBS"
- CPPFLAGS="$saved_CPPFLAGS"
-
- AC_ARG_ENABLE([apxs-install],
- AC_HELP_STRING([--enable-apxs-install],
- [use apxs to install the apache modules]),
- APXS_INSTALL="yes", )
-
-
- AC_SUBST(APXS_CFLAGS)
- AC_SUBST(APXS_INCLUDE)
- AC_SUBST(APXS_LIBEXEC)
- AC_SUBST(APXS_SYSCONFDIR)
-
- # output the Apache 1.3 makefiles
- WANT_SUBDIRS="$WANT_SUBDIRS mod_shire mod_shibrm"
-fi
-# always output the Makefile, even if we don't use it
-AC_CONFIG_FILES([mod_shire/Makefile mod_shibrm/Makefile])
+AC_SUBST(APXS_CFLAGS)
+AC_SUBST(APXS_INCLUDE)
+AC_SUBST(APXS_LIBEXEC)
+AC_SUBST(APXS_SYSCONFDIR)
AM_CONDITIONAL(HAVE_APXS,test -n "$APXS")
-AM_CONDITIONAL(DO_APXS_INSTALL,test -n "$APXS_INSTALL")
-# Apache 2.0 (mod_shib in apache-2.0)
-# --with-apache-20 (static build, no idea how to do this yet, so not supported)
+# Apache 2.0 (mod_shib_20)
+# --enable-apache-20
# --with-apxs2 (DSO build, the normal way, uses apxs to derive build flags)
+# --with-apr (DSO build, APR development package installed separately)
# --without-apxs2 (DSO build, you tell us how to build using the environment)
AC_ARG_ENABLE(apache-20,
pathname to the Apache apxs tool; defaults to "apxs".],
[
if test "$withval" = "yes"; then
- for i in /usr/sbin /usr/local/apache/bin ; do
+ for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do
if test -f "$i/apxs"; then
APXS2="$i/apxs"
fi
elif test -n "$APXS2"; then
+ # APR settings
+ AC_PATH_PROG(APR_CONFIG,apr-config)
+ AC_ARG_WITH(apr,
+ AC_HELP_STRING([--with-apr=PATH], [where APR is installed]),
+ [APR_CONFIG="${with_apr}/bin/apr-config"])
+ if test -f "${APR_CONFIG}"; then
+ APR_CFLAGS="`${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags` `${APR_CONFIG} --includes`"
+ fi
+
# extract settings we need from APXS2 -q
APXS2_CC="`$APXS2 -q CC`"
- APXS2_CFLAGS="`$APXS2 -q CFLAGS` `$APXS2 -q CFLAGS_SHLIB`"
+ APXS2_CFLAGS="`$APXS2 -q CFLAGS` `$APXS2 -q CFLAGS_SHLIB` $APR_CFLAGS"
APXS2_INCLUDE="`$APXS2 -q INCLUDEDIR`"
APXS2_LIBEXEC="`$APXS2 -q LIBEXECDIR`"
APXS2_SYSCONFDIR="`$APXS2 -q SYSCONFDIR`"
fi
fi
-if test "$WANT_APACHE_20" = "yes"; then
- AC_ARG_WITH(apreq2,
- AC_HELP_STRING([--with-apreq2=PATH], [where http-apreq-2 is installed]),
- [if test x_$with_apreq2 != x_/usr; then
- LDFLAGS="-L${with_apreq2}/lib $LDFLAGS"
- CPPFLAGS="-I${with_apreq2}/include $CPPFLAGS"
- fi])
-
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-I$APXS2_INCLUDE $APXS2_CFLAGS $CPPFLAGS"
- AC_TRY_COMPILE([#include <apreq.h>],
- [int i=0],
- test_apreq2="yes",test_apreq2="no")
- if test "$test_apreq2" = "no"; then
- CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
- APXS2_CFLAGS="$APXS2_CFLAGS -U_XOPEN_SOURCE"
- AC_CHECK_HEADER([apreq.h],,
- AC_MSG_ERROR([unable to find a usable libapreq2 header]))
- fi
+AC_SUBST(APXS2_CFLAGS)
+AC_SUBST(APXS2_INCLUDE)
+AC_SUBST(APXS2_LIBEXEC)
+AC_SUBST(APXS2_SYSCONFDIR)
+AM_CONDITIONAL(HAVE_APXS2,test -n "$APXS2")
+
+# always output the Makefile, even if you don't use it
+AC_CONFIG_FILES([apache/Makefile])
+AM_CONDITIONAL(BUILD_AP13,test "$WANT_APACHE_13" = "yes")
+AM_CONDITIONAL(BUILD_AP20,test "$WANT_APACHE_20" = "yes")
-dnl saved_LIBS="$LIBS"
-dnl LIBS="-lapreq $LIBS"
-dnl AC_TRY_LINK(
-dnl [#include <apreq.h>],
-dnl [apreq_param],
-dnl [AC_DEFINE(HAVE_APREQ2,1,[Define if apreq2 library was found])],
-dnl [AC_MSG_ERROR([unable to link with apreq2])
-dnl ])
-dnl LIBS="$saved_LIBS"
- CPPFLAGS="$saved_CPPFLAGS"
-
- AC_ARG_ENABLE([apxs2-install],
- AC_HELP_STRING([--enable-apxs2-install],
- [use apxs to install the apache-2 modules]),
- APXS2_INSTALL="yes", )
-
-
- AC_SUBST(APXS2_CFLAGS)
- AC_SUBST(APXS2_INCLUDE)
- AC_SUBST(APXS2_LIBEXEC)
- AC_SUBST(APXS2_SYSCONFDIR)
-
- # output the Apache 2.0 makefiles
- WANT_SUBDIRS="$WANT_SUBDIRS apache-2.0"
+# add the apache module to the list of wanted subdirs..
+if test "$WANT_APACHE_13" = "yes" || test "$WANT_APACHE_20" = "yes" ; then
+ WANT_SUBDIRS="$WANT_SUBDIRS apache"
fi
-# always output the Makefile, even if we don't use it
-AC_CONFIG_FILES([apache-2.0/Makefile])
-AM_CONDITIONAL(HAVE_APXS2,test -n "$APXS2")
-AM_CONDITIONAL(DO_APXS2_INSTALL,test -n "$APXS2_INSTALL")
#