X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d14baf6c058f87046cacb65b796244b3d2a7ac90;hb=bee3c27c90c54165720cf7aa651724f4e64bd2c1;hp=f45644237cbaec3b4f90f0fd7357774b519b8c0f;hpb=4ee1c3af0a5efd0b0181c65d9debf5184c2d9351;p=shibboleth%2Fxmltooling.git

diff --git a/configure.ac b/configure.ac
index f456442..d14baf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,11 +23,11 @@ AC_ARG_ENABLE(debug,
     enable_debug=$enableval, enable_debug=no)
 
 if test "$enable_debug" = "yes" ; then
-    GCC_CFLAGS="$CFLAGS -Wall -g -D_DEBUG"
-    GCC_CXXFLAGS="$CXXFLAGS -Wall -g -D_DEBUG"
+    GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
+    GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
 else
-    GCC_CFLAGS="$CFLAGS -Wall -O2 -DNDEBUG"
-    GCC_CXXFLAGS="$CXXFLAGS -Wall -O2 -DNDEBUG"
+    GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
+    GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
 fi
 
 AC_PROG_CC([gcc gcc3 cc])
@@ -42,8 +42,8 @@ if test "$GCC" = "yes" ; then
 #        GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
 #        GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
 #        ])
-    CFLAGS="$GCC_CFLAGS"
-    CXXFLAGS="$GCC_CXXFLAGS"
+    CFLAGS="-Wall $GCC_CFLAGS"
+    CXXFLAGS="-Wall $GCC_CXXFLAGS"
 else
 # Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
 	case "${host_cpu}-${host_os}" in
@@ -79,67 +79,7 @@ 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
-
-if test "x$SSLLIBS" = "x" ; then
-    SSLLIBS="-lcrypto -lssl"
-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_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)
-
-# 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_CHECK_FUNCS([pthread_rwlock_init])
 
 AC_LANG(C++)
 
@@ -153,30 +93,55 @@ AC_TRY_LINK(
      [ 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,
-    AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]),
+# 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]),
     [
-    LOG4CPP_CONFIG="${with_log4cpp}"
-    if ! test -f "${LOG4CPP_CONFIG}" ; then
-    	LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config"
+    LOG4SHIB_CONFIG="${with_log4shib}"
+    if ! test -f "${LOG4SHIB_CONFIG}" ; then
+    	LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config"
     fi
     ])
-if test -f "${LOG4CPP_CONFIG}"; then
-    LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
-    CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
+if test -f "${LOG4SHIB_CONFIG}"; then
+    LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS"
+    CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS"
+	AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
+	AC_TRY_LINK(
+		[#include <log4shib/Category.hh>
+#include <log4shib/CategoryStream.hh>],
+		[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])])
 else
-    AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
-    LIBS="-llog4cpp $LIBS"
+    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])
+	    LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
+	    CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
+		AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
+		AC_TRY_LINK(
+			[#include <log4cpp/Category.hh>
+#include <log4cpp/CategoryStream.hh>],
+			[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])])
+	else
+	    AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
+	fi
 fi
-AC_CHECK_HEADER([log4cpp/Category.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
-AC_CHECK_HEADER([log4cpp/PropertyConfigurator.hh],,AC_MSG_ERROR([you need at least log4cpp 0.3.x]))
-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])])
 
 # Xerces settings
 AC_ARG_WITH(xerces, 
@@ -211,25 +176,113 @@ 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"
+        LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
     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 <xsec/utils/XSECPlatformUtils.hpp>],
-        [#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)
+        [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3)
 int i = 0;
 #else
-#error need version 1.3.1 or later
+#error need version 1.4.0 or later
 #endif])],
         [AC_MSG_RESULT(OK)],
-        [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])])
+        [AC_MSG_FAILURE([XML-Security version 1.4.0 or greater is required.])])
     AC_TRY_LINK(
             [#include <xsec/utils/XSECPlatformUtils.hpp>],
             [XSECPlatformUtils::Initialise()],,
-            [AC_MSG_ERROR([unable to link with XML-Sec])])
+            [AC_MSG_ERROR([unable to link with XML-Security])])
+
+	# restore master libs
+	LIBS="$save_LIBS"
+
+	# 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
+	    CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS"
+	    XMLSEC_LIBS="`${CURL_CONFIG} --libs` $XMLSEC_LIBS"
+	else
+	    AC_MSG_ERROR([curl-config not found, may need to use --with-curl option])
+	fi
+
+	# save and append master libs
+	save_LIBS="$LIBS"
+	LIBS="$XMLSEC_LIBS $LIBS"
+	
+	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])])
+
+	# 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)
 else
     AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])
     AC_DEFINE(XMLTOOLING_NO_XMLSEC,1,
@@ -244,6 +297,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 <vector>],
+        [std::iterator_traits<std::vector<int>::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"
@@ -265,4 +324,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)