From dd1e01cb81f6b0dafc6d15ed69dc73594a0780eb Mon Sep 17 00:00:00 2001
From: Mike Jerris <mike@jerris.com>
Date: Mon, 16 Jan 2017 12:13:40 -0600
Subject: [PATCH] fix unqlite build, don't do warn all ansi on it

---
 libs/libblade/.gitignore                            |  1 +
 libs/libblade/Makefile.am                           | 13 +++++++++----
 .../build/config/ax_cflags_warn_all_ansi.m4         |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libs/libblade/.gitignore b/libs/libblade/.gitignore
index fe9db71a88..c58d005878 100644
--- a/libs/libblade/.gitignore
+++ b/libs/libblade/.gitignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 build/*.m4
+configure
diff --git a/libs/libblade/Makefile.am b/libs/libblade/Makefile.am
index e2dde822a1..fe4c96b108 100644
--- a/libs/libblade/Makefile.am
+++ b/libs/libblade/Makefile.am
@@ -5,11 +5,16 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CFLAGS    += -I$(top_srcdir)/src -I$(top_srcdir)/src/include
 
-lib_LTLIBRARIES	  = libblade.la
-libblade_la_SOURCES  = src/blade.c src/blade_stack.c src/blade_peer.c src/bpcp.c src/blade_datastore.c src/unqlite.c
-libblade_la_CFLAGS	  = $(AM_CFLAGS) $(AM_CPPFLAGS) -DUNQLITE_ENABLE_THREADS
-libblade_la_LDFLAGS  =  -version-info 0:1:0 -lncurses -lpthread -lm $(AM_LDFLAGS)
+noinst_LTLIBRARIES      = libunqlite.la
+libunqlite_la_SOURCES   = src/unqlite.c
+libunqlite_la_CFLAGS    = -DUNQLITE_ENABLE_THREADS
+libunqlite_la_LIBADD    = -lpthread
 
+lib_LTLIBRARIES	        = libblade.la
+libblade_la_SOURCES     = src/blade.c src/blade_stack.c src/blade_peer.c src/bpcp.c src/blade_datastore.c
+libblade_la_CFLAGS	= $(AM_CFLAGS) $(AM_CPPFLAGS)
+libblade_la_LDFLAGS     = -version-info 0:1:0 -lncurses -lpthread -lm $(AM_LDFLAGS)
+libblade_la_LIBADD      = libunqlite.la
 library_includedir	= $(prefix)/include
 library_include_HEADERS = src/include/blade.h src/include/blade_types.h src/include/blade_stack.h src/include/blade_peer.h src/include/bpcp.h
 library_include_HEADERS += src/include/blade_datastore.h
diff --git a/libs/libblade/build/config/ax_cflags_warn_all_ansi.m4 b/libs/libblade/build/config/ax_cflags_warn_all_ansi.m4
index 5b35464457..da950f439b 100644
--- a/libs/libblade/build/config/ax_cflags_warn_all_ansi.m4
+++ b/libs/libblade/build/config/ax_cflags_warn_all_ansi.m4
@@ -1,5 +1,5 @@
 AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
-AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
+AS_VAR_PUSHDEF([FLAGS],[AM_CFLAGS])dnl
 AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_warn_all_ansi])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
 VAR,[VAR="no, unknown"
@@ -47,7 +47,7 @@ AS_VAR_POPDEF([FLAGS])dnl
 dnl the only difference - the LANG selection... and the default FLAGS
 
 AC_DEFUN([AX_CXXFLAGS_WARN_ALL_ANSI],[dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
+AS_VAR_PUSHDEF([FLAGS],[AM_CXXFLAGS])dnl
 AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
 VAR,[VAR="no, unknown"