From bd9e020ab4c1bc23477f1f9af674504885e842a8 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Fri, 22 Jan 2021 19:26:03 +0200 Subject: [PATCH] configure.ac: make build flags a bit less magical Don't set compiler flags based on version numbers. --- configure.ac | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index cbeb2e19..9d075b17 100644 --- a/configure.ac +++ b/configure.ac @@ -24,9 +24,6 @@ AC_CONFIG_SRCDIR([mu/mu.cc]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -m4_ifdef([AX_IS_RELEASE],[AX_IS_RELEASE([git-directory])]) -m4_ifdef([AX_CHECK_ENABLE_DEBUG],[AX_CHECK_ENABLE_DEBUG([yes])]) - AM_INIT_AUTOMAKE([1.14 foreign no-dist-gzip tar-ustar dist-xz]) # silent build if we have a new enough automake @@ -47,11 +44,11 @@ AC_HEADER_STDC extra_flags="-Wformat-security \ -Wstack-protector \ - -Wstack-protector-all \ - -Wno-cast-function-type" + -Wstack-protector-all" AX_CXX_COMPILE_STDCXX_14 -m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})]) +AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}]) +AX_APPEND_COMPILE_FLAGS([-Wno-inline -Wno-cast-function-type],[CXXFLAGS]) AX_VALGRIND_CHECK LT_INIT @@ -76,6 +73,7 @@ AS_IF([test "x$use_asan" = "xyes"],[ AC_SUBST(ASAN_LDFLAGS, "-fsanitize=address -static-libasan -fno-omit-frame-pointer") ]) + # check for makeinfo AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no) AM_CONDITIONAL(HAVE_MAKEINFO,test "x$have_makeinfo" = "xyes")