X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=b66a34d45ddde417be6b32b5766129aaf806bfa9;hb=5b4f12f4528d494f8f365ef99dcd4a1ec8c40efd;hp=74d0cb7af227ac84ec62602d47c1f08955c574ca;hpb=2700e7ee1d181e75ca5f21c9dde32ca3fa33d395;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index 74d0cb7..b66a34d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.5],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[2.5.0],[https://issues.shibboleth.net/],[opensaml])
 AC_CONFIG_SRCDIR(saml)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
@@ -49,17 +49,20 @@ 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
 
+# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
+# Also enables POSIX semantics for some functions.
+case "${host_cpu}-${host_os}" in
+    *solaris*)
+	CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+	CXXFLAGS="$CXXFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+	if test "$CXX" = "CC" ; then
+		CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
+	fi
+    ;;
+esac
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
@@ -102,7 +105,11 @@ else
 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]))
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[#include <zlib.h>]],
+        [[zlibVersion()]])],,
+    [AC_MSG_ERROR([unable to link with zlib])])
+
 
 # OpenSSL settings
 AC_ARG_WITH(openssl,
@@ -134,6 +141,15 @@ AC_LANG([C++])
 AC_CXX_NAMESPACES
 AC_CXX_REQUIRE_STL
 
+# Boost
+BOOST_REQUIRE
+BOOST_BIND
+BOOST_LAMBDA
+BOOST_PTR_CONTAINER
+BOOST_SMART_PTR
+BOOST_STRING_ALGO
+CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
+
 # log4shib settings (favor this version over the log4cpp code)
 AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config)
 AC_ARG_WITH(log4shib,