X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=93f3f44dfbe6c9a657e425861f6b66eb783d18db;hb=e02ccbda2e181771cb555649ffd25958594b37dc;hp=a19573c135d41d2aa57246389f1d64c0da4988a1;hpb=f17283e764500702b70a2f63bcca545bccc60d34;p=shibboleth%2Fcpp-xmltooling.git diff --git a/configure.ac b/configure.ac index a19573c..93f3f44 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.50]) -AC_INIT([xmltooling], [1.0], [mace-opensaml-users@internet2.edu], [xmltooling]) +AC_INIT([xmltooling], [1.2], [mace-opensaml-users@internet2.edu], [xmltooling]) AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(xmltooling/config_pub.h) -AM_INIT_AUTOMAKE([xmltooling], [1.0]) +AM_INIT_AUTOMAKE([xmltooling], [1.2]) sinclude(doxygen.m4) sinclude(acx_pthread.m4) @@ -61,6 +61,7 @@ AC_PROG_LIBTOOL # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T +AC_CHECK_SIZEOF([long]) # Checks for library functions. AC_CHECK_FUNCS([strchr strdup strstr timegm strcasecmp]) @@ -108,7 +109,8 @@ if test -f "${LOG4SHIB_CONFIG}"; then 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 +#include ], [log4shib::Category::getInstance("foo").errorStream() << log4shib::eol], [AC_DEFINE(XMLTOOLING_LOG4SHIB,1,[Define if log4shib library is used.])], [AC_MSG_ERROR([unable to link with log4shib])]) @@ -132,7 +134,8 @@ else 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 +#include ], [log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol], [AC_DEFINE(XMLTOOLING_LOG4CPP,1,[Define if log4cpp library is used.])], [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) @@ -173,11 +176,59 @@ AC_ARG_WITH(xmlsec, [with_xmlsec=/usr]) if test x_$with_xmlsec != x_no; then + + # OpenSSL settings (need to do this first in case it's in a different spot from xmlsec) + AC_ARG_WITH(openssl, + AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]), + [if test x_$with_openssl != x_/usr; then + SSLFLAGS="-I${with_openssl}/include" + SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl" + else + SSLLIBS="-lcrypto -lssl" + fi]) + + if test "x$SSLLIBS" = "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 + SSLLIBS="`$PKG_CONFIG --libs openssl`" + SSLFLAGS="`$PKG_CONFIG --cflags openssl`" + else + AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead]) + fi + fi + fi + + if test "x$SSLLIBS" = "x" ; then + SSLLIBS="-lcrypto -lssl" + fi + + AC_MSG_CHECKING(for OpenSSL cflags) + AC_MSG_RESULT($SSLFLAGS) + CPPFLAGS="$CPPFLAGS $SSLFLAGS" + AC_MSG_CHECKING(for OpenSSL libraries) + AC_MSG_RESULT($SSLLIBS) + XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS" + + # save and append master libs + save_LIBS="$LIBS" + LIBS="$XMLSEC_LIBS $LIBS" + + AC_CHECK_HEADER([openssl/pem.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) + + # restore master libs + LIBS="$save_LIBS" + if test x_$with_xmlsec != x_/usr; then CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS" LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS" fi - XMLSEC_LIBS="-lxml-security-c" + XMLSEC_LIBS="$XMLSEC_LIBS -lxml-security-c" # save and append master libs save_LIBS="$LIBS" @@ -202,8 +253,6 @@ int i = 0; # restore master libs LIBS="$save_LIBS" - AC_LANG(C) - # libcurl settings AC_PATH_PROG(CURL_CONFIG,curl-config) AC_ARG_WITH(curl, @@ -235,56 +284,7 @@ int i = 0; # restore master libs LIBS="$save_LIBS" - # OpenSSL settings - AC_ARG_WITH(openssl, - AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]), - [if test x_$with_openssl != x_/usr; then - SSLFLAGS="-I${with_openssl}/include" - SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl" - else - SSLLIBS="-lcrypto -lssl" - fi]) - - if test "x$SSLLIBS" = "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 - SSLLIBS="`$PKG_CONFIG --libs openssl`" - SSLFLAGS="`$PKG_CONFIG --cflags openssl`" - else - AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead]) - fi - fi - fi - - if test "x$SSLLIBS" = "x" ; then - SSLLIBS="-lcrypto -lssl" - fi - - AC_MSG_CHECKING(for OpenSSL cflags) - AC_MSG_RESULT($SSLFLAGS) - CPPFLAGS="$CPPFLAGS $SSLFLAGS" - AC_MSG_CHECKING(for OpenSSL libraries) - AC_MSG_RESULT($SSLLIBS) - XMLSEC_LIBS="$XMLSEC_LIBS $SSLLIBS" - - # save and append master libs - save_LIBS="$LIBS" - LIBS="$XMLSEC_LIBS $LIBS" - - AC_CHECK_HEADER([openssl/pem.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) - - # restore master libs - LIBS="$save_LIBS" - AC_SUBST(XMLSEC_LIBS) - - AC_LANG(C++) else AC_MSG_WARN([xmlsec disabled, building without signature/encryption support]) AC_DEFINE(XMLTOOLING_NO_XMLSEC,1, @@ -299,6 +299,12 @@ AC_TRY_LINK( [AC_DEFINE(HAVE_GOOD_STL,1, [Define if you have an STL implementation that supports useful string specialization.])], ) +AC_TRY_LINK( + [#include ], + [std::iterator_traits::iterator>::value_type foo=0], + [AC_DEFINE(HAVE_ITERATOR_TRAITS,1, + [Define to 1 if you have an STL implementation that supports std::iterator_traits.])], + ) # Check for unit test support CXXTEST="/usr/bin/cxxtestgen.pl"