From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Tue, 14 Aug 2007 18:56:53 +0000 (+0000)
Subject: Conditionally bypass built-in Apache dependency.
X-Git-Tag: 2.4~794
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=95a420b6113363d9942173d54378332f96ee75bf

Conditionally bypass built-in Apache dependency.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2414 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 3f0b312..25ab215 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -11,7 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:	openssl-devel, curl-devel >= 7.10.6
 BuildRequires:	xerces%{?xercesver}-c-devel >= 2.6.1, xml-security-c-devel >= 1.3.1
-BuildRequires:	zlib-devel, unixODBC-devel, opensaml-devel >= 2.0
+BuildRequires:	zlib-devel, opensaml-devel >= 2.0
 %if %{?_with_log4cpp:1}
 BuildRequires:	log4cpp-devel >= 0.3.5
 %else
@@ -19,10 +19,10 @@ BuildRequires:	log4shib-devel
 %endif
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
 %if "%{_vendor}" == "redhat"
-BuildRequires:	httpd-devel
+%{!?_without_builtinapache:BuildRequires: httpd-devel}
 %endif
 %if "%{_vendor}" == "suse"
-BuildRequires:	apache2-devel
+%{!?_without_builtinapache:BuildRequires: apache2-devel}
 %endif