Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-28 19:53:46 +00:00
Code Releases Activity

update pthread lib configs

Browse Source
This commit is contained in:
Max Lv
2015-09-09 18:53:51 +09:00
parent d8e83f6598
commit 1b04b52490
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+6
View File
@@ -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"
configure.ac
+6
View File
@@ -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
src/Makefile.am
+1 -4
View File
@@ -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 \
src/Makefile.in
+2 -5
View File
@@ -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 \