X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c6e4f97b672f8f5ebe8f85de5eb074978e599fd6;hb=361974af6911459a4dc121be1f02334c8739266d;hp=5e4f3cb5ba6c8fe918d16b2bf09b159cb47c561a;hpb=7d71ec6c3f5f3b2cf800147d7a9317214a9c63bd;p=shibboleth%2Fcpp-opensaml.git

diff --git a/configure.ac b/configure.ac
index 5e4f3cb..c6e4f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,30 +122,53 @@ 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/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(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/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(OPENSAML_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, 
@@ -185,18 +208,18 @@ AC_CHECK_HEADER([xsec/utils/XSECPlatformUtils.hpp],,AC_MSG_ERROR([unable to find
 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_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Sec library was found])],
-    [AC_MSG_ERROR([unable to link with xmlsec library])]
+    [AC_DEFINE(HAVE_LIBXSEC,1,[Define if XML-Security library was found])],
+    [AC_MSG_ERROR([unable to link with XML-Security library])]
     )
 
 # XML-Tooling settings
@@ -245,4 +268,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 samlsign/Makefile schemas/Makefile doc/Makefile)