-AC_DEFUN([AX_HARDEN_COMPILER_FLAGS],
-[AC_REQUIRE([AX_APPEND_COMPILE_FLAGS])
-AC_REQUIRE([AX_CHECK_LINK_FLAG])
-AX_APPEND_COMPILE_FLAGS([-O2])
-AX_APPEND_COMPILE_FLAGS([-Werror])
-AX_APPEND_COMPILE_FLAGS([-Wall])
-AX_APPEND_COMPILE_FLAGS([-Wextra])
-dnl AX_APPEND_COMPILE_FLAGS([-std=c++11])
-AX_APPEND_COMPILE_FLAGS([-Wpragmas])
-dnl AX_APPEND_COMPILE_FLAGS([-pedantic])
-AX_APPEND_COMPILE_FLAGS([--paramssp-buffer-size=1])
-AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
-AX_APPEND_COMPILE_FLAGS([-Waddress])
-AX_APPEND_COMPILE_FLAGS([-Warray-bounds])
-AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast])
-AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts])
-AX_APPEND_COMPILE_FLAGS([-Wcomment])
-AX_APPEND_COMPILE_FLAGS([-Wdeclaration-after-statement])
-AX_APPEND_COMPILE_FLAGS([-Wfloat-equal])
-AX_APPEND_COMPILE_FLAGS([-Wformat=2])
-AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized])
-AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers])
-AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn])
-AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes])
-AX_APPEND_COMPILE_FLAGS([-Wnested-externs])
-AX_APPEND_COMPILE_FLAGS([-Wnormalized=id])
-AX_APPEND_COMPILE_FLAGS([-Wold-style-definition])
-AX_APPEND_COMPILE_FLAGS([-Woverride-init])
-AX_APPEND_COMPILE_FLAGS([-Wpointer-arith])
-AX_APPEND_COMPILE_FLAGS([-Wredundant-decls])
-AX_APPEND_COMPILE_FLAGS([-Wshadow])
-AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32])
-AX_APPEND_COMPILE_FLAGS([-Wsign-compare])
-AX_APPEND_COMPILE_FLAGS([-Wstack-protector])
-AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1])
-AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes])
-AX_APPEND_COMPILE_FLAGS([-Wswitch-enum])
-AX_APPEND_COMPILE_FLAGS([-Wundef])
-AX_APPEND_COMPILE_FLAGS([-Wunused-result])
-AX_APPEND_COMPILE_FLAGS([-Wunused-variable])
-AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
-AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all])
-AX_APPEND_COMPILE_FLAGS([-fstack-protector-all])
-AX_APPEND_COMPILE_FLAGS([-fwrapv])
-AX_APPEND_COMPILE_FLAGS([-ggdb])
-AX_CHECK_LINK_FLAG([-Werror])
-AX_CHECK_LINK_FLAG([-z relro -z now])
-])dnl AX_HARDEN_COMPILER_FLAGS
+#serial 2
+
+ AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [
+ AC_REQUIRE([AX_CHECK_LINK_FLAG])
+ AC_REQUIRE([AX_VCS_CHECKOUT])
+ AC_REQUIRE([AX_DEBUG])
+ AC_REQUIRE([AX_CXX_COMPILER_VERSION])
+
+ AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+ AX_CHECK_LINK_FLAG([-Werror])
+ ])
+ AX_CHECK_LINK_FLAG([-z relro -z now])
+ AX_CHECK_LINK_FLAG([-pie])
+ ])
+
+ AC_DEFUN([AX_HARDEN_CC_COMPILER_FLAGS], [
+ AC_REQUIRE([AX_APPEND_COMPILE_FLAGS])
+ AC_REQUIRE([AX_HARDEN_LINKER_FLAGS])
+
+ AC_LANG_PUSH([C])
+ CFLAGS=
+
+ AX_APPEND_COMPILE_FLAGS([-g])
+ AS_IF([test "$ax_enable_debug" = yes], [
+ AX_APPEND_COMPILE_FLAGS([-ggdb])
+ AX_APPEND_COMPILE_FLAGS([-O0])
+ ],[
+ AX_APPEND_COMPILE_FLAGS([-O2])
+ ])
+
+ ac_cv_warnings_as_errors=no
+ AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+ AX_APPEND_COMPILE_FLAGS([-Werror])
+ AX_APPEND_COMPILE_FLAGS([-Wpragmas])
+ ac_cv_warnings_as_errors=yes
+ ],[
+ AX_APPEND_COMPILE_FLAGS([-Wno-pragmas])
+ ])
+
+ AX_APPEND_COMPILE_FLAGS([-Wall])
+ AX_APPEND_COMPILE_FLAGS([-Wextra])
+ AX_APPEND_COMPILE_FLAGS([-std=c99])
+ dnl Anything below this comment please keep sorted.
+ AX_APPEND_COMPILE_FLAGS([--paramssp-buffer-size=1])
+ AX_APPEND_COMPILE_FLAGS([-Waddress])
+ AX_APPEND_COMPILE_FLAGS([-Warray-bounds])
+ AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast])
+ dnl AX_APPEND_COMPILE_FLAGS([-Wc++-compat])
+ AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts])
+ AX_APPEND_COMPILE_FLAGS([-Wcomment])
+ AX_APPEND_COMPILE_FLAGS([-Wfloat-equal])
+ AX_APPEND_COMPILE_FLAGS([-Wformat-security])
+ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
+ AX_APPEND_COMPILE_FLAGS([-Wlogical-op])
+ AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized])
+ AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers])
+ AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn])
+ AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes])
+ AX_APPEND_COMPILE_FLAGS([-Wnested-externs])
+ AX_APPEND_COMPILE_FLAGS([-Wnormalized=id])
+ AX_APPEND_COMPILE_FLAGS([-Wold-style-definition])
+ AX_APPEND_COMPILE_FLAGS([-Woverride-init])
+ AX_APPEND_COMPILE_FLAGS([-Wpointer-arith])
+ AX_APPEND_COMPILE_FLAGS([-Wpointer-sign])
+ AX_APPEND_COMPILE_FLAGS([-Wredundant-decls])
+ AX_APPEND_COMPILE_FLAGS([-Wshadow])
+ AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32])
+ AX_APPEND_COMPILE_FLAGS([-Wsign-compare])
+ AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1])
+ AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes])
+ AX_APPEND_COMPILE_FLAGS([-Wswitch-enum])
+ AX_APPEND_COMPILE_FLAGS([-Wundef])
+ AX_APPEND_COMPILE_FLAGS([-Wunused-result])
+ AX_APPEND_COMPILE_FLAGS([-Wunused-variable])
+ AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
+ AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all])
+ AX_APPEND_COMPILE_FLAGS([-fwrapv])
+ AC_LANG_POP
+
+ ])
+
+ AC_DEFUN([AX_HARDEN_CXX_COMPILER_FLAGS], [
+ AC_REQUIRE([AX_HARDEN_CC_COMPILER_FLAGS])
+ AC_LANG_PUSH([C++])
+ CXXFLAGS=
+
+ AX_APPEND_COMPILE_FLAGS([-g])
+ AS_IF([test "$ax_enable_debug" = yes], [
+ AX_APPEND_COMPILE_FLAGS([-O0])
+ AX_APPEND_COMPILE_FLAGS([-ggdb])
+ ],[
+ AX_APPEND_COMPILE_FLAGS([-O2])
+ AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
+ ])
+
+ AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+ AX_APPEND_COMPILE_FLAGS([-Werror])
+ AX_APPEND_COMPILE_FLAGS([-Wpragmas])
+ ],[
+ AX_APPEND_COMPILE_FLAGS([-Wno-pragmas])
+ ])
+
+ AX_APPEND_COMPILE_FLAGS([-Wall])
+ AX_APPEND_COMPILE_FLAGS([-Wextra])
+ dnl Anything below this comment please keep sorted.
+ AX_APPEND_COMPILE_FLAGS([--paramssp-buffer-size=1])
+ AX_APPEND_COMPILE_FLAGS([-Waddress])
+ AX_APPEND_COMPILE_FLAGS([-Warray-bounds])
+ AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts])
+ AX_APPEND_COMPILE_FLAGS([-Wcomment])
+ AX_APPEND_COMPILE_FLAGS([-Wctor-dtor-privacy])
+ AX_APPEND_COMPILE_FLAGS([-Wfloat-equal])
+ AX_APPEND_COMPILE_FLAGS([-Wformat=2])
+ AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized])
+ AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers])
+ AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn])
+ AX_APPEND_COMPILE_FLAGS([-Wlogical-op])
+ AX_APPEND_COMPILE_FLAGS([-Wnon-virtual-dtor])
+ AX_APPEND_COMPILE_FLAGS([-Wnormalized=id])
+ AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual])
+ AX_APPEND_COMPILE_FLAGS([-Wpointer-arith])
+ AX_APPEND_COMPILE_FLAGS([-Wredundant-decls])
+ AX_APPEND_COMPILE_FLAGS([-Wshadow])
+ AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32])
+ AX_APPEND_COMPILE_FLAGS([-Wsign-compare])
+ AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1])
+ AX_APPEND_COMPILE_FLAGS([-Wswitch-enum])
+ AX_APPEND_COMPILE_FLAGS([-Wundef])
+ AX_APPEND_COMPILE_FLAGS([-Wc++11-compat])
+ AX_APPEND_COMPILE_FLAGS([-Wunused-result])
+ AX_APPEND_COMPILE_FLAGS([-Wunused-variable])
+ AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
+ AX_APPEND_COMPILE_FLAGS([-Wformat-security])
+ AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all])
+ AX_APPEND_COMPILE_FLAGS([-fwrapv])
+ AC_LANG_POP
+ ])
+
+ AC_DEFUN([AX_HARDEN_COMPILER_FLAGS], [
+ AC_REQUIRE([AX_HARDEN_CXX_COMPILER_FLAGS])
+ ])