[cpp-sp] 10/17: Use pkg-config for Xerces
Scott Cantor
cantor.2 at osu.edu
Wed Jun 27 20:35:51 EDT 2018
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=5021b653fd3b950185db42b0b37d7d85c2ebf4ac
commit 5021b653fd3b950185db42b0b37d7d85c2ebf4ac
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jul 14 15:23:04 2016 +0200
Use pkg-config for Xerces
---
apache/Makefile.am | 8 ++++++++
configure.ac | 29 ++---------------------------
fastcgi/Makefile.am | 4 ++++
memcache-store/Makefile.am | 2 ++
nsapi_shib/Makefile.am | 2 ++
odbc-store/Makefile.am | 2 ++
plugins/Makefile.am | 4 ++++
shibd/Makefile.am | 2 ++
shibsp/Makefile.am | 4 ++++
util/Makefile.am | 4 ++++
10 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/apache/Makefile.am b/apache/Makefile.am
index e244c38..2b8e44a 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -9,10 +9,12 @@ mod_shib_13_la_CXXFLAGS = \
$(APXS_CFLAGS) -I$(APXS_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_13_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
endif
@@ -25,10 +27,12 @@ mod_shib_20_la_CXXFLAGS = \
$(APXS2_CFLAGS) -I$(APXS2_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_20_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
endif
@@ -41,10 +45,12 @@ mod_shib_22_la_CXXFLAGS = \
$(APXS22_CFLAGS) -I$(APXS22_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_22_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
endif
@@ -57,10 +63,12 @@ mod_shib_24_la_CXXFLAGS = \
$(APXS24_CFLAGS) -I$(APXS24_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_24_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
endif
diff --git a/configure.ac b/configure.ac
index 3dd3233..4688700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,33 +144,8 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
[SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])],,
[SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
-# Xerces settings
-AC_ARG_WITH(xerces,
- AS_HELP_STRING([--with-xerces=PATH],[where xerces-c is installed]),,
- [with_xerces=/usr])
-if test x_$with_xerces != x_/usr; then
- CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
- LIBS="-L${with_xerces}/lib -lxerces-c $LIBS"
-else
- LIBS="-lxerces-c $LIBS"
-fi
-
-AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces header files]))
-AC_MSG_CHECKING([Xerces version])
-
-AC_PREPROC_IFELSE(
- [AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
-[#if _XERCES_VERSION >= 30000
-int i = 0;
-#else
-#error cannot use version 1.x or 2.x
-#endif])],
- [AC_MSG_RESULT(OK)],
- [AC_MSG_FAILURE([Xerces-C 3.x is required])])
-
-AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <xercesc/util/PlatformUtils.hpp>]],[[xercesc::XMLPlatformUtils::Initialize()]])],
- ,[AC_MSG_ERROR([unable to link with Xerces])])
+AX_PKG_CHECK_MODULES([xerces],,[xerces-c >= 3.2],,,
+ [SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
# XML-Security settings
AC_ARG_WITH(xmlsec,
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index b842639..33a9856 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -8,18 +8,22 @@ fastcgi_PROGRAMS = shibauthorizer shibresponder
shibauthorizer_SOURCES = shibauthorizer.cpp
shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
shibauthorizer_LDADD = $(FASTCGI_LIBS) \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
shibresponder_SOURCES = shibresponder.cpp
shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
shibresponder_LDADD = $(FASTCGI_LIBS) \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
endif
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index d5f8d27..66ee8c0 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -9,9 +9,11 @@ AM_CXXFLAGS = $(MEMCACHED_INCLUDE)
memcache_store_la_LDFLAGS = $(MEMCACHED_LDFLAGS) -module -avoid-version
memcache_store_la_CXXFLAGS = \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS) \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS)
memcache_store_la_SOURCES = \
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 1ca52ba..0bb08bd 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -7,11 +7,13 @@ nsapi_shib_la_SOURCES = nsapi_shib.cpp
nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
nsapi_shib_la_LDFLAGS = -module -avoid-version
nsapi_shib_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
endif
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index c5c2bc1..9f3ccf8 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -9,9 +9,11 @@ AM_CXXFLAGS = $(ODBC_CFLAGS)
odbc_store_la_CXXFLAGS = \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
odbc_store_la_LIBADD = $(XMLSEC_LIBS) $(ODBC_LIBS) \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS)
odbc_store_la_SOURCES = \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index bd4ce1e..588d804 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,15 +23,18 @@ plugins_lite_la_SOURCES = \
plugins_la_CXXFLAGS = \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
plugins_la_LIBADD = $(XMLSEC_LIBS) \
$(top_builddir)/shibsp/libshibsp.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS)
plugins_lite_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
$(PTHREAD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
plugins_la_LDFLAGS = -module -avoid-version
@@ -39,6 +42,7 @@ plugins_lite_la_LDFLAGS = -module -avoid-version
plugins_lite_la_CXXFLAGS = -DSHIBSP_LITE \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
EXTRA_DIST = resource.h plugins.rc
diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index 49b251c..bcb4628 100644
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -7,11 +7,13 @@ shibd_SOURCES = shibd.cpp
shibd_CXXFLAGS = \
$(PTHREAD_CFLAGS) \
$(SYSTEMD_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
shibd_LDADD = $(XMLSEC_LIBS) \
$(top_builddir)/shibsp/libshibsp.la \
$(PTHREAD_LIBS) \
$(SYSTEMD_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS)
EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 0604491..eb7d19d 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -247,10 +247,12 @@ libshibsp_la_CXXFLAGS = \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
libshibsp_la_LIBADD = \
$(PTHREAD_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS) \
$(XMLSEC_LIBS)
libshibsp_lite_la_LDFLAGS = -version-info 8:0:0
@@ -258,10 +260,12 @@ libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
libshibsp_lite_la_LIBADD = \
$(PTHREAD_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_lite_LIBS)
pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
diff --git a/util/Makefile.am b/util/Makefile.am
index 6b758e8..84d065e 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -7,10 +7,12 @@ resolvertest_SOURCES = resolvertest.cpp
resolvertest_CXXFLAGS = \
$(BOOST_CPPFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
resolvertest_LDADD = \
$(top_builddir)/shibsp/libshibsp.la \
$(log4shib_LIBS) $(log4cpp_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS) \
$(XMLSEC_LIBS)
@@ -23,9 +25,11 @@ EXTRA_DIST = \
mdquery_CXXFLAGS = \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
+ $(xerces_CFLAGS) \
$(xmltooling_CFLAGS)
mdquery_LDADD = \
$(top_builddir)/shibsp/libshibsp.la \
$(log4shib_LIBS) $(log4cpp_LIBS) \
+ $(xerces_LIBS) \
$(xmltooling_LIBS) \
$(XMLSEC_LIBS)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list