Check if libpthread is required or not.
This commit is contained in:
parent
866dc0134a
commit
070ac5b0b7
|
@ -267,6 +267,11 @@ AC_SEARCH_LIBS(clock_gettime, rt, [RTLIB=$LIBS])
|
||||||
AC_CHECK_FUNCS(clock_gettime)
|
AC_CHECK_FUNCS(clock_gettime)
|
||||||
AC_SUBST(RTLIB)
|
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
|
LIBS=$saved_LIBS
|
||||||
dnl ======================
|
dnl ======================
|
||||||
|
|
||||||
|
@ -282,7 +287,7 @@ AC_TRY_COMPILE(
|
||||||
|
|
||||||
dnl check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported
|
dnl check if pthread_condattr_setclock(CLOCK_MONOTONE) is supported
|
||||||
saved_LIBS=$LIBS
|
saved_LIBS=$LIBS
|
||||||
LIBS="-lpthread"
|
LIBS=$PTHREADLIB
|
||||||
AC_MSG_CHECKING([for pthread_condattr_setclock(CLOCK_MONOTONE)])
|
AC_MSG_CHECKING([for pthread_condattr_setclock(CLOCK_MONOTONE)])
|
||||||
AC_TRY_RUN(
|
AC_TRY_RUN(
|
||||||
[#include <pthread.h>
|
[#include <pthread.h>
|
||||||
|
|
|
@ -102,7 +102,7 @@ INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/
|
||||||
AM_CFLAGS = -rdynamic \
|
AM_CFLAGS = -rdynamic \
|
||||||
-DIPSEC_DIR=\"${ipsecdir}\" \
|
-DIPSEC_DIR=\"${ipsecdir}\" \
|
||||||
-DIPSEC_PIDDIR=\"${piddir}\"
|
-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
|
# compile options
|
||||||
#################
|
#################
|
||||||
|
|
|
@ -3,6 +3,6 @@ lib_LTLIBRARIES = libfast.la
|
||||||
libfast_la_SOURCES = context.h dispatcher.c request.h session.h \
|
libfast_la_SOURCES = context.h dispatcher.c request.h session.h \
|
||||||
controller.h dispatcher.h request.c session.c filter.h
|
controller.h dispatcher.h request.c session.c filter.h
|
||||||
libfast_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
|
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
|
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I/usr/include/ClearSilver
|
||||||
AM_CFLAGS = -rdynamic
|
AM_CFLAGS = -rdynamic
|
||||||
|
|
|
@ -58,7 +58,7 @@ utils/optionsfrom.c utils/optionsfrom.h \
|
||||||
utils/backtrace.c utils/backtrace.h \
|
utils/backtrace.c utils/backtrace.h \
|
||||||
plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.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
|
INCLUDES = -I$(top_srcdir)/src/libstrongswan
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
|
|
|
@ -75,7 +75,7 @@ AM_CFLAGS = \
|
||||||
pluto_LDADD = \
|
pluto_LDADD = \
|
||||||
$(LIBSTRONGSWANDIR)/libstrongswan.la \
|
$(LIBSTRONGSWANDIR)/libstrongswan.la \
|
||||||
$(LIBFREESWANDIR)/libfreeswan.a \
|
$(LIBFREESWANDIR)/libfreeswan.a \
|
||||||
-lresolv -lpthread $(DLLIB)
|
-lresolv $(PTHREADLIB) $(DLLIB)
|
||||||
|
|
||||||
_pluto_adns_LDADD = \
|
_pluto_adns_LDADD = \
|
||||||
$(LIBFREESWANDIR)/libfreeswan.a \
|
$(LIBFREESWANDIR)/libfreeswan.a \
|
||||||
|
|
Loading…
Reference in New Issue