diff --git a/configure b/configure index 545b20b4..201ad765 100755 --- a/configure +++ b/configure @@ -15509,6 +15509,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test "$acx_pthread_ok" != "yes"; then + as_fn_error $? "Missing Pthread Library" "$LINENO" 5 +else + LIBS="$LIBS $PTHREAD_LIBS" +fi + subdirs="$subdirs libsodium" diff --git a/configure.ac b/configure.ac index 702a0db0..6c1901e2 100755 --- a/configure.ac +++ b/configure.ac @@ -227,6 +227,12 @@ AC_CHECK_FUNCS([malloc memset socket]) ACX_PTHREAD +if test "$acx_pthread_ok" != "yes"; then + AC_MSG_ERROR([Missing Pthread Library]) +else + LIBS="$LIBS $PTHREAD_LIBS" +fi + AC_CONFIG_SUBDIRS([libsodium]) AC_CONFIG_FILES([ shadowsocks-libev.pc diff --git a/src/Makefile.am b/src/Makefile.am index e389d743..49489926 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,10 +8,7 @@ AM_CFLAGS += -I$(top_srcdir)/libipset/include AM_CFLAGS += -I$(top_srcdir)/libcork/include AM_CFLAGS += -I$(top_srcdir)/libsodium/src/libsodium/include -AM_LDFLAGS = -static - -SS_COMMON_LIBS = $(PTHREAD_LIBS) \ - $(top_builddir)/libev/libev.la \ +SS_COMMON_LIBS = $(top_builddir)/libev/libev.la \ $(top_builddir)/libipset/libipset.la \ $(top_builddir)/libcork/libcork.la \ $(top_builddir)/libsodium/src/libsodium/libsodium.la \ diff --git a/src/Makefile.in b/src/Makefile.in index cf9fdab2..8344e0b4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -108,8 +108,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ - $(top_builddir)/libev/libev.la \ +am__DEPENDENCIES_2 = $(top_builddir)/libev/libev.la \ $(top_builddir)/libipset/libipset.la \ $(top_builddir)/libcork/libcork.la \ $(top_builddir)/libsodium/src/libsodium/libsodium.la \ @@ -369,9 +368,7 @@ AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations \ -I$(top_srcdir)/libudns -I$(top_srcdir)/libipset/include \ -I$(top_srcdir)/libcork/include \ -I$(top_srcdir)/libsodium/src/libsodium/include -AM_LDFLAGS = -static -SS_COMMON_LIBS = $(PTHREAD_LIBS) \ - $(top_builddir)/libev/libev.la \ +SS_COMMON_LIBS = $(top_builddir)/libev/libev.la \ $(top_builddir)/libipset/libipset.la \ $(top_builddir)/libcork/libcork.la \ $(top_builddir)/libsodium/src/libsodium/libsodium.la \