X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fe8c241e8e303e1e2ee10011218d21a30900a0c9;hb=cdc547fbee463e35784680255911b6166889505c;hp=8fdc692b90d8838d5347823b6422bb078fbaf3e4;hpb=9edc32bbe3f1e2b16ba6694bec8fe7a079eb1d16;p=shibboleth%2Fcpp-xmltooling.git diff --git a/configure.ac b/configure.ac index 8fdc692..fe8c241 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,7 @@ fi AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) +AC_CANONICAL_HOST if test "$GCC" = "yes" ; then # AC_HAVE_GCC_VERSION(4,0,0,0, @@ -43,6 +44,15 @@ if test "$GCC" = "yes" ; then # ]) CFLAGS="$GCC_CFLAGS" CXXFLAGS="$GCC_CXXFLAGS" +else +# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993 + case "${host_cpu}-${host_os}" in + *solaris*) + if test "$CXX" = "CC" ; then + CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp" + fi + ;; + esac fi AC_DISABLE_STATIC @@ -53,7 +63,7 @@ AC_C_CONST AC_TYPE_SIZE_T # Checks for library functions. -AC_CHECK_FUNCS([strchr strdup strstr]) +AC_CHECK_FUNCS([strchr strdup strstr timegm strcasecmp]) AC_CHECK_HEADERS([dlfcn.h]) AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ]) @@ -69,43 +79,31 @@ else CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS" fi -# OpenSSL settings -AC_ARG_WITH(openssl, - AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]), - [if test x_$with_openssl != x_/usr; then - SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl" - SSLFLAGS="-I${with_openssl}/include" - 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 +AC_CHECK_FUNCS([pthread_rwlock_init]) -if test "x$SSLLIBS" = "x" ; then - SSLLIBS="-lcrypto -lssl" +# libcurl settings +AC_PATH_PROG(CURL_CONFIG,curl-config) +AC_ARG_WITH(curl, + AC_HELP_STRING([--with-curl=PATH], [where curl-config is installed]), + [ + CURL_CONFIG="${with_curl}" + if ! test -f "${CURL_CONFIG}" ; then + CURL_CONFIG="${with_curl}/bin/curl-config" + fi + ]) +if test -f "${CURL_CONFIG}" ; then + LDFLAGS="`${CURL_CONFIG} --libs` $LDFLAGS" + CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS" +else + AC_MSG_ERROR([curl-config not found, may need to use --with-curl option]) fi +AC_CHECK_HEADER([curl/curl.h],,AC_MSG_ERROR([unable to find libcurl header files])) +AC_CHECK_LIB([curl],[curl_global_init],,AC_MSG_ERROR([unable to link with libcurl])) +AC_MSG_CHECKING([for CURLOPT_SSL_CTX_FUNCTION in curl.h]) +AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])]) -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_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) AC_LANG(C++) @@ -113,6 +111,12 @@ AC_LANG(C++) AC_CXX_REQUIRE_STL AC_CXX_NAMESPACES +# are covariant methods allowed? +AC_TRY_LINK( + [ class base { public: virtual base *GetPtr( void ) { return this; } }; ], + [ class derived: virtual public base { public: virtual derived *GetPtr( void ) { return this; } }; ], + [AC_DEFINE(HAVE_COVARIANT_RETURNS,1,[Define if C++ compiler supports covariant virtual methods.])]) + # log4cpp settings AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config) AC_ARG_WITH(log4cpp, @@ -156,7 +160,7 @@ 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_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])]) AC_TRY_LINK( [#include ], [xercesc::XMLPlatformUtils::Initialize()], @@ -171,25 +175,84 @@ AC_ARG_WITH(xmlsec, if test x_$with_xmlsec != x_no; then if test x_$with_xmlsec != x_/usr; then - LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS" - CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS" + CPPFLAGS="-I${with_xmlsec}/include" + LDFLAGS="-L${with_xmlsec}/lib" fi - LIBS="-lxml-security-c $LIBS" + XMLSEC_LIBS="-lxml-security-c" + + # save and append master libs + save_LIBS="$LIBS" + LIBS="$XMLSEC_LIBS $LIBS" + AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find XML-Security header files])) AC_MSG_CHECKING([XML-Security version]) AC_PREPROC_IFELSE( [AC_LANG_PROGRAM([#include ], - [#if XSEC_VERSION_MAJOR > 1 || XSEC_VERSION_MEDIUM >2 + [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM == 3 && XSEC_VERSION_MINOR > 0) int i = 0; #else -#error need version 1.3 or later +#error need version 1.3.1 or later #endif])], [AC_MSG_RESULT(OK)], - [AC_MSG_FAILURE([XML-Security version 1.3 or greater is required.])]) + [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])]) AC_TRY_LINK( [#include ], [XSECPlatformUtils::Initialise()],, [AC_MSG_ERROR([unable to link with XML-Sec])]) + + # restore master libs + LIBS="$save_LIBS" + + AC_LANG(C) + + # 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" + 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, @@ -225,4 +288,4 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST}) LIBTOOL="$LIBTOOL --silent" # output makefiles -AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile) +AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile)