diff --git a/src/config-store/wscript b/src/config-store/wscript
index a62d87abb..0f9a4f951 100644
--- a/src/config-store/wscript
+++ b/src/config-store/wscript
@@ -33,6 +33,9 @@ def configure(conf):
             if conf.env['CXX_NAME'] in ['gcc']:
                 if tuple(map(int, conf.env['CC_VERSION'])) >= gcc_version_gtkplus_warning_issue:
                     conf.env.append_value('CXXFLAGS', '-Wno-parentheses')
+            # Bug 2978 gcc and clang warnings about deprecated declarations
+            if conf.env['CXX_NAME'] in ['clang', 'gcc']:
+                    conf.env.append_value ('CXXFLAGS', '-Wno-error=deprecated-declarations')
 
     have_libxml2 = conf.check_cfg(package='libxml-2.0', atleast_version='2.7',
                                   args=['--cflags', '--libs'], uselib_store='LIBXML2',
diff --git a/wscript b/wscript
index 498772994..8f34bff95 100644
--- a/wscript
+++ b/wscript
@@ -643,7 +643,6 @@ def configure(conf):
             if conf.check_compilation_flag(flag, mode='cc'):
                 env.append_value('CCFLAGS', flag)
 
-    add_gcc_flag('-Wno-error=deprecated-declarations')
     add_gcc_flag('-fstrict-aliasing')
     add_gcc_flag('-Wstrict-aliasing')