[cpp-xmltooling] branch master updated: CPPXT-135 - Lite half of library has unintentional zlib dependency

[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=de5854b014f5f9dcc7e20c9ff3c8b0e774fc17a0

The following commit(s) were added to refs/heads/master by this push:
       new  de5854b   CPPXT-135 - Lite half of library has unintentional zlib dependency
de5854b is described below

commit de5854b014f5f9dcc7e20c9ff3c8b0e774fc17a0
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 19 21:58:28 2018 -0400

    CPPXT-135 - Lite half of library has unintentional zlib dependency
    
    https://issues.shibboleth.net/jira/browse/CPPXT-135
---
 config_win32.h           |  4 ++--
 configure.ac             | 11 ++++++-----
 xmltooling/Makefile.am   |  6 +++---
 xmltooling/version.h     |  2 +-
 xmltooling/xmltooling.rc |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/config_win32.h b/config_win32.h
index 773970a..b522bf9 100644
--- a/config_win32.h
+++ b/config_win32.h
@@ -106,13 +106,13 @@
 #define PACKAGE_NAME "xmltooling"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 3.0.1"
+#define PACKAGE_STRING "xmltooling 3.0.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xmltooling"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0.1"
+#define PACKAGE_VERSION "3.0.2"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
diff --git a/configure.ac b/configure.ac
index 8c03b4d..ad6791e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoreconf
 AC_PREREQ([2.50])
-AC_INIT([xmltooling],[3.0.1],[https://issues.shibboleth.net/],[xmltooling])
+AC_INIT([xmltooling],[3.0.2],[https://issues.shibboleth.net/],[xmltooling])
 AC_CONFIG_SRCDIR(xmltooling)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
@@ -135,6 +135,9 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
 AX_PKG_CHECK_MODULES([xerces],,[xerces-c >= 3.2],,,
     [XMLTOOLING_LITE_REQUIRES],[XMLTOOLING_LITE_REQUIRES_PRIVATE])
 
+AX_PKG_CHECK_MODULES([zlib],,[zlib],,,
+    [XMLTOOLING_LITE_REQUIRES],[XMLTOOLING_LITE_REQUIRES_PRIVATE])
+
 AC_ARG_WITH(xmlsec,
     AS_HELP_STRING([--with-xmlsec],
         [include signature/encryption support via Apache Santuario (XML Security) @<:@default=check@:>@]),,
@@ -151,7 +154,6 @@ AX_PKG_CHECK_MODULES([$1],,[$2],[$3],
 ])
 
 AS_IF([test "x$with_xmlsec" != xno],
-    [XMLSEC_PKG_CHECK([zlib],[zlib],
      [XMLSEC_PKG_CHECK([openssl],[openssl],
       [XMLSEC_PKG_CHECK([libcurl],[libcurl],
        [AX_SAVE_FLAGS
@@ -162,11 +164,10 @@ AS_IF([test "x$with_xmlsec" != xno],
         AC_CHECK_TYPE([curl_off_t],[AC_DEFINE([HAVE_CURL_OFF_T],[1],[Define to 1 if you have the 'curl_off_t' type.])],,[[#include <curl/curl.h>]])
         AX_RESTORE_FLAGS
         XMLSEC_PKG_CHECK([xml_security],[xml-security-c >= 2],
-	[AC_SUBST([XMLSEC_CFLAGS],["$xml_security_CFLAGS $libcurl_CFLAGS $openssl_CFLAGS $zlib_CFLAGS"])
-	 AC_SUBST([XMLSEC_LIBS],["$xml_security_LIBS $libcurl_LIBS $openssl_LIBS $zlib_LIBS"])
+	[AC_SUBST([XMLSEC_CFLAGS],["$xml_security_CFLAGS $libcurl_CFLAGS $openssl_CFLAGS"])
+	 AC_SUBST([XMLSEC_LIBS],["$xml_security_LIBS $libcurl_LIBS $openssl_LIBS"])
         ])
        ])
-      ])
      ])
     ])
 
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index d49b574..96a7687 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -213,10 +213,10 @@ common_sources = \
 	validation/ValidatorSuite.cpp \
 	$(thread_sources)
 
-common_CXXFLAGS = $(xerces_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS) $(PTHREAD_CFLAGS) $(BOOST_CPPFLAGS)
-common_LIBADD   = $(xerces_LIBS)   $(log4shib_LIBS)   $(log4cpp_LIBS)   $(PTHREAD_LIBS)   $(dlopen_LIBS)
+common_CXXFLAGS = $(xerces_CFLAGS) $(zlib_CFLAGS) $(log4shib_CFLAGS) $(log4cpp_CFLAGS) $(PTHREAD_CFLAGS) $(BOOST_CPPFLAGS)
+common_LIBADD   = $(xerces_LIBS) $(zlib_LIBS) $(log4shib_LIBS) $(log4cpp_LIBS) $(PTHREAD_LIBS) $(dlopen_LIBS)
 
-AM_LDFLAGS = -version-info 8:1:0
+AM_LDFLAGS = -version-info 8:2:0
 
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
diff --git a/xmltooling/version.h b/xmltooling/version.h
index 60e8cfa..5bee63f 100644
--- a/xmltooling/version.h
+++ b/xmltooling/version.h
@@ -44,7 +44,7 @@
 
 #define XMLTOOLING_VERSION_MAJOR 3
 #define XMLTOOLING_VERSION_MINOR 0
-#define XMLTOOLING_VERSION_REVISION 1
+#define XMLTOOLING_VERSION_REVISION 2
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
diff --git a/xmltooling/xmltooling.rc b/xmltooling/xmltooling.rc
index 1affdde..58c7f0a 100644
--- a/xmltooling/xmltooling.rc
+++ b/xmltooling/xmltooling.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,1,0
+ FILEVERSION 3,0,2,0
  PRODUCTVERSION 3,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -51,7 +51,7 @@ BEGIN
 #else
             VALUE "FileDescription", "OpenSAML XMLTooling Library\0"
 #endif
-            VALUE "FileVersion", "3, 0, 1, 0\0"
+            VALUE "FileVersion", "3, 0, 2, 0\0"
 #ifdef XMLTOOLING_LITE
 #ifdef _DEBUG
             VALUE "InternalName", "xmltooling-lite3_0D\0"

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