[shibboleth-sp2] 86/119: Fix log4shib/log4cpp link check.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 1.3.1
in repository shibboleth-sp2.

commit 96932159c396992d777000aed1646acbf9709854
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Sun Oct 21 22:10:14 2007 +0000

    Fix log4shib/log4cpp link check.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd60dc8..bf65e8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,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(HAVE_LOG4SHIB,1,[Define if log4shib library is used.])],
 		[AC_MSG_ERROR([unable to link with log4shib])])
@@ -193,7 +193,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(HAVE_LOG4CPP,1,[Define if log4cpp library is used.])],
 			[AC_MSG_ERROR([unable to link with log4cpp, at least version 1.0 needed])])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git