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.

diff --git a/ChangeLog b/ChangeLog
index 8a61bd42712138b0ce4d045d69591894cb2564b4..301e912f4d38ec3f1c2179b78fe80d2b06a13298 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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  <lekktu@gmail.com>
 
        * Makefile.in (install-arch-indep): Do not create directories passed

diff --git a/configure.ac b/configure.ac
index 3cb7bc701dd0d6e5da6390640b8d42c00850fbba..2a7fb209a591d436f4e16d47f59c7ec5f0dbfcbf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2078,6 +2078,7 @@ fi
 
 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 "${opsys}" != "mingw32"; then
     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 @@ if test x"$pkg_check_gtk" = xyes; then
   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 @@ if test x"$pkg_check_gtk" = xyes; then
     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
       :

diff --git a/src/ChangeLog b/src/ChangeLog
index ad4b0d72400e29e774004a9d311222085b29a4a2..fa44810773c85d310f5a70592c3847c67caf1107 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2013-06-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+       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  <eliz@gnu.org>

diff --git a/src/xmenu.c b/src/xmenu.c
index 9993bd87d5b26c16f234e79865178f5e50cc73e4..48ab35197237da32b0f8e1795e5fc473d37fd0f2 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -397,7 +397,7 @@ x_menu_wait_for_event (void *data)
       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.  */

diff --git a/src/xterm.c b/src/xterm.c
index 7505aa3936b71e1bbe362b457cf1585ea85371ab..9c868aec392f7e13e988baa343678bf391acd2a1 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7824,7 +7824,7 @@ static void x_error_quitter (Display *, XErrorEvent *);
 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)