[Emacs-diffs] /srv/bzr/emacs/trunk r111382: Silence Gtk deprecation warnings by default.

[Jan D.]

------------------------------------------------------------
revno: 111382
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-12-30 20:34:25 +0100
message:
  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.
modified:
  ChangeLog
  configure.ac

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-30 19:08:15 +0000
+++ b/ChangeLog 2012-12-30 19:34:25 +0000
@@ -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  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-12-30 19:08:15 +0000
+++ b/configure.ac      2012-12-30 19:34:25 +0000
@@ -359,6 +359,11 @@
                 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 @@
      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 "