Only use -Wsuggest-override if the compiler supports it. (bsc#1160306)

should fix building on SLE 12, Fedora 20, 21

diff --git a/configure.ac b/configure.ac
index ac0251697e1ac460cc438f5574d47178b6bd96a7..8196148aecfe96191f3e5f5d9fd9159dd4297b93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,27 @@ dnl Disable it by "configure --disable-silent-rules" or "make V=1"
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat -Wmissing-prototypes -Wno-unused-parameter"
-CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat -Wnon-virtual-dtor -Wno-unused-parameter -Wsuggest-override"
+CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat -Wnon-virtual-dtor -Wno-unused-parameter"
+
+AC_DEFUN([TRY_ADD_CXXFLAGS], [
+  AC_MSG_CHECKING([if $CXX supports $1])
+  OLD_CXXFLAGS="$CXXFLAGS"
+  CXXFLAGS="${CXXFLAGS} $1"
+  AC_LANG_PUSH([C++])
+  AC_TRY_COMPILE(
+    [], [],
+    [
+      AC_MSG_RESULT([yes])
+    ],
+    [
+      AC_MSG_RESULT([no])
+      CXXFLAGS="$OLD_CXXFLAGS"
+    ]
+  )
+  AC_LANG_POP([C++])
+])
+
+TRY_ADD_CXXFLAGS([-Wsuggest-override])
 
 SYSCONFIG=/etc/sysconfig
 

diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
index bbaf0b9116707c72373458b02f7e6dde17ca8ac4..9f7e247f459c9822978d860f409eb463474b701c 100644 (file)
--- a/zypp-plugin/Makefile.am
+++ b/zypp-plugin/Makefile.am
@@ -6,7 +6,6 @@ plugindir = /usr/lib/zypp/plugins/commit
 plugin_PROGRAMS = snapper-zypp-plugin
 
 AM_CPPFLAGS = $(DBUS_CFLAGS) $(XML2_CFLAGS) $(JSONC_CFLAGS)
-AM_CXXFLAGS = -Wsuggest-override
 snapper_zypp_plugin_SOURCES = \
     snapper_zypp_plugin.cc \
     solvable_matcher.cc solvable_matcher.h \