From 7fab46eaa3de8e530863269556676e9de810758a Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@axiomatics.org>
Date: Sun, 15 Jan 2017 09:32:57 -0800
Subject: Require C++14.

---
 config/open-axiom.m4  | 6 +++---
 configure             | 2 +-
 configure.ac          | 2 +-
 src/Makefile.am       | 4 ++--
 src/Makefile.in       | 4 ++--
 src/utils/Makefile.am | 3 ++-
 src/utils/Makefile.in | 6 ++++--
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index dc64510b..0736da35 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -256,11 +256,11 @@ esac
 ])
 
 dnl -----------------------------
-dnl -- OPENAXIOM_REQUIRE_CXX11 --
+dnl -- OPENAXIOM_REQUIRE_CXX14 --
 dnl -----------------------------
-AC_DEFUN([OPENAXIOM_REQUIRE_CXX11],[
+AC_DEFUN([OPENAXIOM_REQUIRE_CXX14],[
 oa_saved_cxxflags=$CXXFLAGS
-CXXFLAGS="-std=c++11"
+CXXFLAGS="-std=c++14"
 AC_MSG_CHECKING([whether $CXX supports $CXXFLAGS])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
   [AC_MSG_RESULT([yes])]
diff --git a/configure b/configure
index a18ddf71..af168c5f 100755
--- a/configure
+++ b/configure
@@ -5542,7 +5542,7 @@ fi
 
 
 oa_saved_cxxflags=$CXXFLAGS
-CXXFLAGS="-std=c++11"
+CXXFLAGS="-std=c++14"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports $CXXFLAGS" >&5
 $as_echo_n "checking whether $CXX supports $CXXFLAGS... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/configure.ac b/configure.ac
index 509569b8..c6d39cbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,7 @@ AC_LANG([C++])
 
 OPENAXIOM_HOST_COMPILERS
 AM_CONDITIONAL([OA_USE_LLVM], [test -n $oa_use_llvm])
-OPENAXIOM_REQUIRE_CXX11
+OPENAXIOM_REQUIRE_CXX14
 OPENAXIOM_EXTRA_CXX_OPTIONS
 AM_CONDITIONAL([OA_BUILD_GCL], [test x$oa_include_gcl = xyes])
 AM_CONDITIONAL([OA_ECL_RT], [test x$oa_lisp_flavor = xecl])
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b1bda72..974b72e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,7 +80,7 @@ stamp-subdirs:
 all-driver: all-utils all-lib
 	cd driver && $(MAKE) $(AM_MAKEFLAGS) $@
 
-all-utils: stamp-subdirs all-headers
+all-utils: stamp-subdirs all-lib
 	cd utils && $(MAKE) $(AM_MAKEFLAGS) $@
 
 all-rt: all-utils
@@ -105,7 +105,7 @@ all-share:
 all-doc: stamp-subdirs
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
-all-lib: stamp-subdirs all-utils
+all-lib: stamp-subdirs all-headers
 	cd lib && $(MAKE) $(AM_MAKEFLAGS) $@
 
 all-lisp: all-lib all-driver
diff --git a/src/Makefile.in b/src/Makefile.in
index 68d49d27..1ac3530b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -763,7 +763,7 @@ stamp-subdirs:
 all-driver: all-utils all-lib
 	cd driver && $(MAKE) $(AM_MAKEFLAGS) $@
 
-all-utils: stamp-subdirs all-headers
+all-utils: stamp-subdirs all-lib
 	cd utils && $(MAKE) $(AM_MAKEFLAGS) $@
 
 all-rt: all-utils
@@ -788,7 +788,7 @@ all-share:
 all-doc: stamp-subdirs
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
-all-lib: stamp-subdirs all-utils
+all-lib: stamp-subdirs all-headers
 	cd lib && $(MAKE) $(AM_MAKEFLAGS) $@
 
 all-lisp: all-lib all-driver
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index a4963851..bc2f1f73 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -32,7 +32,8 @@
 noinst_PROGRAMS = hammer$(EXEEXT)
 hammer_SOURCES = hammer.cc
 hammer_LDADD = \
-	$(oa_target_libdir)/libOpenAxiom.a
+	$(oa_target_libdir)/libOpenAxiom.a \
+	$(oa_target_libdir)/libopen-axiom-core.a
 
 noinst_LIBRARIES = libOpenAxiom.a
 
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 7c6d5798..5f977ae5 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -152,7 +152,8 @@ libOpenAxiom_a_OBJECTS = $(am_libOpenAxiom_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 am_hammer_OBJECTS = hammer.$(OBJEXT)
 hammer_OBJECTS = $(am_hammer_OBJECTS)
-hammer_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a
+hammer_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a \
+	$(oa_target_libdir)/libopen-axiom-core.a
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -415,7 +416,8 @@ void_type = @void_type@
 noinst_PROGRAMS = hammer$(EXEEXT)
 hammer_SOURCES = hammer.cc
 hammer_LDADD = \
-	$(oa_target_libdir)/libOpenAxiom.a
+	$(oa_target_libdir)/libOpenAxiom.a \
+	$(oa_target_libdir)/libopen-axiom-core.a
 
 noinst_LIBRARIES = libOpenAxiom.a
 libOpenAxiom_a_SOURCES = \
-- 
cgit v1.2.3