Index: configure
===================================================================
--- configure	(revision 759908fbf5d553f903d9844294160a636082bd52)
+++ configure	(revision eb0951d0cd306bfecdc590fa7b0b243eb3ed1853)
@@ -2496,10 +2496,4 @@
 
 
-if test "x${CXXFLAGS}" = "x"; then
-   export CXXFLAGS="-std=c++11 -g ${CXXFLAGS}"	# defaults, no -O2 for debugging and failures
-else
-   export CXXFLAGS="-std=c++11 ${CXXFLAGS}"	# flags from configure command
-fi
-
 am__api_version='1.11'
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 759908fbf5d553f903d9844294160a636082bd52)
+++ configure.ac	(revision eb0951d0cd306bfecdc590fa7b0b243eb3ed1853)
@@ -8,10 +8,4 @@
 AC_CONFIG_HEADERS([config.h])
 AM_SILENT_RULES([no])
-
-if test "x${CXXFLAGS}" = "x"; then
-   export CXXFLAGS="-std=c++11 -g ${CXXFLAGS}"	# defaults, no -O2 for debugging and failures
-else
-   export CXXFLAGS="-std=c++11 ${CXXFLAGS}"	# flags from configure command
-fi
 
 AM_INIT_AUTOMAKE
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 759908fbf5d553f903d9844294160a636082bd52)
+++ src/Makefile.am	(revision eb0951d0cd306bfecdc590fa7b0b243eb3ed1853)
@@ -43,5 +43,5 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl			# yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Werror -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 759908fbf5d553f903d9844294160a636082bd52)
+++ src/Makefile.in	(revision eb0951d0cd306bfecdc590fa7b0b243eb3ed1853)
@@ -447,5 +447,5 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl			# yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Werror -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 all: $(BUILT_SOURCES)
Index: src/driver/Makefile.am
===================================================================
--- src/driver/Makefile.am	(revision 759908fbf5d553f903d9844294160a636082bd52)
+++ src/driver/Makefile.am	(revision eb0951d0cd306bfecdc590fa7b0b243eb3ed1853)
@@ -16,5 +16,5 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14
 if BUILD_NO_LIB
 else
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision 759908fbf5d553f903d9844294160a636082bd52)
+++ src/driver/Makefile.in	(revision eb0951d0cd306bfecdc590fa7b0b243eb3ed1853)
@@ -208,5 +208,5 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 $(am__append_1) $(am__append_2) \
 	$(am__append_3)
 cfa_SOURCES = cfa.cc