move pthread flags/libs to autoconf defines so available to library proper and external tests/examples

This commit is contained in:
toddouska 2013-04-01 15:50:13 -07:00
parent 4b90474581
commit 0005b4cbe4
4 changed files with 6 additions and 10 deletions

View File

@ -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
])

View File

@ -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

View File

@ -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

View File

@ -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