[Emacs-diffs] trunk r113234: Do not use GTK 3 if it exists but cannot be compiled.

[Paul Eggert]

------------------------------------------------------------
revno: 113234
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-06-30 08:24:14 -0700
message:
  Do not use GTK 3 if it exists but cannot be compiled.
  
  * configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
  exists but cannot be compiled.
  * src/xmenu.c (x_menu_wait_for_event) [!USE_GTK]:
  * src/xterm.c (x_error_handler) [!USE_GTK]:
  Do not use GTK 3.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xmenu.c                    xmenu.c-20091113204419-o5vbwnq5f7feedwu-161
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-27 01:40:46 +0000
+++ b/ChangeLog 2013-06-30 15:24:14 +0000
@@ -1,3 +1,9 @@
+2013-06-30  Paul Eggert  <address@hidden>
+
+       Do not use GTK 3 if it exists but cannot be compiled.
+       * configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
+       exists but cannot be compiled.
+
 2013-06-27  Juanma Barranquero  <address@hidden>
 
        * Makefile.in (install-arch-indep): Do not create directories passed

=== modified file 'configure.ac'
--- a/configure.ac      2013-06-24 06:58:52 +0000
+++ b/configure.ac      2013-06-30 15:24:14 +0000
@@ -2078,6 +2078,7 @@
 
 HAVE_GTK=no
 GTK_OBJ=
+gtk_term_header=$term_header
 check_gtk2=no
 gtk3_pkg_errors=
 if test "${opsys}" != "mingw32"; then
@@ -2094,7 +2095,7 @@
     if test "$pkg_check_gtk" = "yes"; then
        AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.])
        GTK_OBJ=emacsgtkfixed.o
-       term_header=gtkutil.h
+       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"
@@ -2133,6 +2134,7 @@
   GTK_COMPILES=no
   AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes)
   if test "${GTK_COMPILES}" != "yes"; then
+    GTK_OBJ=
     if test "$USE_X_TOOLKIT" != "maybe"; then
       AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  
Maybe some x11-devel files missing?]);
     fi
@@ -2140,6 +2142,7 @@
     HAVE_GTK=yes
     AC_DEFINE(USE_GTK, 1, [Define to 1 if using GTK.])
     GTK_OBJ="gtkutil.o $GTK_OBJ"
+    term_header=$gtk_term_header
     USE_X_TOOLKIT=none
     if "$PKG_CONFIG" --atleast-version=2.10 gtk+-2.0; then
       :

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-30 15:14:45 +0000
+++ b/src/ChangeLog     2013-06-30 15:24:14 +0000
@@ -1,5 +1,10 @@
 2013-06-30  Paul Eggert  <address@hidden>
 
+       Do not use GTK 3 if it exists but cannot be compiled.
+       * xmenu.c (x_menu_wait_for_event) [!USE_GTK]:
+       * xterm.c (x_error_handler) [!USE_GTK]:
+       Do not use GTK 3.
+
        * intervals.c (get_local_map): Actually clip POSITION (Bug#14753).
 
 2013-06-30  Eli Zaretskii  <address@hidden>

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2013-04-07 04:41:19 +0000
+++ b/src/xmenu.c       2013-06-30 15:24:14 +0000
@@ -397,7 +397,7 @@
       else
         ntp = &next_time;
 
-#ifdef HAVE_GTK3
+#if defined USE_GTK && defined HAVE_GTK3
       /* Gtk3 have arrows on menus when they don't fit.  When the
         pointer is over an arrow, a timeout scrolls it a bit.  Use
         xg_select so that timeout gets triggered.  */

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-06-05 17:04:13 +0000
+++ b/src/xterm.c       2013-06-30 15:24:14 +0000
@@ -7824,7 +7824,7 @@
 static int
 x_error_handler (Display *display, XErrorEvent *event)
 {
-#ifdef HAVE_GTK3
+#if defined USE_GTK && defined HAVE_GTK3
   if (event->error_code == BadMatch
       && event->request_code == X_SetInputFocus
       && event->minor_code == 0)