From 3220989f56818a4aa949a026453b3b7bd97c9ca9 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 17 Jul 2016 19:17:12 +0900 Subject: [PATCH] Link external libraries to libaria2 with --enable-libaria2 --- src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8614834..4bcb977 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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@