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.

3 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ad4b0d72400..fa44810773c 100644
--- 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 9993bd87d5b..48ab3519723 100644
--- 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 7505aa3936b..9c868aec392 100644
--- 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)