From d3d3654437d7a4c19f2cfee32f9a86569eebf848 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Tue, 13 Nov 2007 01:15:48 +0000 Subject: [PATCH] Solaris compiler doesn't like two include macros on one line. --- configure.ac | 6 ++++-- shibboleth.spec.in | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6b2a30e..93387b0 100644 --- a/configure.ac +++ b/configure.ac @@ -103,7 +103,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 #include ], + [#include +#include ], [log4shib::Category::getInstance("foo").errorStream() << log4shib::eol], [AC_DEFINE(SHIBSP_LOG4SHIB,1,[Define if log4shib library is used.])], [AC_MSG_ERROR([unable to link with log4shib])]) @@ -127,7 +128,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 #include ], + [#include +#include ], [log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol], [AC_DEFINE(SHIBSP_LOG4CPP,1,[Define if log4cpp library is used.])], [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])]) diff --git a/shibboleth.spec.in b/shibboleth.spec.in index 903213c..032ecb6 100644 --- a/shibboleth.spec.in +++ b/shibboleth.spec.in @@ -9,7 +9,8 @@ URL: http://shibboleth.internet2.edu/ Source0: http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: openssl-devel, curl-devel >= 7.10.6 -BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0, xml-security-c-devel >= 1.4.0 +BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0 +BuildRequires: xml-security-c-devel >= 1.4.0 BuildRequires: zlib-devel, opensaml-devel >= 2.0 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0} %{!?_with_log4cpp:BuildRequires: log4shib-devel} -- 2.1.4