AC_PREREQ([2.50])
-AC_INIT([shibboleth], [1.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(shibboleth, 1.1)
+AM_INIT_AUTOMAKE(shibboleth, 1.2)
sinclude(acx_pthread.m4)
sinclude(acx_rpctest.m4)
# 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])
# 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_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_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_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])
+# 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])])
-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"
+# 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]))
-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_MSG_ERROR([unable to link with Xerces])])
-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"
+# 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])
- 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-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([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="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
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)
+# Apache 1.3 (mod_shire)
# --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)
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]),
AC_SUBST(APXS_SYSCONFDIR)
# output the Apache 1.3 makefiles
- WANT_SUBDIRS="$WANT_SUBDIRS mod_shire mod_shibrm"
+ WANT_SUBDIRS="$WANT_SUBDIRS mod_shire"
fi
# always output the Makefile, even if we don't use it
-AC_CONFIG_FILES([mod_shire/Makefile mod_shibrm/Makefile])
+AC_CONFIG_FILES([mod_shire/Makefile])
AM_CONDITIONAL(HAVE_APXS,test -n "$APXS")
AM_CONDITIONAL(DO_APXS_INSTALL,test -n "$APXS_INSTALL")
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)
AM_CONDITIONAL(HAVE_APXS2,test -n "$APXS2")
AM_CONDITIONAL(DO_APXS2_INSTALL,test -n "$APXS2_INSTALL")
+# 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
+
#
# Implement the checks of the MySQL Credential Cache