From xemacs-m  Mon Jul 21 06:51:21 1997
Received: from news.smart.net (jmiller@max1p110.smart.net [206.97.127.110])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id GAA00042
	for <xemacs-beta@xemacs.org>; Mon, 21 Jul 1997 06:51:19 -0500 (CDT)
Received: (from jmiller@localhost)
          by news.smart.net (8.8.4/8.8.4)
	  id HAA11244; Mon, 21 Jul 1997 07:53:44 -0400
Date: Mon, 21 Jul 1997 07:53:44 -0400
Message-Id: <199707211153.HAA11244@news.smart.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Jeff Miller <jmiller@smart.net>
To: xemacs-beta@xemacs.org
Subject: Re: failure - 20.3b14 - linux
In-Reply-To: <m2204s9a9d.fsf@altair.xemacs.org>
References: <199707210403.AAA09168@news.smart.net>
	<m2204s9a9d.fsf@altair.xemacs.org>
X-Mailer: VM 6.33 under 20.3 "Vienna" XEmacs  Lucid (beta14)
Reply-to: jmiller@smart.net
X-Face: &vGrMZ?Q&W5~yiCR_#hat=$tgJrK`J=2$se?0Nu9I3G|I<2-\:82zx>kz=l8(yw)G1i&0"D
 <nv_e$^;,ftG6@Hn"did"G5i=X_-Z3Y

>>>>> "sb" == SL Baur <steve@xemacs.org> writes:

sb> Jeff Miller <jmiller@smart.net> writes:

>> didn't this menubar accelerator stuff just get added?  

sb> Yes.  It all needs a HAVE_MENUBAR guard.


There are two additional spots that were missed, patch at end of msg.

Now, linking fails with:

gui-x.o: In function `popup_selection_callback':
 /mnt3/xemacs/xemacs-20.3-b14/src/gui-x.c:296: undefined reference to `x_focus_timestamp_really_sucks_fix_me_better'

So I added the following patch and it compiled and seems to run ok.

--- src/gui-x.c~        Sun Jul 20 02:11:07 1997
+++ src/gui-x.c Mon Jul 21 07:47:49 1997
@@ -293,8 +293,10 @@
   /* This is the timestamp used for asserting focus so we need to get an
      up-to-date value event if no events has been dispatched to emacs
      */
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
   DEVICE_X_MOUSE_TIMESTAMP (d) = x_focus_timestamp_really_sucks_fix_me_better;
   signal_special_Xt_user_event (frame, fn, arg);
+#endif
 }
 
 #if 1




--- src/event-stream.c.orig     Mon Jul 21 07:37:15 1997
+++ src/event-stream.c  Mon Jul 21 07:38:19 1997
@@ -3646,7 +3646,7 @@
     return Qnil;
 
   /* if we're currently in a menu accelerator, check there for further events */
-#ifdef HAVE_X_WINDOWS
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
   if (lw_menu_active)
     {
       result = command_builder_operate_menu_accelerator (builder);
@@ -3660,7 +3660,7 @@
       if (NILP (result))
 #endif
        result = command_builder_find_leaf_1 (builder);
-#ifdef HAVE_X_WINDOWS
+#if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS)
       if (NILP (result)
          && EQ (Vmenu_accelerator_enabled, Qmenu_fallback))
        result = command_builder_find_menu_accelerator (builder);

