mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-20 13:03:50 +00:00
Fix #1168
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
if USE_SYSTEM_SHARED_LIB
|
||||
SUBDIRS = src
|
||||
else
|
||||
SUBDIRS = libcork libipset src
|
||||
endif
|
||||
|
||||
if ENABLE_DOCUMENTATION
|
||||
SUBDIRS += doc
|
||||
|
||||
+9
-6
@@ -282,14 +282,17 @@ AC_CHECK_LIB([udns], [dns_dnlen], [LIBS="-ludns $LIBS"], [AC_MSG_ERROR([Couldn't
|
||||
AC_CHECK_HEADERS([ev.h], [], [AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])])
|
||||
AC_CHECK_LIB([ev], [ev_loop_destroy], [LIBS="-lev $LIBS"], [AC_MSG_ERROR([Couldn't find libev. Try installing libev-dev@<:@el@:>@.])])
|
||||
|
||||
AC_CONFIG_FILES([shadowsocks-libev.pc
|
||||
Makefile
|
||||
src/Makefile])
|
||||
|
||||
AM_COND_IF([USE_SYSTEM_SHARED_LIB],
|
||||
[],
|
||||
[AC_CONFIG_FILES([libcork/Makefile
|
||||
libipset/Makefile])])
|
||||
|
||||
AM_COND_IF([ENABLE_DOCUMENTATION],
|
||||
[AC_CONFIG_FILES([doc/Makefile])
|
||||
])
|
||||
|
||||
AC_CONFIG_FILES([shadowsocks-libev.pc
|
||||
Makefile
|
||||
libcork/Makefile
|
||||
libipset/Makefile
|
||||
src/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
+9
-3
@@ -2,13 +2,19 @@ VERSION_INFO = 2:0:0
|
||||
|
||||
AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations -fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE
|
||||
AM_CFLAGS += $(PTHREAD_CFLAGS)
|
||||
if !USE_SYSTEM_SHARED_LIB
|
||||
AM_CFLAGS += -I$(top_srcdir)/libipset/include
|
||||
AM_CFLAGS += -I$(top_srcdir)/libcork/include
|
||||
endif
|
||||
AM_CFLAGS += $(LIBPCRE_CFLAGS)
|
||||
|
||||
SS_COMMON_LIBS = $(top_builddir)/libipset/libipset.la \
|
||||
$(top_builddir)/libcork/libcork.la \
|
||||
$(INET_NTOP_LIB) $(LIBPCRE_LIBS)
|
||||
SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS)
|
||||
if !USE_SYSTEM_SHARED_LIB
|
||||
SS_COMMON_LIBS += $(top_builddir)/libipset/libipset.la \
|
||||
$(top_builddir)/libcork/libcork.la
|
||||
else
|
||||
SS_COMMON_LIBS += -lcork -lcorkipset
|
||||
endif
|
||||
SS_COMMON_LIBS += -lev -lsodium -lm
|
||||
|
||||
bin_PROGRAMS = ss-local ss-tunnel ss-server ss-manager
|
||||
|
||||
Reference in New Issue
Block a user