From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 30 Dec 2012 19:34:25 +0000 (+0100)
Subject: Silence Gtk deprecation warnings by default.
X-Git-Tag: emacs-24.3.90~173^2~7^2~440
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ec363cf23ac40b4d6f1423226a2e6cfa5e98df5;p=emacs.git

Silence Gtk deprecation warnings by default.

* configure.ac: New enable: --enable-gtk-deprecation-warnings, default off.
(HAVE_GTK3): If above enable is off, add
-DGDK_DISABLE_DEPRECATION_WARNINGS to GTK_CFLAGS.
---

diff --git a/ChangeLog b/ChangeLog
index 0246433c5e1..e8363efde2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* configure.ac: Check for GtkHandlebox.
 	Check for GtkTearoffMenuItem.
+	New enable: --enable-gtk-deprecation-warnings, default off.
+	(HAVE_GTK3): If above enable is off, add
+	-DGDK_DISABLE_DEPRECATION_WARNINGS to GTK_CFLAGS.
 
 2012-12-30  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/configure.ac b/configure.ac
index c7785db454f..f0967c33afa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -359,6 +359,11 @@ AC_ARG_ENABLE(autodepend,
  		 found])],
 [ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes])
 
+AC_ARG_ENABLE(gtk-deprecation-warnings,
+[AS_HELP_STRING([--enable-gtk-deprecation-warnings],
+		[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
+[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
+
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the file name through pwd unnecessarily, since pwd can
 #### give you automounter prefixes, which can go away.  We do all this
@@ -1996,6 +2001,9 @@ if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOO
      GTK_OBJ=emacsgtkfixed.o
      term_header=gtkutil.h
      USE_GTK_TOOLKIT="GTK3"
+     if test "x$ac_enable_gtk_deprecation_warnings" = x; then
+         GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS"
+     fi
   else
      check_gtk2=yes
      gtk3_pkg_errors="$GTK_PKG_ERRORS "