X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=configure.ac;h=cbb03e6d359af0491e0e638bc7569b6716eb3d21;hp=4c40f901e241a9f68bc275fe59aade7a79ef8a0d;hb=9feb31702e26a76de7030d712d61c2312aa168a8;hpb=3f243ee065ef3dcc1e9832275c00ee708d7f9a6b

diff --git a/configure.ac b/configure.ac
index 4c40f90..cbb03e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 AC_PREREQ([2.50])
 AC_INIT([opensaml], [2.0], [mace-opensaml-users@internet2.edu], [saml])
 AM_CONFIG_HEADER(config.h)
-#AM_CONFIG_HEADER(saml/config_pub.h)
 AM_INIT_AUTOMAKE([opensaml], [2.0])
 
 sinclude(doxygen.m4)
@@ -137,7 +136,8 @@ 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,8 @@ 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])])
@@ -239,14 +240,6 @@ AC_TRY_LINK(
     [AC_MSG_ERROR([unable to link with xmltooling library])]
     )
 
-# Does the STL in use help or screw us?
-AC_TRY_LINK(
-    [#include <string>],
-    [std::basic_string<unsigned short> foo; foo=foo+(unsigned short)65],
-    [AC_DEFINE(HAVE_GOOD_STL,1,
-        [Define if you have an STL implementation that supports useful string specialization.])],
-    )
-
 # Check for unit test support
 CXXTEST="/usr/bin/cxxtestgen.pl"
 CXXTESTFLAGS=""