[cpp-sp] 01/02: Add pkg-config workarounds for RHEL.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=a582f5e3800cadaae08dab96081df9a83f7b16b9

commit a582f5e3800cadaae08dab96081df9a83f7b16b9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 2 13:12:54 2018 -0400

    Add pkg-config workarounds for RHEL.
---
 Makefile.am        |  2 ++
 shibboleth.spec.in | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 50c3652..0ac0c00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,9 @@ GENFILES = @PACKAGE_NAME at .spec
 
 EXTRA_DIST = $(DX_CONFIG) \
 	isapi_shib \
+        iis7_shib \
 	Projects \
+        pkgconfig-workarounds \
 	config_win32.h \
 	$(GENFILES) \
 	$(GENFILES:%=%.in)
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index e475be9..91ae2ac 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -109,13 +109,21 @@ This package includes files needed for development with Shibboleth.
 %if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
 	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{!?_without_systemd:--enable-systemd} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
 %else
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
-	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
+%if 0%{?centos_version} >= 600
+	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
+%else
+%if 0%{?rhel} >= 6
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
+%else
+%if 0%{?rhel} >= 5
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/rh5
 %else
 	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
 %endif
 %endif
 %endif
+%endif
+%endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.