X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=16ef22f54250cd5938a48fd0d51cc4afa4110561;hb=53f30080aa11d6874d6e2c5c533b2fbd4be1fd17;hp=029d1fd8ef3de1281094c06f428d27c11af76c3d;hpb=2b0a4d6430ca97166e1e444ca9586f3ca54a26b6;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index 029d1fd..16ef22f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([opensaml], [2.0])
 
 sinclude(doxygen.m4)
+sinclude(acx_pthread.m4)
 
 # Docygen features
 DX_HTML_FEATURE(ON)
@@ -32,6 +33,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 +45,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
@@ -54,29 +65,56 @@ AC_TYPE_SIZE_T
 
 # Checks for library functions.
 AC_CHECK_FUNCS([strchr strdup strstr])
+AC_CHECK_SIZEOF(time_t)
 
-# 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"
+# checks for pthreads
+ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
+if test $enable_threads != "pthread"; then
+    AC_MSG_ERROR([unable to find pthreads, currently this is required])
 else
-    AC_MSG_ERROR([curl-config not found, may need to use --with-curl option])
+    AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.])
+    LIBS="$PTHREAD_LIBS $LIBS"
+    CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+    CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
+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
+	]
+)
+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]),
+    [if test x_$with_openssl != x_/usr; then
+        SSLFLAGS="-I${with_openssl}/include"
+    fi])
+
+if test "x$SSLFLAGS" = "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
+            SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
+        else
+            AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
+        fi
+    fi
 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 cflags)
+AC_MSG_RESULT($SSLFLAGS)
+CPPFLAGS="$SSLFLAGS $CPPFLAGS"
+
+AC_CHECK_HEADER([openssl/x509.h],,
+                AC_MSG_ERROR([unable to find openssl header files]))
 
 AC_LANG(C++)
 
@@ -84,30 +122,54 @@ AC_LANG(C++)
 AC_CXX_REQUIRE_STL
 AC_CXX_NAMESPACES
 
-# 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/Category.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
+	AC_TRY_LINK(
+		[#include <log4shib/Category.hh>],
+		[log4shib::Category::getInstance("foo")],
+		[AC_DEFINE(OPENSAML_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/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(OPENSAML_LOG4CPP,1,[Define if log4cpp library is used.])],
+			[AC_MSG_ERROR([unable to link with log4cpp])])
+	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, 
@@ -144,6 +206,16 @@ AC_ARG_WITH(xmlsec,
     fi])
 LIBS="-lxml-security-c $LIBS"
 AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find xmlsec 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)
+int i = 0;
+#else
+#error need version 1.3.1 or later
+#endif])],
+    [AC_MSG_RESULT(OK)],
+    [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])])
 AC_TRY_LINK(
     [#include <xsec/utils/XSECPlatformUtils.hpp>],
     [XSECPlatformUtils::Initialise()],
@@ -197,4 +269,4 @@ AC_SUBST(DX_INCLUDE)
 LIBTOOL="$LIBTOOL --silent"
 
 # output makefiles
-AC_OUTPUT(Makefile saml/Makefile samltest/Makefile schemas/Makefile)
+AC_OUTPUT(Makefile saml/Makefile samltest/Makefile schemas/Makefile doc/Makefile)