From 0005b4cbe46e2b022308b6e2d2b810d2e8f600ac Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Mon, 1 Apr 2013 15:50:13 -0700
Subject: [PATCH] move pthread flags/libs to autoconf defines so available to
 library proper and external tests/examples

---
 configure.ac         | 3 ++-
 src/include.am       | 5 -----
 tests/include.am     | 4 ++--
 testsuite/include.am | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8b0600148..c1cc99230 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,8 @@ AC_ARG_ENABLE([singlethreaded],
 AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
        AX_PTHREAD([
                    AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
-                   AM_CFLAGS="-D_POSIX_THREADS $AM_CFLAGS"
+                   AM_CFLAGS="-D_POSIX_THREADS $AM_CFLAGS $PTHREAD_CFLAGS"
+                   LIBS="$LIBS $PTHREAD_LIBS"
                    ],[
                       ENABLED_SINGLETHREADED=yes
                       ])
diff --git a/src/include.am b/src/include.am
index ce61e0331..9bfc2315c 100644
--- a/src/include.am
+++ b/src/include.am
@@ -131,11 +131,6 @@ if BUILD_CRL
 src_libcyassl_la_SOURCES += src/crl.c
 endif
 
-if BUILD_CRL_MONITOR
-src_libcyassl_la_CFLAGS += $(PTHREAD_CFLAGS)
-src_libcyassl_la_LIBADD += $(PTHREAD_LIBS)
-endif
-
 if BUILD_LIBZ
 src_libcyassl_la_SOURCES += ctaocrypt/src/compress.c
 endif
diff --git a/tests/include.am b/tests/include.am
index 0065f4006..239a169be 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -13,8 +13,8 @@ tests_unit_SOURCES = \
                   tests/hash.c \
                   examples/client/client.c \
                   examples/server/server.c
-tests_unit_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-tests_unit_LDADD        = src/libcyassl.la  $(PTHREAD_LIBS)
+tests_unit_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS)
+tests_unit_LDADD        = src/libcyassl.la
 tests_unit_DEPENDENCIES = src/libcyassl.la
 endif
 EXTRA_DIST += tests/unit.h
diff --git a/testsuite/include.am b/testsuite/include.am
index 161a422de..6f4bac772 100644
--- a/testsuite/include.am
+++ b/testsuite/include.am
@@ -13,8 +13,8 @@ testsuite_testsuite_SOURCES = \
 			      examples/echoserver/echoserver.c \
 			      examples/server/server.c \
 			      testsuite/testsuite.c
-testsuite_testsuite_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-testsuite_testsuite_LDADD        = src/libcyassl.la $(PTHREAD_LIBS)
+testsuite_testsuite_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS)
+testsuite_testsuite_LDADD        = src/libcyassl.la
 testsuite_testsuite_DEPENDENCIES = src/libcyassl.la
 endif
 EXTRA_DIST += testsuite/testsuite.sln