[cpp-sp] 07/17: Localize pthread library flags
Scott Cantor
cantor.2 at osu.edu
Wed Jun 27 20:35:48 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=ab1f2712e670a2f6db0b7ccad95e6fedcdedd32e
commit ab1f2712e670a2f6db0b7ccad95e6fedcdedd32e
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jul 14 14:58:08 2016 +0200
Localize pthread library flags
---
apache/Makefile.am | 8 ++++++++
configure.ac | 13 +++----------
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 ++++
8 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/apache/Makefile.am b/apache/Makefile.am
index 065154c..0818a0d 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -7,9 +7,11 @@ mod_shib_13_la_SOURCES = mod_shib_13.cpp
mod_shib_13_la_LDFLAGS = -module -avoid-version
mod_shib_13_la_CXXFLAGS = \
$(APXS_CFLAGS) -I$(APXS_INCLUDE) \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_13_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_lite_LIBS)
endif
@@ -20,9 +22,11 @@ mod_shib_20_la_SOURCES = mod_shib_20.cpp
mod_shib_20_la_LDFLAGS = -module -avoid-version
mod_shib_20_la_CXXFLAGS = \
$(APXS2_CFLAGS) -I$(APXS2_INCLUDE) \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_20_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_lite_LIBS)
endif
@@ -33,9 +37,11 @@ mod_shib_22_la_SOURCES = mod_shib_22.cpp
mod_shib_22_la_LDFLAGS = -module -avoid-version
mod_shib_22_la_CXXFLAGS = \
$(APXS22_CFLAGS) -I$(APXS22_INCLUDE) \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_22_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_lite_LIBS)
endif
@@ -46,9 +52,11 @@ mod_shib_24_la_SOURCES = mod_shib_24.cpp
mod_shib_24_la_LDFLAGS = -module -avoid-version
mod_shib_24_la_CXXFLAGS = \
$(APXS24_CFLAGS) -I$(APXS24_INCLUDE) \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS)
mod_shib_24_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_lite_LIBS)
endif
diff --git a/configure.ac b/configure.ac
index 2e4e2f7..4994f4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,16 +96,9 @@ if test "$shib_cv_sock_cloexec" = "yes"; then
AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported])
fi
-# checks for pthreads
-ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
-if test $enable_threads != "pthread"; then
- AC_MSG_ERROR([unable to find pthreads, currently this is required])
-else
- AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
- LIBS="$PTHREAD_LIBS $LIBS"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
- CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
-fi
+ACX_PTHREAD(
+ [AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],
+ [AC_MSG_ERROR([unable to find pthreads, currently this is required])])
# OpenSSL settings
AC_ARG_WITH(openssl,
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index 8e0f77a..d5f8d27 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -8,8 +8,10 @@ AM_CXXFLAGS = $(MEMCACHED_INCLUDE)
memcache_store_la_LDFLAGS = $(MEMCACHED_LDFLAGS) -module -avoid-version
memcache_store_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_CFLAGS)
memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS) \
+ $(PTHREAD_LIBS) \
$(xmltooling_LIBS)
memcache_store_la_SOURCES = \
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 63a7a8e..41f0ce9 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -5,10 +5,12 @@ nsapi_shibdir = $(libdir)/@PACKAGE_NAME@
nsapi_shib_LTLIBRARIES = nsapi_shib.la
nsapi_shib_la_SOURCES = nsapi_shib.cpp
nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE) \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS)
nsapi_shib_la_LDFLAGS = -module -avoid-version
nsapi_shib_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_lite_LIBS)
endif
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index ec6f061..37d1d9e 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -7,8 +7,10 @@ AM_CFLAGS = $(ODBC_CFLAGS)
AM_CXXFLAGS = $(ODBC_CFLAGS)
odbc_store_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_CFLAGS)
odbc_store_la_LIBADD = $(XMLSEC_LIBS) $(ODBC_LIBS) \
+ $(PTHREAD_LIBS) \
$(xmltooling_LIBS)
odbc_store_la_SOURCES = \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e46a617..2e21a2d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -22,18 +22,22 @@ plugins_lite_la_SOURCES = \
${common_sources}
plugins_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_CFLAGS)
plugins_la_LIBADD = $(XMLSEC_LIBS) \
$(top_builddir)/shibsp/libshibsp.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_LIBS)
plugins_lite_la_LIBADD = \
$(top_builddir)/shibsp/libshibsp-lite.la \
+ $(PTHREAD_LIBS) \
$(xmltooling_lite_LIBS)
plugins_la_LDFLAGS = -module -avoid-version
plugins_lite_la_LDFLAGS = -module -avoid-version
plugins_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+ $(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS)
EXTRA_DIST = resource.h plugins.rc
diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index e78010f..49b251c 100644
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -5,10 +5,12 @@ sbin_PROGRAMS = shibd
shibd_SOURCES = shibd.cpp
shibd_CXXFLAGS = \
+ $(PTHREAD_CFLAGS) \
$(SYSTEMD_CFLAGS) \
$(xmltooling_CFLAGS)
shibd_LDADD = $(XMLSEC_LIBS) \
$(top_builddir)/shibsp/libshibsp.la \
+ $(PTHREAD_LIBS) \
$(SYSTEMD_LIBS) \
$(xmltooling_LIBS)
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index bef296c..8a6b4b7 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -244,17 +244,21 @@ libshibsp_la_SOURCES = \
# http://sources.redhat.com/autobook/autobook/autobook_91.html
libshibsp_la_LDFLAGS = -version-info 8:0:0
libshibsp_la_CXXFLAGS = \
+ $(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
$(xmltooling_CFLAGS)
libshibsp_la_LIBADD = \
+ $(PTHREAD_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
$(xmltooling_LIBS) \
$(XMLSEC_LIBS)
libshibsp_lite_la_LDFLAGS = -version-info 8:0:0
libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+ $(PTHREAD_CFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
$(xmltooling_lite_CFLAGS)
libshibsp_lite_la_LIBADD = \
+ $(PTHREAD_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
$(xmltooling_lite_LIBS)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list