-dnl $Id$
-
AC_PREREQ([2.50])
-AC_INIT([shibboleth], [0.1], [mace-shib-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [1.2], [shibboleth-users@internet2.edu], [shibboleth])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(shibboleth, 1.2)
sinclude(acx_pthread.m4)
sinclude(acx_rpctest.m4)
# Checks for library functions.
AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([strchr strdup strstr gmtime_r])
+AC_FUNC_STRERROR_R
+AC_CHECK_FUNCS([strchr strdup strstr gmtime_r strtok_r strcasecmp])
AC_CHECK_HEADERS([dlfcn.h])
# C++ requirements
AC_CXX_NAMESPACES
-old_LIBS="$LIBS"
-AC_SEARCH_LIBS(xdr_uint64_t,nsl,,
- [CFLAGS="$CFLAGS -DNEED_XDR_LONGLONG"
- CXXFLAGS="$CXXFLAGS -DNEED_XDR_LONGLONG"])
-LIBS="$old_LIBS"
-
-ACX_RPCTEST([rpctest="yes"],[rpctest="no"])
-if test $rpctest = "no"; then
- AC_CHECK_HEADERS([stropts.h])
- CFLAGS="-DNEED_RPC_TLI $CFLAGS"
- CXXFLAGS="-DNEED_RPC_TLI $CXXFLAGS"
- ACX_RPCTEST(,AC_MSG_ERROR([neither style of ONC RPC worked]))
-fi
+# old_LIBS="$LIBS"
+# AC_SEARCH_LIBS(xdr_uint64_t,nsl,,
+# [CFLAGS="$CFLAGS -DNEED_XDR_LONGLONG"
+# CXXFLAGS="$CXXFLAGS -DNEED_XDR_LONGLONG"])
+# LIBS="$old_LIBS"
# checks for pthreads
ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
fi
+# Test RPC now -- deal with it later
+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
+fi
+
+if test "$tcp_enabled" = "yes" ; then
+ CFLAGS="$CFLAGS -DWANT_TCP_SHAR"
+ CXXFLAGS="$CXXFLAGS -DWANT_TCP_SHAR"
+fi
+
AC_ARG_WITH(dmalloc,
AC_HELP_STRING([--with-dmalloc=PATH], [where dmalloc is installed]),
[if test x_$with_dmalloc != x_/usr; then
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])
-
-
-AC_ARG_WITH(openssl,
+# 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
- LDFLAGS="-L${with_openssl}/lib $LDFLAGS"
- CPPFLAGS="-I${with_openssl}/include $CPPFLAGS"
+ 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_ARG_WITH(log4cpp,
+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)
+
+# log4cpp settings
+LOG4CPP_CONFIG="log4cpp-config"
+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"
+ [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_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 -f "${with_xmlsec}/bin/xmlsec-config"; then
- LDFLAGS="`${with_xmlsec}/bin/xmlsec-config --libs` $LDFLAGS"
- CPPFLAGS="`${with_xmlsec}/bin/xmlsec-config --cflags` $CPPFLAGS"
+ [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>],
- [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([libxml/parser.h],,
- AC_MSG_ERROR([unable to find libxml2 header files]))
-AC_CHECK_LIB([xml2], [xmlInitParser],echo "foo" > /dev/null,
- AC_MSG_ERROR([unable to link with libxml2]))
-
-AC_CHECK_HEADER([xmlsec/xmlsec.h],,
- AC_MSG_ERROR([unable to find xmlsec header files]))
-AC_CHECK_LIB([xmlsec], [xmlSecInit],echo "foo" > /dev/null,
- AC_MSG_ERROR([unable to link with xmlsec]))
-
-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()],
[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])])
+
# output the underlying makefiles
-WANT_SUBDIRS="shib schemas eduPerson shib-target shar test"
-AC_CONFIG_FILES([Makefile shib/Makefile schemas/Makefile eduPerson/Makefile \
- shib-target/Makefile shar/Makefile test/Makefile])
+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 xmlproviders/Makefile])
+
+
+# now deal with the rpc library, to see if we need to build our own
+if test $rpctest = "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")
-# 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)
+# --with-apache-13 (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)
+
+AC_ARG_ENABLE(apache-13,
+ 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 "$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
-AM_CONDITIONAL(HAVE_APXS,test -n "$APXS")
-
-if test "$WANT_APACHE" = "yes"; then
+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
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$APXS_INCLUDE $APXS_CFLAGS $CPPFLAGS"
- AC_CHECK_HEADER([libapreq/apache_request.h],,
- AC_MSG_ERROR([unable to find apreq header files]))
+ 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"
# output the Apache 1.3 makefiles
WANT_SUBDIRS="$WANT_SUBDIRS mod_shire mod_shibrm"
- AC_CONFIG_FILES([mod_shire/Makefile mod_shibrm/Makefile])
fi
-
+# always output the Makefile, even if we don't use it
+AC_CONFIG_FILES([mod_shire/Makefile])
+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)
+# --with-apxs2 (DSO build, the normal way, uses apxs to derive build flags)
+# --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/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])
+
+
+ # 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
+
+ # extract settings we need from APXS2 -q
+ APXS2_CC="`$APXS2 -q CC`"
+ APXS2_CFLAGS="`$APXS2 -q CFLAGS` `$APXS2 -q CFLAGS_SHLIB`"
+ 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
+
+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
+
+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"
+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")
+
+
+#
+# Implement the checks of the MySQL Credential Cache
+#
+# 1) Assume the user wants MySQL; if it's not found then just continue without
+# 2) If the user specifically requested Mysql, look for it and ERROR if not found
+# 3) If the user specifically requested no-mysql, don't build it.
+#
+
+AC_CONFIG_FILES([shib-mysql-ccache/Makefile])
+
+# determine whether we should enable the mysql ccache
+AC_ARG_ENABLE([mysql],
+ AC_HELP_STRING([--disable-mysql], [disable the MySQL Credential Cache]),
+ [mysql_enabled=$enableval], [mysql_enabled=default])
+
+if test "x$mysql_enabled" = "x" ; then
+ mysql_enabled=yes
+fi
+
+# Are we trying to build MySQL?
+AC_MSG_CHECKING(whether to build the MySQL ccache)
+if test "$mysql_enabled" = "yes" ; then
+ build_mysql=yes
+ AC_MSG_RESULT(yes)
+elif test "$mysql_enabled" = "default" ; then
+ build_mysql=yes
+ AC_MSG_RESULT([yes, if it can be found])
+else
+ build_mysql=no
+ AC_MSG_RESULT(no)
+fi
+
+# If we're trying to build MySQL, try to find the mysql_config program,
+# verify we've got mysql >= 4, and make sure we can build with mysqld
+if test "$build_mysql" = "yes" ; then
+ mysql_dir=""
+ AC_ARG_WITH(mysql,
+ AC_HELP_STRING([--with-mysql=PATH], [directory where mysql is installed]),
+ [if test "$with_mysql" = no ; then
+ AC_MSG_ERROR([Try running --disable-mysql instead.])
+ elif test "$with_mysql" != yes ; then
+ mysql_dir="$with_mysql/bin"
+ fi ])
+
+ # Try to find the mysql_config program
+ AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no, $mysql_dir $PATH )
+
+ if test "$MYSQL_CONFIG" = no ; then
+ if test "$mysql_enabled" = "yes" ; then
+ AC_MSG_ERROR(Cannot find mysql_config)
+ else
+ AC_MSG_WARN(MySQL not found. skipping.)
+ fi
+ fi
+fi
+
+# if we found mysql_config then build_mysql is 'yes'
+if test "$MYSQL_CONFIG" != no ; then
+ AC_MSG_CHECKING(for mysql version >= 4)
+ mysql_version=`$MYSQL_CONFIG --version`
+ mysql_major_version=`echo $mysql_version | awk -F. '{print $1}'`
+ mysql_version_ok=yes
+ if test $mysql_major_version -lt 4 ; then
+ mysql_version_ok=no
+ if test "$mysql_enabled" = "yes" ; then
+ AC_MSG_ERROR(You need MySQL version >= 4, found $mysql_version)
+ fi
+ AC_MSG_RESULT(no.. skipping MySQL)
+ else
+ AC_MSG_RESULT(yes)
+ fi
+fi
+
+# if mysql_version_ok is 'yes', then we've made it this far.. ;)
+if test "$mysql_version_ok" = "yes" ; then
+ AC_MSG_CHECKING(for embedded-MySQL libraries)
+ MYSQL_LIBS=`$MYSQL_CONFIG --libmysqld-libs`
+ if test $? != 0 ; then
+ found_mysql=no
+ if test "$mysql_enabled" = "yes" ; then
+ AC_MSG_ERROR(Could not find the MySQL Embedded-server libraries.)
+ else
+ AC_MSG_RESULT(no.. skipping MySQL)
+ fi
+ else
+ found_mysql=yes
+ AC_MSG_RESULT(yes)
+ fi
+fi
+
+# if found_mysql=yes then test that we can actually build mysql
+if test "$found_mysql" = yes ; then
+ MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
+ MYSQL_CFLAGS=`eval echo $MYSQL_CFLAGS`
+ MYSQL_LIBS=`eval echo $MYSQL_LIBS`
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS"
+
+ AC_CHECK_HEADER([mysql.h], [have_mysql_h=yes], [have_mysql_h=no])
+ if test "$have_mysql_h" = no -a "$mysql_enabled" = "yes" ; then
+ AC_MSG_ERROR(unable to find MySQL header files)
+ fi
+
+ if test "$have_mysql_h" = yes ; then
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $MYSQL_LIBS"
+ AC_MSG_CHECKING(if we can link againt mysql)
+ AC_TRY_LINK(
+ [#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 test "$mysql_enabled" = "yes" ; then
+ AC_MSG_ERROR([unable to link with MySQL Embedded Server Library])
+ else
+ AC_MSG_RESULT(no. skipping MySQL)
+ fi
+ fi
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+fi
+
+# if have_mysql_libs=yes then go ahead with building MySQL
+if test "$have_mysql_libs" = yes ; then
+ # this AC_MSG_RESULT is from above!
+ AC_MSG_RESULT(yes)
+ WANT_SUBDIRS="$WANT_SUBDIRS shib-mysql-ccache"
+ AC_SUBST(MYSQL_CFLAGS)
+ AC_SUBST(MYSQL_LIBS)
+fi
+
+
AC_SUBST(WANT_SUBDIRS)
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