X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=configure.ac;h=8393bef97777169356add2d8ab2b6b593aa2a245;hp=a265891916b24958955788dd428d9f8b45441bbc;hb=28eeda76888461858a71e0b2eea0972b0568e23a;hpb=08bc355a377ca61b57596ff4244410af9c124d7a diff --git a/configure.ac b/configure.ac index a265891..8393bef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,10 @@ AC_PREREQ([2.50]) -AC_INIT([opensaml], [2.4], [mace-opensaml-users@internet2.edu], [saml]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([opensaml], [2.4]) - -sinclude(doxygen.m4) -sinclude(acx_pthread.m4) -sinclude(ax_create_pkgconfig_info.m4) +AC_INIT([opensaml],[2.4],[https://bugs.internet2.edu/],[opensaml]) +AC_CONFIG_SRCDIR(saml) +AC_CONFIG_AUX_DIR(build-aux) +AC_CONFIG_MACRO_DIR(m4) +AM_INIT_AUTOMAKE +LT_INIT # Docygen features DX_HTML_FEATURE(ON) @@ -20,7 +19,7 @@ DX_INIT_DOXYGEN(opensaml, doxygen.cfg, doc/api) DX_INCLUDE= AC_ARG_ENABLE(debug, - AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]), + AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]), enable_debug=$enableval, enable_debug=no) if test "$enable_debug" = "yes" ; then @@ -31,8 +30,13 @@ else GCC_CXXFLAGS="$CXXFLAGS -Wall -O2 -DNDEBUG" fi +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_FILES([opensaml.spec pkginfo Portfile]) +AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile]) + AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) +AC_DISABLE_STATIC AC_CANONICAL_HOST if test "$GCC" = "yes" ; then @@ -56,9 +60,6 @@ else esac fi -AC_DISABLE_STATIC -AC_PROG_LIBTOOL - # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T @@ -80,25 +81,25 @@ fi # zlib settings AC_ARG_WITH(zlib, - AC_HELP_STRING([--with-zlib=PATH], [where zlib is installed]), - [ - if test -d "$withval"; then - CPPFLAGS="${CPPFLAGS} -I$withval/include" - LDFLAGS="${LDFLAGS} -L$withval/lib" - fi - ] + AS_HELP_STRING([--with-zlib=PATH],[where zlib is installed]), + [ + if test -d "$withval" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + ] ) AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR([unable to find zlib header files])) AC_CHECK_LIB([z],[deflateInit2_],,AC_MSG_ERROR([unable to link with zlib library])) # OpenSSL settings AC_ARG_WITH(openssl, - AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]), + AS_HELP_STRING([--with-openssl=PATH],[where openssl is installed]), [if test x_$with_openssl != x_/usr; then SSLFLAGS="-I${with_openssl}/include" fi]) -if test "x$SSLFLAGS" = "x" ; then +if test "x$with_openssl" = "x" ; then AC_PATH_PROG(PKG_CONFIG, pkg-config) if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then if pkg-config openssl ; then @@ -113,72 +114,71 @@ AC_MSG_CHECKING(for OpenSSL cflags) AC_MSG_RESULT($SSLFLAGS) CPPFLAGS="$SSLFLAGS $CPPFLAGS" -AC_CHECK_HEADER([openssl/x509.h],, - AC_MSG_ERROR([unable to find openssl header files])) +AC_CHECK_HEADER([openssl/x509.h],,AC_MSG_ERROR([unable to find openssl header files])) -AC_LANG(C++) +AC_LANG([C++]) # C++ requirements -AC_CXX_REQUIRE_STL AC_CXX_NAMESPACES +AC_CXX_REQUIRE_STL # log4shib settings (favor this version over the log4cpp code) AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config) AC_ARG_WITH(log4shib, - AC_HELP_STRING([--with-log4shib=PATH], [where log4shib-config is installed]), + AS_HELP_STRING([--with-log4shib=PATH],[where log4shib-config is installed]), [ LOG4SHIB_CONFIG="${with_log4shib}" - if ! test -f "${LOG4SHIB_CONFIG}" ; then + if ! test -f "${LOG4SHIB_CONFIG}"; then LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config" fi ]) -if test -f "${LOG4SHIB_CONFIG}"; then +if test -f "${LOG4SHIB_CONFIG}" ; then LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS" CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS" AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files])) - AC_TRY_LINK( - [#include -#include ], - [log4shib::Category::getInstance("foo").errorStream() << log4shib::eol], - [AC_DEFINE(OPENSAML_LOG4SHIB,1,[Define if log4shib library is used.])], - [AC_MSG_ERROR([unable to link with log4shib])]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])], + [AC_DEFINE([OPENSAML_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])], + [AC_MSG_ERROR([unable to link with log4shib])]) else AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option]) AC_MSG_WARN([will look for original log4cpp library]) - # log4cpp settings - AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) - AC_ARG_WITH(log4cpp, - AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]), - [ - LOG4CPP_CONFIG="${with_log4cpp}" - if ! test -f "${LOG4CPP_CONFIG}" ; then - LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" - fi - ]) - if test -f "${LOG4CPP_CONFIG}"; then - AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe]) - LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS" - CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" - AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) - AC_TRY_LINK( - [#include -#include ], - [log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol], - [AC_DEFINE(OPENSAML_LOG4CPP,1,[Define if log4cpp library is used.])], - [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) - else - AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) - fi + # log4cpp settings + AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) + AC_ARG_WITH(log4cpp, + AS_HELP_STRING([--with-log4cpp=PATH],[where log4cpp-config is installed]), + [ + LOG4CPP_CONFIG="${with_log4cpp}" + if ! test -f "${LOG4CPP_CONFIG}"; then + LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config" + fi + ]) + if test -f "${LOG4CPP_CONFIG}"; then + AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe]) + LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS" + CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS" + AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files])) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])], + [AC_DEFINE([OPENSAML_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])], + [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) + else + AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option]) + fi fi # 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]) +AC_ARG_WITH(xerces, + AS_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]) @@ -190,26 +190,21 @@ int i = 0; #error cannot use version 2.6.0 #endif])], [AC_MSG_RESULT(OK)], - [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use special 2.6.1 tarball provided by Shibboleth Project])]) -AC_TRY_LINK( - [#include ], - [xercesc::XMLPlatformUtils::Initialize()], - [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])], - [AC_MSG_ERROR([unable to link with Xerces])]) + [AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])]) +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]],[[xercesc::XMLPlatformUtils::Initialize()]])], + ,[AC_MSG_ERROR([unable to link with Xerces])]) AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists]) -AC_TRY_COMPILE([#include ], - [using namespace XERCES_CPP_NAMESPACE; - XMLByte* buf=NULL; - XMLString::release(&buf); - ], - [AC_MSG_RESULT([yes])] - [AC_DEFINE([OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE], [1], [Define to 1 if Xerces XMLString includes XMLByte release.])], +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[using namespace XERCES_CPP_NAMESPACE; XMLByte* buf=NULL; XMLString::release(&buf);]])], + [AC_MSG_RESULT([yes])AC_DEFINE([OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE],[1],[Define to 1 if Xerces XMLString includes XMLByte release.])], [AC_MSG_RESULT([no])]) # XML-Security settings AC_ARG_WITH(xmlsec, - AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]), + AS_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" @@ -226,16 +221,14 @@ int i = 0; #endif])], [AC_MSG_RESULT(OK)], [AC_MSG_FAILURE([XML-Security version 1.4.0 or greater is required.])]) -AC_TRY_LINK( - [#include ], - [XSECPlatformUtils::Initialise()], - [AC_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Security library was found])], - [AC_MSG_ERROR([unable to link with XML-Security library])] - ) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], + [[XSECPlatformUtils::Initialise()]])],, + [AC_MSG_ERROR([unable to link with XML-Security])]) # XML-Tooling settings AC_ARG_WITH(xmltooling, - AC_HELP_STRING([--with-xmltooling=PATH], [where xmltooling is installed]), + AS_HELP_STRING([--with-xmltooling=PATH],[where xmltooling is installed]), [if test x_$with_xmltooling != x_/usr; then LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS" CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS" @@ -244,30 +237,25 @@ AC_ARG_WITH(xmltooling, LIBS="-lxmltooling $LIBS" AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files])) -AC_TRY_LINK( - [ -#include -#include - ], - [ -#if _XMLTOOLING_VERSION >= 10400 +AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include +#include ]], + [[#if _XMLTOOLING_VERSION >= 10400 xmltooling::XMLToolingConfig::getConfig(); #else #error Need XMLTooling version 1.4 or higher -#endif - ], - [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])], - [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])]) +#endif]])], + ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])]) # Check for unit test support CXXTEST="/usr/bin/cxxtestgen.pl" CXXTESTFLAGS="" AC_ARG_WITH(cxxtest, - AC_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]), - [if test x_$with_cxxtest != x_/usr; then - CXXTEST="${with_cxxtest}/cxxtestgen.pl" - CXXTESTFLAGS="-I${with_cxxtest}" - fi]) + AS_HELP_STRING([--with-cxxtest=PATH], [where cxxtest is installed]), + [if test x_$with_cxxtest != x_/usr; then + CXXTEST="${with_cxxtest}/cxxtestgen.pl" + CXXTESTFLAGS="-I${with_cxxtest}" + fi]) if ! test -f "${CXXTEST}"; then AC_MSG_WARN([cxxtestgen not found, won't build unit tests]) fi @@ -282,6 +270,4 @@ AC_SUBST(DX_INCLUDE) LIBTOOL="$LIBTOOL --silent" # output packaging and makefiles -AC_CONFIG_FILES([opensaml.spec pkginfo Portfile]) -AC_CONFIG_FILES([Makefile saml/Makefile samltest/Makefile samlsign/Makefile schemas/Makefile doc/Makefile]) AC_OUTPUT