AC_PREREQ([2.50])
-AC_INIT([shibboleth], [1.2], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [1.3], [shibboleth-users@internet2.edu], [shibboleth])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(shibboleth, 1.2)
+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
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 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
+if test -f "${LOG4CPP_CONFIG}"; then
LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
else
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>],
+ [#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_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_MSG_ERROR([unable to find saml header files]))
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])])
-
+ [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 xmlproviders"
# 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")
# Apache 1.3 (mod_shib_13)
-# --with-apache-13 (static build, no idea how to do this yet, so not supported)
+# --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_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)
-fi
+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_20)
-# --with-apache-20 (static build, no idea how to do this yet, so not supported)
+# --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_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)
-fi
+AC_SUBST(APXS2_CFLAGS)
+AC_SUBST(APXS2_INCLUDE)
+AC_SUBST(APXS2_LIBEXEC)
+AC_SUBST(APXS2_SYSCONFDIR)
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])
projects / shibboleth / sp.git / blobdiff