[cpp-opensaml] 04/19: Localize Boost and pthread library flags

[Scott Cantor]

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

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

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

commit c91d6582e129e234b5dcb3bd2b0535ff1ed6b131
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Mon Jul 11 11:37:26 2016 +0200

    Localize Boost and pthread library flags
---
 configure.ac     | 13 +++----------
 saml/Makefile.am |  4 ++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2174e6a..d33fe0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,15 +71,9 @@ AC_HEADER_DIRENT
 AC_CHECK_FUNCS([strchr strdup strstr])
 
 # 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
@@ -130,7 +124,6 @@ BOOST_LAMBDA
 BOOST_POINTER_CONTAINER
 BOOST_SMART_PTR
 BOOST_STRING_ALGO
-CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 
 AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
     [AC_DEFINE([OPENSAML_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
diff --git a/saml/Makefile.am b/saml/Makefile.am
index 18bfd4f..768d197 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -180,10 +180,14 @@ libsaml_la_SOURCES = \
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libsaml_la_LDFLAGS = -version-info 10:0:0
+libsaml_la_CPPFLAGS = \
+    $(BOOST_CPPFLAGS)
 libsaml_la_CXXFLAGS = \
+    $(PTHREAD_CFLAGS) \
     $(xmltooling_CFLAGS) \
     $(log4shib_CFLAGS) $(log4cpp_CFLAGS)
 libsaml_la_LIBADD = \
+    $(PTHREAD_LIBS) \
     $(xmltooling_LIBS) \
     $(log4shib_LIBS) $(log4cpp_LIBS)
 

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