[Emacs-diffs] trunk r115422: * configure.ac: Simplify supression of GTK deprecation warning.

[Paul Eggert]

------------------------------------------------------------
revno: 115422
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert  <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-08 00:53:49 -0800
message:
  * configure.ac: Simplify supression of GTK deprecation warning.
  
  Move -DGDK_DISABLE_DEPRECATION_WARNINGS out of the command line
  and into config.h, to shorten the command line when doing 'make'.
  Don't AC_SUBST GTK_CFLAGS, as this is not needed.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-12-08 08:05:36 +0000
+++ b/ChangeLog 2013-12-08 08:53:49 +0000
@@ -1,5 +1,10 @@
 2013-12-08  Paul Eggert  <address@hidden>
 
+       * configure.ac: Simplify supression of GTK deprecation warning.
+       Move -DGDK_DISABLE_DEPRECATION_WARNINGS out of the command line
+       and into config.h, to shorten the command line when doing 'make'.
+       Don't AC_SUBST GTK_CFLAGS, as this is not needed.
+
        Use libcrypto's checksum implementations if available, for speed.
        On commonly used platform libcrypto uses architecture-specific
        assembly code, which is significantly faster than the C code we

=== modified file 'configure.ac'
--- a/configure.ac      2013-12-08 08:05:36 +0000
+++ b/configure.ac      2013-12-08 08:53:49 +0000
@@ -2185,8 +2185,10 @@
        gtk_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"
-                 GTK_CFLAGS="$GTK_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"
+        AC_DEFINE([GDK_DISABLE_DEPRECATION_WARNINGS], [1],
+          [Define to 1 to disable GTK+/GDK deprecation warnings.])
+        AC_DEFINE([GLIB_DISABLE_DEPRECATION_WARNINGS], [1],
+          [Define to 1 to disable Glib deprecation warnings.])
        fi
     else
        check_gtk2=yes
@@ -2212,7 +2214,6 @@
 
 if test x"$pkg_check_gtk" = xyes; then
 
-  AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
   C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
   CFLAGS="$CFLAGS $GTK_CFLAGS"