AC_PREREQ([2.50])
-AC_INIT([shibboleth], [1.0.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.0.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_CHECK_FUNCS([strchr strdup strstr gmtime_r strcasecmp])
+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"])
+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 $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_HELP_STRING([--with-dmalloc=PATH], [where dmalloc is installed]),
AC_MSG_ERROR([unable to find dmallocxx library]))
])
+# 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,
+ AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
+ [if test x_$with_openssl != x_/usr; then
+ 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)
+LIBS="$LIBS $SSLLIBS"
+AC_MSG_CHECKING(for OpenSSL cflags)
+AC_MSG_RESULT($SSLFLAGS)
+CPPFLAGS="$SSLFLAGS $CPPFLAGS"
+
+AC_CHECK_HEADER([openssl/ssl.h],,
+ AC_MSG_ERROR([unable to find openssl header files]))
+AC_MSG_CHECKING(for ERR_load_CRYPTO_string)
+AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],,
+ AC_MSG_ERROR([unable to link with openssl libraries]))
+AC_MSG_RESULT(yes)
+AC_MSG_CHECKING(for SSL_library_init)
+AC_TRY_LINK_FUNC([SSL_library_init],,
+ AC_MSG_ERROR([unable to link with openssl libraries]))
+AC_MSG_RESULT(yes)
+
+AC_LANG(C++)
+
+# 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 != 20600 && _XERCES_VERSION >= 20300
+int i = 0;
+#else
+#error cannot use version = 2.6.0 or < 2.3.0
+#endif])],
+ [AC_MSG_RESULT(OK)],
+ [AC_MSG_FAILURE([Shibboleth requires a Xerces version > 2.3.0, but cannot use 2.6.0 -- a 2.6.1 patched release is available from us])])
+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])])
-AC_ARG_WITH(openssl,
- AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
- [if test x_$with_openssl != x_/usr; then
- LDFLAGS="-L${with_openssl}/lib $LDFLAGS"
- CPPFLAGS="-I${with_openssl}/include $CPPFLAGS"
- fi])
-
-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])
-
+# 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/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find xsec header files]))
+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])])
+# 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([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_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_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,
- AC_MSG_ERROR([unable to find xsec header files]))
-saved_LIBS="$LIBS"
-LIBS="-lxml-security-c $LIBS"
-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_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 >= 10000
+saml::SAMLConfig::getConfig();
+#else
+#error Need OpenSAML version 1.0 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])
+
# 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")
-# 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).
-# Apache 1.3 (mod_shire/mod_shibrm)
-# --with-apache (static build, no idea how to do this yet, so not supported)
-# --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)
+# 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)
AC_ARG_ENABLE(apache-13,
- AC_HELP_STRING([--disable-apache-13], [disable the Apache 1.3 modules]))
-if test "x$enable_apache_13" = "x" ; then
- enable_apache_13=yes
+ AC_HELP_STRING([--enable-apache-13], [enable the Apache 1.3 modules]),
+ [ if test "x$enableval" = "x" ; then
+ WANT_APACHE_13=yes
+ else
+ WANT_APACHE_13="$enableval"
+ fi
+ ], [ WANT_APACHE_13=no ])
+AC_MSG_CHECKING(whether to build Apache-1.3 support)
+if test "$WANT_APACHE_13" != yes && test "$WANT_APACHE_13" != no ; then
+ WANT_APACHE_13=yes
fi
+AC_MSG_RESULT($WANT_APACHE_13)
-if test "$enable_apache_13" != yes ; then
- AC_MSG_WARN(Building without Apache...)
- WANT_APACHE=no
-else
+if test "$WANT_APACHE_13" = yes ; then
-AC_MSG_CHECKING([for dynamic Apache module support (w/ or w/o APXS)])
AC_ARG_WITH(apxs,
[ --with-apxs[=FILE] Build shared Apache module(s). FILE is the optional
pathname to the Apache apxs tool; defaults to "apxs".],
else
APXS="$withval"
fi
+],
+[
+ AC_PATH_PROG(APXS, apxs, no)
])
+AC_MSG_CHECKING([for dynamic Apache-1.3 module support (w/ or w/o APXS)])
if test "$APXS" = "no"; then
# --without-apxs means you want the modules,
fi
AC_MSG_NOTICE([APXS_SYSCONFDIR is $APXS_SYSCONFDIR])
- WANT_APACHE="yes"
+ WANT_APACHE_13="yes"
elif test -n "$APXS"; then
more information.])
fi
- WANT_APACHE="yes"
+ WANT_APACHE_13="yes"
else
# guess we're not doing Apache 1.3
AC_MSG_RESULT(no)
- WANT_APACHE="no"
+ WANT_APACHE_13="no"
fi
-
fi
+AC_SUBST(APXS_CFLAGS)
+AC_SUBST(APXS_INCLUDE)
+AC_SUBST(APXS_LIBEXEC)
+AC_SUBST(APXS_SYSCONFDIR)
AM_CONDITIONAL(HAVE_APXS,test -n "$APXS")
-if test "$WANT_APACHE" = "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]))
+
+# 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,
+ AC_HELP_STRING([--enable-apache-20], [enable the Apache 2.0 modules]),
+ [ if test "x$enableval" = "x" ; then
+ WANT_APACHE_20=yes
+ else
+ WANT_APACHE_20="$enableval"
+ fi
+ ], [ WANT_APACHE_20=no ])
+
+AC_MSG_CHECKING(whether to build Apache-2.0 support)
+if test "$WANT_APACHE_20" != yes && test "$WANT_APACHE_20" != no ; then
+ WANT_APACHE_20=yes
+fi
+AC_MSG_RESULT($WANT_APACHE_20)
+
+if test "$WANT_APACHE_20" = yes ; then
+
+AC_ARG_WITH(apxs2,
+[ --with-apxs2[=FILE] Build shared Apache module(s). FILE is the optional
+ pathname to the Apache apxs tool; defaults to "apxs".],
+[
+ if test "$withval" = "yes"; then
+ for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do
+ if test -f "$i/apxs"; then
+ APXS2="$i/apxs"
+ fi
+ done
+ if test -z "$APXS2"; then
+ APXS2=apxs
+ fi
+ else
+ APXS2="$withval"
+ fi
+],
+[
+ AC_PATH_PROG(APXS2, apxs, no)
+])
+
+AC_MSG_CHECKING([for dynamic Apache-2 module support (w/ or w/o APXS)])
+if test "$APXS2" = "no"; then
+
+ # --without-apxs2 means you want the modules,
+ # but want to tell us how to build them
+ AC_MSG_RESULT(yes, but use environment, not apxs)
+ echo
+ echo "Did you set one or more of these?"
+ echo
+ echo "APXS2_CFLAGS APXS2_PREFIX APXS2_INCLUDE APXS2_LIBEXEC APXS2_SYSCONFDIR"
+ echo
+
+ AC_MSG_NOTICE([APXS2_CFLAGS is $APXS2_CFLAGS])
+
+ # try and find the Apache root
+ if test -z "$APXS2_PREFIX"; then
+ if test -d "/usr/local/apache"; then
+ APXS2_PREFIX="/usr/local/apache"
+ else
+ AC_MSG_ERROR([You MUST set APXS2_PREFIX so the right Apache-2 can be located!])
+ fi
+ elif test ! -d "$APXS2_PREFIX"; then
+ AC_MSG_ERROR([APXS2_PREFIX of $APXS2_PREFIX cannot be found])
fi
+ AC_MSG_NOTICE([APXS2_PREFIX is $APXS2_PREFIX])
+
-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"
+ # other subfolders might be derived from APXS2_PREFIX
+ if test -z "$APXS2_INCLUDE"; then
+ if test -f "$APXS2_PREFIX/include/httpd.h"; then
+ APXS2_INCLUDE="$APXS2_PREFIX/include"
+ else
+ AC_MSG_ERROR([can't find Apache-2 include files beneath $APXS2_PREFIX])
+ fi
+ elif ! test -f "$APXS2_INCLUDE/httpd.h"; then
+ AC_MSG_ERROR([APXS2_INCLUDE of $APXS2_INCLUDE does not contain Apache-2 headers])
+ fi
+ AC_MSG_NOTICE([APXS2_INCLUDE is $APXS2_INCLUDE])
+
+ if test -z "$APXS2_LIBEXEC"; then
+ if test -d "$APXS2_PREFIX/libexec"; then
+ APXS2_LIBEXEC="$APXS2_PREFIX/libexec"
+ elif test -d "$APXS2_PREFIX/modules"; then
+ APXS2_LIBEXEC="$APXS2_PREFIX/modules"
+ else
+ AC_MSG_ERROR([can't find Apache-2 libexec/module directory beneath $APXS2_PREFIX])
+ fi
+ elif ! test -d "$APXS2_LIBEXEC"; then
+ AC_MSG_ERROR([APXS2_LIBEXEC of $APXS2_LIBEXEC does not exist])
+ fi
+ AC_MSG_NOTICE([APXS2_LIBEXEC is $APXS2_LIBEXEC])
+
+ if test -z "$APXS2_SYSCONFDIR"; then
+ if test -d "$APXS2_PREFIX/conf"; then
+ APXS2_SYSCONFDIR="$APXS2_PREFIX/conf"
+ else
+ AC_MSG_ERROR([can't find Apache-2 conf directory beneath $APXS2_PREFIX])
+ fi
+ elif ! test -d "$APXS2_SYSCONFDIR"; then
+ AC_MSG_ERROR([APXS2_SYSCONFDIR of $APXS2_SYSCONFDIR does not exist])
+ fi
+ AC_MSG_NOTICE([APXS2_SYSCONFDIR is $APXS2_SYSCONFDIR])
+
+ WANT_APACHE_20="yes"
+
+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` $APR_CFLAGS"
+ APXS2_INCLUDE="`$APXS2 -q INCLUDEDIR`"
+ APXS2_LIBEXEC="`$APXS2 -q LIBEXECDIR`"
+ APXS2_SYSCONFDIR="`$APXS2 -q SYSCONFDIR`"
+
+ AC_SUBST(APXS2)
+ AC_MSG_RESULT(found at $APXS2)
+
+ if test -z "`$APXS2 -q LD_SHLIB`" && test -z "`$APXS2 -q LIBEXECDIR`" \
+ || test "$APXS2_LIBEXEC" = "modules"; then
+ AC_MSG_ERROR(
+[Your APXS installation is broken and cannot be used.
+ Please see http://www.webdav.org/mod_dav/install.html#apxs for
+ more information.])
+ fi
+
+ WANT_APACHE_20="yes"
+
+else
+ # guess we're not doing Apache 2.0
+ AC_MSG_RESULT(no)
+ WANT_APACHE_20="no"
+fi
+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")
+
+# 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([mod_shire/Makefile mod_shibrm/Makefile])
-AM_CONDITIONAL(DO_APXS_INSTALL,test -n "$APXS_INSTALL")
#
# Implement the checks of the MySQL Credential Cache
LIBS="$LIBS $MYSQL_LIBS"
AC_MSG_CHECKING(if we can link againt mysql)
AC_TRY_LINK(
- [#include <mysql.h>],
+ [#include <mysql.h>
+ #include <stdio.h>],
[mysql_server_init(0, NULL, NULL)],
[have_mysql_libs=yes],
[have_mysql_libs=no])
LIBS="$save_LIBS"
if test "$have_mysql_libs" = no ; then
- if "$mysql_enabled" = "yes" ; then
+ if test "$mysql_enabled" = "yes" ; then
AC_MSG_ERROR([unable to link with MySQL Embedded Server Library])
else
AC_MSG_RESULT(no. skipping MySQL)
if test -n "$APXS_CC" && test "$APXS_CC" != "$CC" ; then
echo "=================================================================="
- echo "WARNING: You have chosen to compile Apache modules with a different"
+ echo "WARNING: You have chosen to compile Apache-1.3 modules with a different"
echo " compiler than the one used to compile Apache."
echo ""
echo " Current compiler: $CC"
echo "=================================================================="
fi
+if test -n "$APXS2_CC" && test "$APXS2_CC" != "$CC" ; then
+ echo "=================================================================="
+ echo "WARNING: You have chosen to compile Apache-2 modules with a different"
+ echo " compiler than the one used to compile Apache."
+ echo ""
+ echo " Current compiler: $CC"
+ echo " Apache's compiler: $APXS2_CC"
+ echo ""
+ echo "This could cause some problems."
+ echo "=================================================================="
+fi
+
AC_OUTPUT
projects / shibboleth / sp.git / blobdiff