[cpp-log4shib] 12/17: Use PTHREAD_LIBS explicitly

[Scott Cantor]

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

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

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

commit b585bcf5bc2241ca4f6338e6c18d7e885c78e96b
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Mon Jun 25 10:23:53 2018 +0200

    Use PTHREAD_LIBS explicitly
---
 configure.ac      | 1 -
 src/Makefile.am   | 1 +
 tests/Makefile.am | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6fd7177..06b8504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,6 @@ else
     AC_DEFINE(HAVE_THREADING,1,[define if threading is enabled])
     AC_DEFINE(USE_PTHREADS,1,[define if pthread library is available])
     AC_DEFINE(_PTHREADS,1,[define for STL if pthread library is used])
-    LIBS="$PTHREAD_LIBS $LIBS"
     AM_CFLAGS="$PTHREAD_CFLAGS $AM_CFLAGS"
     AM_CXXFLAGS="$PTHREAD_CFLAGS $AM_CXXFLAGS"
     CC="$PTHREAD_CC"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e3529a..9e9cb50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,3 +49,4 @@ liblog4shib_la_SOURCES = \
 	AbortAppender.cpp
 
 liblog4shib_la_LDFLAGS = -version-info @LT_VERSION@
+liblog4shib_la_LIBADD = $(PTHREAD_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fd19f3e..45d215f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ check_DATA = log4shib.init log4shib.properties testProperties.properties \
 EXTRA_DIST = $(check_DATA) testNTEventLog.cpp
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-LDADD = ../src/liblog4shib.la
+LDADD = ../src/liblog4shib.la $(PTHREAD_LIBS)
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 sscpp706_CPPFLAGS = $(AM_CPPFLAGS) -DDATADIR=\"$(srcdir)\"

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