From 1126b65b6ab2d6fa6e110fc3309edb52398a3918 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 21 Dec 2017 08:50:39 -0800
Subject: autotools: be more selective about suppressing deprecation warnings

Suppressing the warning for all code hid the deprecation warning
about auto_ptr, which is something that should have been fixed
before.

Now only some code still suppresses the warning (GTK UI, Akonadi)
because there is no time to also update and test that part.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 configure.ac                    | 7 ++++++-
 src/backends/akonadi/akonadi.am | 2 +-
 src/dbus/glib/glib.am           | 4 ++--
 src/gtk3-ui/gtk-ui.am           | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 83a29485..2503307d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,8 +78,13 @@ AX_BOOST_BASE(1.34)
 # TODO: Fix code to pass with -pedantic -Wextra.
 # -Wno-unknown-pragmas needed because icalstrdup.h
 # currently uses the "#pragma }" trick. Should remove that.
-# Fix code to work without deprecated methods: G GDK GDK_PIXBUF CAIRO PANGO GTK
 DK_ARG_ENABLE_WARNINGS([SYNCEVO_WFLAGS],
+                       [-Wall -Wno-unknown-pragmas],
+                       [-Wall -Wno-unknown-pragmas],
+                       [])
+
+# Fix code to work without deprecated methods: G GDK GDK_PIXBUF CAIRO PANGO GTK
+DK_ARG_ENABLE_WARNINGS([SYNCEVO_WFLAGS_DEPRECATED],
                        [-Wall -Wno-unknown-pragmas -Wno-deprecated-declarations],
                        [-Wall -Wno-unknown-pragmas -Wno-deprecated-declarations],
                        [])
diff --git a/src/backends/akonadi/akonadi.am b/src/backends/akonadi/akonadi.am
index 271bb8d3..8f471534 100644
--- a/src/backends/akonadi/akonadi.am
+++ b/src/backends/akonadi/akonadi.am
@@ -16,6 +16,6 @@ src_backends_akonadi_syncakonadi_la_SOURCES = \
   src/backends/akonadi/akonadisyncsource.cpp
 src_backends_akonadi_syncakonadi_la_LIBADD = $(KDEPIM_LIBS) $(SYNCEVOLUTION_LIBS)
 src_backends_akonadi_syncakonadi_la_LDFLAGS = -module -avoid-version
-src_backends_akonadi_syncakonadi_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
+src_backends_akonadi_syncakonadi_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS_DEPRECATED)
 src_backends_akonadi_syncakonadi_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
 src_backends_akonadi_syncakonadi_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/dbus/glib/glib.am b/src/dbus/glib/glib.am
index 3335e42f..272b6d00 100644
--- a/src/dbus/glib/glib.am
+++ b/src/dbus/glib/glib.am
@@ -24,7 +24,7 @@ noinst_PROGRAMS += src/dbus/glib/test-syncevo-dbus
 
 src_dbus_glib_test_syncevo_dbus_SOURCES = src/dbus/glib/test.c
 src_dbus_glib_test_syncevo_dbus_LDADD = $(DBUS_GLIB_LIBS) $(src_dbus_glib_lib)
-src_dbus_glib_test_syncevo_dbus_CFLAGS = $(DBUS_GLIB_CFLAGS) $(SYNCEVO_WFLAGS)
+src_dbus_glib_test_syncevo_dbus_CFLAGS = $(DBUS_GLIB_CFLAGS) $(SYNCEVO_WFLAGS_DEPRECATED)
 src_dbus_glib_test_syncevo_dbus_CPPFLAGS = $(src_dbus_glib_cppflags)
 
 src_dbus_glib_built_sources = \
@@ -89,7 +89,7 @@ src_dbus_glib_libsyncevo_dbus_la_CFLAGS = \
   -I$(top_srcdir) \
   -I$(top_builddir) \
   $(DBUS_GLIB_CFLAGS) \
-  $(SYNCEVO_WFLAGS)
+  $(SYNCEVO_WFLAGS_DEPRECATED)
 
 src_dbus_glib_libsyncevo_dbus_la_LIBADD = \
   $(DBUS_GLIB_LIBS)
diff --git a/src/gtk3-ui/gtk-ui.am b/src/gtk3-ui/gtk-ui.am
index 523d5f82..097a919f 100644
--- a/src/gtk3-ui/gtk-ui.am
+++ b/src/gtk3-ui/gtk-ui.am
@@ -79,7 +79,7 @@ src_gtk3_ui_sync_ui_CFLAGS = \
   -DTHEMEDIR=\""$(src_gtk3_ui_themercdir)"\" \
   -DLIBEXECDIR=\"@libexecdir@\" \
   -DSYNCEVOLUTION_LOCALEDIR=\"${SYNCEVOLUTION_LOCALEDIR}\" \
-  $(SYNCEVO_WFLAGS)
+  $(SYNCEVO_WFLAGS_DEPRECATED)
 src_gtk3_ui_sync_ui_CPPFLAGS = \
   -I$(top_builddir) \
   -I$(top_srcdir) \
-- 
cgit v1.2.3