[cpp-sp] branch master updated: Change libtool archive handling, adjust some lib checks.
Scott Cantor
cantor.2 at osu.edu
Thu Jun 21 22:17:21 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=81fbce5f4aa5d54c44b2dfcc4e37ab9212c89967
The following commit(s) were added to refs/heads/master by this push:
new 81fbce5 Change libtool archive handling, adjust some lib checks.
81fbce5 is described below
commit 81fbce5f4aa5d54c44b2dfcc4e37ab9212c89967
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jun 21 22:17:16 2018 -0400
Change libtool archive handling, adjust some lib checks.
---
adfs/Makefile.am | 3 ---
apache/Makefile.am | 6 ------
configure.ac | 26 ++++++++++++--------------
memcache-store/Makefile.am | 3 ---
nsapi_shib/Makefile.am | 4 ----
odbc-store/Makefile.am | 3 ---
plugins/Makefile.am | 5 +----
shibboleth.spec.in | 10 ++++++----
shibsp/Makefile.am | 3 ---
9 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index c9f3b2f..44714eb 100644
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -19,7 +19,4 @@ adfs_la_LDFLAGS = -module -avoid-version
adfs_lite_la_LDFLAGS = -module -avoid-version
adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE
-install-data-hook:
- for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-
EXTRA_DIST = resource.h adfs.rc
diff --git a/apache/Makefile.am b/apache/Makefile.am
index a694c8a..ede1e63 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -40,12 +40,6 @@ mod_shib_24_la_LIBADD = $(LITE_LIBS) \
$(top_builddir)/shibsp/libshibsp-lite.la
endif
-install-data-hook:
- for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
- for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
- for la in $(modshib22_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib22dir)/$$la ; done
- for la in $(modshib24_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib24dir)/$$la ; done
-
EXTRA_DIST = mod_shib.cpp \
mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp mod_shib_24.cpp \
resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc mod_shib_24.rc
diff --git a/configure.ac b/configure.ac
index e0ad52e..d97ea13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,15 +300,14 @@ AC_CHECK_HEADER([xmltooling/base.h],,AC_MSG_ERROR([unable to find xmltooling hea
save_LIBS="$LIBS"
LIBS="$XMLSEC_LIBS $LIBS"
-AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/version.h>]],
- [[#if _XMLTOOLING_VERSION >= 10500
-xmltooling::XMLToolingConfig::getConfig();
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([[#include <xmltooling/version.h>]],
+ [[#if _XMLTOOLING_VERSION >= 30000
+int i = 0;
#else
-#error Need XMLTooling version 1.5 or higher
+#error Need XMLTooling version 3.0 or higher
#endif]])],
- ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
+ ,[AC_MSG_ERROR([XMLTooling version 3.0.0 or greater is required.])])
# restore master libs
LIBS="$save_LIBS"
@@ -348,15 +347,14 @@ save_LIBS="$LIBS"
LIBS="$XMLSEC_LIBS $LIBS"
AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,AC_MSG_ERROR([unable to find OpenSAML header files]))
-AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <saml/SAMLConfig.h>
-#include <saml/version.h>]],
-[[#if _OPENSAML_VERSION >= 20500
-opensaml::SAMLConfig::getConfig();
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM([[#include <saml/version.h>]],
+[[#if _OPENSAML_VERSION >= 30000
+int i = 0;
#else
-#error Need OpenSAML version 2.5 or higher
+#error Need OpenSAML version 3.0 or higher
#endif]])],
- ,[AC_MSG_ERROR([unable to link with OpenSAML, or version was too old])
+ ,[AC_MSG_ERROR([OpenSAML version 3.0.0 or greater is required.])
])
# restore master libs
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index 6f286be..ed1374e 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -12,7 +12,4 @@ memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS)
memcache_store_la_SOURCES = \
memcache-store.cpp
-install-data-hook:
- for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-
EXTRA_DIST = memcache-store.rc resource.h
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 1447a75..aaeff24 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -8,10 +8,6 @@ nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE)
nsapi_shib_la_LDFLAGS = -module -avoid-version
nsapi_shib_la_LIBADD = $(LITE_LIBS) \
$(top_builddir)/shibsp/libshibsp-lite.la
-
-install-data-hook:
- for la in $(nsapi_shib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(nsapi_shibdir)/$$la ; done
-
endif
EXTRA_DIST = resource.h nsapi_shib.rc nsapi_shib.cpp
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index 008096f..67c71f0 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -13,7 +13,4 @@ odbc_store_la_SOURCES = \
odbc_store_la_LDFLAGS = -module -avoid-version
-install-data-hook:
- for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-
EXTRA_DIST = odbc-store.rc resource.h
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 52c3c08..92a416b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = \
common_sources = \
plugins.cpp \
- AttributeResolverHandler.cpp \
+ AttributeResolverHandler.cpp \
TimeAccessControl.cpp
plugins_la_SOURCES = \
@@ -31,7 +31,4 @@ plugins_la_LDFLAGS = -module -avoid-version
plugins_lite_la_LDFLAGS = -module -avoid-version
plugins_lite_la_CPPFLAGS = -DSHIBSP_LITE
-install-data-hook:
- for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-
EXTRA_DIST = resource.h plugins.rc
diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 6d4b6d2..0256b99 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -19,7 +19,7 @@ PreReq: xmltooling-schemas >= 3.0.0, opensaml-schemas >= 3.0.0
PreReq: %{insserv_prereq} %{fillup_prereq}
%endif
%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
-BuildRequires: systemd-devel, pkgconfig
+BuildRequires: systemd-devel
%endif
BuildRequires: libxerces-c-devel >= 3.2
BuildRequires: libxml-security-c-devel >= 2.0.0
@@ -34,7 +34,7 @@ BuildRequires: chrpath
%if 0%{?suse_version} > 1300
BuildRequires: libtool
%endif
-BuildRequires: gcc-c++, zlib-devel, boost-devel >= 1.32.0
+BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
%{!?_without_gssapi:BuildRequires: krb5-devel}
%{!?_without_doxygen:BuildRequires: doxygen}
%{!?_without_odbc:BuildRequires:unixODBC-devel}
@@ -59,7 +59,7 @@ Requires(pre): pwdutils
%{!?_without_builtinapache:BuildRequires: apache2-devel}
%{?systemd_requires}
%if 0%{?suse_version} >= 1210
-BuildRequires: systemd-rpm-macros, systemd-devel, pkgconfig
+BuildRequires: systemd-rpm-macros, systemd-devel
%endif
%endif
@@ -409,8 +409,10 @@ exit 0
%{_bindir}/resolvertest
%{_libdir}/libshibsp.so.*
%{_libdir}/libshibsp-lite.so.*
+%exclude %{_libdir}/*.la
%dir %{_libdir}/shibboleth
-%{_libdir}/shibboleth/*
+%{_libdir}/shibboleth/*.so
+%exclude %{_libdir}/shibboleth/*.la
%attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
%if 0%{?suse_version} < 1300
%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 61c4ada..e792086 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -272,9 +272,6 @@ paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
cmp -s $@ $@.tmp || mv $@.tmp $@
rm -f $@.tmp
-install-exec-hook:
- for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
-
EXTRA_DIST = \
config_pub.h.in \
config_pub_win32.h\
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list