From df595fcb73e5fdb873b545576b3a43d1d8731d6d Mon Sep 17 00:00:00 2001 From: Max Lv Date: Thu, 2 Feb 2017 20:27:06 +0800 Subject: [PATCH] Fix #1168 --- Makefile.am | 4 ++++ configure.ac | 15 +++++++++------ src/Makefile.am | 12 +++++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4a25c0f2..06af285c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ +if USE_SYSTEM_SHARED_LIB +SUBDIRS = src +else SUBDIRS = libcork libipset src +endif if ENABLE_DOCUMENTATION SUBDIRS += doc diff --git a/configure.ac b/configure.ac index b91c297c..20a2d244 100755 --- a/configure.ac +++ b/configure.ac @@ -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@:>@.])]) -AM_COND_IF([ENABLE_DOCUMENTATION], - [AC_CONFIG_FILES([doc/Makefile]) -]) - AC_CONFIG_FILES([shadowsocks-libev.pc Makefile - libcork/Makefile - libipset/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_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 5f448483..e17bee0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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