Link external libraries to libaria2 with --enable-libaria2

pull/709/head
Tatsuhiro Tsujikawa 2016-07-17 19:17:12 +09:00
parent f6ac3fa691
commit 3220989f56
1 changed files with 9 additions and 2 deletions

View File

@ -716,7 +716,6 @@ endif # !ENABLE_LIBARIA2
libaria2_la_SOURCES = $(SRCS)
libaria2_la_LIBADD = @WSLAY_LIBS@ @LTLIBINTL@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib -I$(top_srcdir)/intl\
@ -743,7 +742,7 @@ AM_LDFLAGS = \
@EXTRALDFLAGS@ \
@APPLETLS_LDFLAGS@
LDADD = libaria2.la @ALLOCA@ \
EXTLDADD = @ALLOCA@ \
@EXTRALIBS@ \
@ZLIB_LIBS@ \
@LIBUV_LIBS@ \
@ -762,6 +761,14 @@ LDADD = libaria2.la @ALLOCA@ \
@TCMALLOC_LIBS@ \
@JEMALLOC_LIBS@
LDADD = libaria2.la
if ENABLE_LIBARIA2
libaria2_la_LIBADD = $(EXTLDADD)
else # !ENABLE_LIBARIA2
LDADD += $(EXTLDADD)
endif # !ENABLE_LIBARIA2
AM_CFLAGS = @EXTRACFLAGS@
AM_CXXFLAGS = @WARNCXXFLAGS@ @CXX1XCXXFLAGS@ @EXTRACXXFLAGS@