From: cantor <cantor@fb386ef7-a10c-0410-8ebf-fd3f8e989ab0>
Date: Sun, 21 Oct 2007 22:10:11 +0000 (+0000)
Subject: Fix log4shib/log4cpp link check.
X-Git-Tag: 2.4.1~299
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fopensaml2.git;a=commitdiff_plain;h=52b52e30202a1798da5f0b170130334a2bafb52d

Fix log4shib/log4cpp link check.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-opensaml2/trunk@321 fb386ef7-a10c-0410-8ebf-fd3f8e989ab0
---

diff --git a/configure.ac b/configure.ac
index 4c40f90..c6e4f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ if test -f "${LOG4SHIB_CONFIG}"; then
     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/CategoryStream.hh>],
+		[#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])])
@@ -161,7 +161,7 @@ else
 	    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/CategoryStream.hh>],
+			[#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])])