FS-10690: [Build-System] Compile libks within libblade.

diff --git a/libs/libblade/Makefile.am b/libs/libblade/Makefile.am
index 6cd793d95c45af025d5fa9579ebfb1b1781232a2..5c5b39e6e5c4b172ec4c129ba253e676f4260c40 100644 (file)
--- a/libs/libblade/Makefile.am
+++ b/libs/libblade/Makefile.am
@@ -7,8 +7,10 @@ CIVETWEB_VERSION=1.9.1
 CIVETWEB=civetweb-$(CIVETWEB_VERSION)
 CIVETWEB_DIR=$(top_srcdir)/../$(CIVETWEB)
 CIVETWEB_LIB=$(top_srcdir)/../$(CIVETWEB)/libcivetweb.a
+LIBKS_DIR=$(top_srcdir)/../libks
+LIBKS=$(LIBKS_DIR)/libks.la
 
-AM_CFLAGS    += -I$(top_srcdir)/src -I$(top_srcdir)/src/include -I$(CIVETWEB_DIR)/include
+AM_CFLAGS    += -I$(top_srcdir)/src -I$(top_srcdir)/src/include -I$(CIVETWEB_DIR)/include -I$(LIBKS_DIR)/src/include
 AM_LDFLAGS   += -L$(CIVETWEB_DIR)
 
 noinst_LTLIBRARIES      = libunqlite.la
@@ -37,7 +39,7 @@ library_include_HEADERS += src/include/blade_protocol.h src/include/blade_subscr
 library_include_HEADERS += src/include/blade_transport.h src/include/blade_transport_wss.h
 library_include_HEADERS += src/include/unqlite.h test/tap.h
 
-BUILT_SOURCES=$(CIVETWEB_LIB)
+BUILT_SOURCES=$(CIVETWEB_LIB) $(LIBKS)
 
 $(CIVETWEB_LIB): $(CIVETWEB_DIR)
        cd $(CIVETWEB_DIR) && $(MAKE) lib USE_STACK_SIZE=102400 MAX_REQUEST_SIZE=16384 WITH_LUA=1 LUA_COMPAT_ALL=1 USE_LUA_SQLITE3=1 USE_LUA_FILE_SYSTEM=1 WITH_IPV6=1 WITH_WEBSOCKET=1 && $(MAKE) lib USE_STACK_SIZE=102400 MAX_REQUEST_SIZE=16384 WITH_LUA=1 LUA_COMPAT_ALL=1 USE_LUA_SQLITE3=1 USE_LUA_FILE_SYSTEM=1 WITH_IPV6=1 WITH_WEBSOCKET=1 WITH_DUKTAPE=1
@@ -45,6 +47,9 @@ $(CIVETWEB_LIB): $(CIVETWEB_DIR)
 $(CIVETWEB_DIR):
        $(GETLIB) $(CIVETWEB).tar.gz     
 
+$(LIBKS):
+       cd $(top_srcdir)/../libks && /bin/sh ./bootstrap.sh && /bin/sh ./configure && $(MAKE)
+        
 tests: libblade.la
        $(MAKE) -C test tests
 

diff --git a/libs/libblade/configure.ac b/libs/libblade/configure.ac
index 80d9c5587211929838fe2e180a3b690d67df86b9..c19b7e7f980569b55448394ee592cc78b5cdab7e 100644 (file)
--- a/libs/libblade/configure.ac
+++ b/libs/libblade/configure.ac
@@ -280,7 +280,7 @@ if test "${LIBKS_CFLAGS}" = ""; then
                AC_MSG_WARN([local development version of libks is being used. This is probably not portable.])
                LIBKS_CFLAGS="-I`pwd`/../libks/src/include"
                LIBKS_LIBS="-L`pwd`/../libks/.libs/ -lks",
-               AC_MSG_ERROR([libks cannot be found. Fatal Error]))
+               AC_MSG_WARN([libks cannot be found.]))
 fi
 
 AM_CPPFLAGS="-I./src -I./src/include ${LIBKS_CFLAGS} ${openssl_CFLAGS} ${SODIUM_CFLAGS}"

diff --git a/libs/libblade/switchblade/Makefile.am b/libs/libblade/switchblade/Makefile.am
index 5c6be0e6bab8bad92c3562df53f282016b1a8a8a..312c0b2e47d345f908e8b240ab58e6064232d091 100644 (file)
--- a/libs/libblade/switchblade/Makefile.am
+++ b/libs/libblade/switchblade/Makefile.am
@@ -1,5 +1,5 @@
-AM_CFLAGS += -I$(abs_top_srcdir)/src/include -g -ggdb -O0 -I$(top_srcdir)/../civetweb-1.9.1/include
-TEST_LDADD = $(abs_top_builddir)/libblade.la -L$(top_srcdir)/../civetweb-1.9.1 -lconfig -lm -lpthread -lcivetweb
+AM_CFLAGS += -I$(abs_top_srcdir)/src/include -g -ggdb -O0 -I$(top_srcdir)/../civetweb-1.9.1/include -I$(top_srcdir)/../libks/src/include
+TEST_LDADD = $(abs_top_builddir)/libblade.la -L$(top_srcdir)/../civetweb-1.9.1 -L$(top_srcdir)/../libks -lconfig -lm -lpthread -lcivetweb -lks
 check_PROGRAMS =
 
 

diff --git a/libs/libblade/test/Makefile.am b/libs/libblade/test/Makefile.am
index 8218b74572ffc50a0ebbf95662a558f20e3d3bb0..430c3185527aa3461ea8c1715b601df8b165112f 100644 (file)
--- a/libs/libblade/test/Makefile.am
+++ b/libs/libblade/test/Makefile.am
@@ -1,5 +1,5 @@
-AM_CFLAGS += -I$(abs_top_srcdir)/src/include -g -ggdb -O0 -I$(top_srcdir)/../civetweb-1.9.1/include
-TEST_LDADD = $(abs_top_builddir)/libblade.la  -L$(top_srcdir)/../civetweb-1.9.1 -lconfig -lm -lpthread -lcivetweb
+AM_CFLAGS += -I$(abs_top_srcdir)/src/include -g -ggdb -O0 -I$(top_srcdir)/../civetweb-1.9.1/include -I$(top_srcdir)/../libks/src/include
+TEST_LDADD = $(abs_top_builddir)/libblade.la  -L$(top_srcdir)/../civetweb-1.9.1 -L$(top_srcdir)/../libks -lconfig -lm -lpthread -lcivetweb -lks
 check_PROGRAMS =