Check if libpthread is required or not.

diff --git a/configure.in b/configure.in
index e02fedbd7467931dc4ee34653b54591003ec6e8b..a80a81b95c9abf28cadfe20b2c6f027136b6a697 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -267,6 +267,11 @@ AC_SEARCH_LIBS(clock_gettime, rt, [RTLIB=$LIBS])
 AC_CHECK_FUNCS(clock_gettime)
 AC_SUBST(RTLIB)
 
+dnl Android has pthread_* functions in bionic (libc), others need libpthread
+LIBS=""
+AC_SEARCH_LIBS(pthread_create, pthread, [PTHREADLIB=$LIBS])
+AC_SUBST(PTHREADLIB)
+
 LIBS=$saved_LIBS
 dnl ======================
 
@@ -282,7 +287,7 @@ AC_TRY_COMPILE(
 
 dnl check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported
 saved_LIBS=$LIBS
-LIBS="-lpthread"
+LIBS=$PTHREADLIB
 AC_MSG_CHECKING([for pthread_condattr_setclock(CLOCK_MONOTONE)])
 AC_TRY_RUN(
        [#include <pthread.h>

diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 1d6fa6dbe1d8809789d4d0a48e8e220430e43df2..2a82b4be77f85c6bfd55fa6e852dc3e70c184ea1 100644 (file)
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -102,7 +102,7 @@ INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/
 AM_CFLAGS = -rdynamic \
   -DIPSEC_DIR=\"${ipsecdir}\" \
   -DIPSEC_PIDDIR=\"${piddir}\"
-charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) $(SOCKLIB)
+charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lm $(PTHREADLIB) $(DLLIB) $(SOCKLIB)
 
 # compile options
 #################

diff --git a/src/libfast/Makefile.am b/src/libfast/Makefile.am
index 6104f335dfa1fb9c07166bdec0a3f0cd6cd2d7ef..870dcd6f13d3144066f47fb64220662082e14332 100644 (file)
--- a/src/libfast/Makefile.am
+++ b/src/libfast/Makefile.am
@@ -3,6 +3,6 @@ lib_LTLIBRARIES = libfast.la
 libfast_la_SOURCES = context.h dispatcher.c request.h session.h \
   controller.h dispatcher.h request.c session.c filter.h
 libfast_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
-  -lfcgi -lpthread -lneo_cgi -lneo_cs -lneo_utl -lz
+  -lfcgi -lneo_cgi -lneo_cs -lneo_utl -lz $(PTHREADLIB)
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I/usr/include/ClearSilver
 AM_CFLAGS = -rdynamic

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 301505071f1825c9dae13df651370962758fb50b..fd297a0b704e6e2c0808a39e36e45fa7a659e146 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -58,7 +58,7 @@ utils/optionsfrom.c utils/optionsfrom.h \
 utils/backtrace.c utils/backtrace.h \
 plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
 
-libstrongswan_la_LIBADD = -lpthread $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB)
+libstrongswan_la_LIBADD = $(PTHREADLIB) $(DLLIB) $(BTLIB) $(SOCKLIB) $(RTLIB)
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan
 AM_CFLAGS = \

diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 14a13a52b83c60f6729f3b15c407cab80974839e..b83e4be33b067c4f63a7bae9b68c8a8b3d2b026f 100644 (file)
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -75,7 +75,7 @@ AM_CFLAGS = \
 pluto_LDADD = \
 $(LIBSTRONGSWANDIR)/libstrongswan.la \
 $(LIBFREESWANDIR)/libfreeswan.a \
--lresolv -lpthread $(DLLIB)
+-lresolv $(PTHREADLIB) $(DLLIB)
 
 _pluto_adns_LDADD = \
 $(LIBFREESWANDIR)/libfreeswan.a \