From 5556d00f9fdf842a60751751cb2669957bd60512 Mon Sep 17 00:00:00 2001 From: Marco Maggi Date: Thu, 18 Oct 2018 13:01:06 +0200 Subject: [PATCH] reorganised selection of flags for compilers in configure.ac --- expat/configure.ac | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/expat/configure.ac b/expat/configure.ac index 664e167d..c72a5fdb 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -66,23 +66,29 @@ AC_SUBST(LIBCURRENT) AC_SUBST(LIBREVISION) AC_SUBST(LIBAGE) +AC_LANG([C]) AC_PROG_CC_C99 -AC_PROG_CXX - AS_IF([test "$GCC" = yes], [AX_APPEND_COMPILE_FLAGS([-Wall], [CFLAGS]) - dnl Be careful about adding the -fexceptions option; some versions of dnl GCC don't support it and it causes extra warnings that are only dnl distracting; avoid. AX_APPEND_COMPILE_FLAGS([-fexceptions], [CFLAGS]) + AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [CFLAGS])]) - AS_IF([test "x$CXXFLAGS" = x], - [AS_VAR_COPY(CXXFLAGS, CFLAGS)]) +AC_LANG_PUSH([C++]) +AC_PROG_CXX +AS_IF([test "$GCC" = yes], + [AX_APPEND_COMPILE_FLAGS([-Wall], [CXXFLAGS]) + dnl Be careful about adding the -fexceptions option; some versions of + dnl GCC don't support it and it causes extra warnings that are only + dnl distracting; avoid. + AX_APPEND_COMPILE_FLAGS([-fexceptions], [CXXFLAGS]) + AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [CXXFLAGS])]) +AC_LANG_POP([C++]) - AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [CFLAGS]) - AS_VAR_APPEND(CXXFLAGS, " -fno-strict-aliasing") - AS_VAR_APPEND(LDFLAGS, " -fno-strict-aliasing")]) +AS_IF([test "$GCC" = yes], + [AS_VAR_APPEND(LDFLAGS, " -fno-strict-aliasing")]) AC_MSG_CHECKING(whether compiler supports visibility) AS_VAR_COPY(OLDCFLAGS,CFLAGS) -- 2.40.0