Target AX_PTHREAD usage
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-cpp/trunk@1894407 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE.txt b/NOTICE.txt
index f12901e..8187a7a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Santuario XML-Security-C Library
-Copyright 2010-2018 The Apache Software Foundation
+Copyright 2010-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/configure.ac b/configure.ac
index ab77e92..acadb72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,12 +60,7 @@
CXXFLAGS="-Wall $GCC_CXXFLAGS"
fi
-# pthreads
-AX_PTHREAD
-CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
-LIBS="${LIBS} ${PTHREAD_LIBS}"
-CC="${PTHREAD_CC}"
+AX_PTHREAD(,[AC_MSG_ERROR([unable to find pthreads, currently this is required])])
# Check for required includes
AC_CHECK_HEADERS([unistd.h direct.h])
diff --git a/xml-security-c.pc.in b/xml-security-c.pc.in
index b254803..c7249b0 100644
--- a/xml-security-c.pc.in
+++ b/xml-security-c.pc.in
@@ -7,7 +7,7 @@
Description: Apache XML security C++ library
Version: @VERSION@
Libs: -L${libdir} -lxml-security-c
-Libs.private: @xalan_LIBS@
-Cflags: -I${includedir} @xalan_CXXFLAGS@
+Libs.private: @xalan_LIBS@ @PTHREAD_LIBS@
+Cflags: -I${includedir} @xalan_CXXFLAGS@ @PTHREAD_CFLAGS@
Requires: @AX_PACKAGE_REQUIRES@
Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@
diff --git a/xsec/Makefile.am b/xsec/Makefile.am
index ec5dd90..f222544 100644
--- a/xsec/Makefile.am
+++ b/xsec/Makefile.am
@@ -160,13 +160,15 @@
$(xalan_CXXFLAGS) \
$(xerces_CXXFLAGS) \
$(openssl_CFLAGS) \
- $(nss_CFLAGS)
+ $(nss_CFLAGS) \
+ $(PTHREAD_CFLAGS)
libxml_security_c_la_LIBADD = \
$(xalan_LIBS) \
$(xerces_LIBS) \
$(openssl_LIBS) \
- $(nss_LIBS)
+ $(nss_LIBS) \
+ $(PTHREAD_LIBS)
lib_LTLIBRARIES = libxml-security-c.la
