[cpp-xmltooling] branch master updated: Separate zlib handling, RH5 has no zlib pc file.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  e2c5919   Separate zlib handling, RH5 has no zlib pc file.
e2c5919 is described below

commit e2c591929af9a977b3146e6aaea682ad5202bc99
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 21 21:44:35 2018 -0400

    Separate zlib handling, RH5 has no zlib pc file.
---
 configure.ac           | 3 ++-
 xmltooling.spec.in     | 4 ++++
 xmltooling/Makefile.am | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 02864b6..499a50e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,8 @@ AC_ARG_WITH(xmlsec,
     [with_xmlsec=check])
 
 AS_IF([test "x$with_xmlsec" != xno],
-    [AX_PKG_CHECK_MODULES([XMLSEC],,[xml-security-c >= 2 libcurl openssl zlib],
+    [AX_PKG_CHECK_MODULES([zlib],,[zlib])
+     AX_PKG_CHECK_MODULES([XMLSEC],,[xml-security-c >= 2 libcurl openssl],
         [AX_SAVE_FLAGS
          CXXFLAGS="$XMLSEC_CFLAGS $CXXFLAGS"
          LIBS="$XMLSEC_LIBS $LIBS"
diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 180d8b2..fd17e15 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -107,8 +107,12 @@ This package includes XML schemas and related files.
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 %configure %{?@PACKAGE_NAME at _options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
 %else
+%if 0%{?rhel} == 5
+%configure %{?@PACKAGE_NAME at _options} zlib_CFLAGS=" " zlib_LIBS="-lz"
+%else
 %configure %{?@PACKAGE_NAME at _options}
 %endif
+%endif
 %{__make}
 
 %install
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 178410e..a916421 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -227,8 +227,8 @@ if BUILD_XMLSEC
 libxmltooling_la_SOURCES = \
 	${common_sources} \
 	${xmlsec_sources}
-libxmltooling_la_CXXFLAGS = $(XMLSEC_CFLAGS) $(common_CXXFLAGS)
-libxmltooling_la_LIBADD   = $(XMLSEC_LIBS)   $(common_LIBADD)
+libxmltooling_la_CXXFLAGS = $(XMLSEC_CFLAGS) $(zlib_CFLAGS) $(common_CXXFLAGS)
+libxmltooling_la_LIBADD   = $(XMLSEC_LIBS) $(zlib_LIBS) $(common_LIBADD)
 endif
 
 EXTRA_DIST = \

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