From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: CVS HEAD currently broken on OSX Date: Fri, 16 Sep 2005 23:47:23 +0300 Message-ID: References: <86mzmeazog.fsf@blue.stonehenge.com> <86hdcl6q3l.fsf@blue.stonehenge.com> <8664t1565r.fsf@blue.stonehenge.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1126905007 10164 80.91.229.2 (16 Sep 2005 21:10:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 16 Sep 2005 21:10:07 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 16 23:10:03 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EGNRC-0002qC-FL for ged-emacs-devel@m.gmane.org; Fri, 16 Sep 2005 23:08:02 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EGNRB-00080E-SO for ged-emacs-devel@m.gmane.org; Fri, 16 Sep 2005 17:08:01 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EGNQv-0007y5-7b for emacs-devel@gnu.org; Fri, 16 Sep 2005 17:07:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EGNOJ-00079w-9V for emacs-devel@gnu.org; Fri, 16 Sep 2005 17:05:11 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EGNOB-00070U-KH for emacs-devel@gnu.org; Fri, 16 Sep 2005 17:04:55 -0400 Original-Received: from [192.114.186.66] (helo=romy.inter.net.il) by monty-python.gnu.org with esmtp (Exim 4.34) id 1EGN7N-0007hT-GU for emacs-devel@gnu.org; Fri, 16 Sep 2005 16:47:33 -0400 Original-Received: from HOME-C4E4A596F7 (IGLD-80-230-39-97.inter.net.il [80.230.39.97]) by romy.inter.net.il (MOS 3.5.8-GR) with ESMTP id CKH71079 (AUTH halo1); Fri, 16 Sep 2005 23:47:24 +0300 (IDT) Original-To: merlyn@stonehenge.com (Randal L. Schwartz) In-reply-to: <8664t1565r.fsf@blue.stonehenge.com> (merlyn@stonehenge.com) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:43013 Archived-At: > Cc: emacs-devel@gnu.org > From: merlyn@stonehenge.com (Randal L. Schwartz) > Date: 16 Sep 2005 09:28:00 -0700 > > >>>>> "Eli" == Eli Zaretskii writes: > > Eli> One more question: is HAVE_CARBON defined (probably in src/config.h) > Eli> in that build? > > Yes, it is. From src/config.h: > > /* Define to 1 if you are using the Carbon API on Mac OS X. */ > #define HAVE_CARBON 1 Thanks. Please see if the patch below causes bootstrap to work again for you. > And keep in mind that I could also want to build the non-carbon X11 > version on OSX as well. I haven't tried that recently. Maybe I > should. Yes, please do try that. I'd like to know whether the non-Carbon build works as on OSX with this patch. Index: src/Makefile.in =================================================================== RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v retrieving revision 1.314 diff -u -r1.314 Makefile.in --- src/Makefile.in 15 Sep 2005 13:13:54 -0000 1.314 +++ src/Makefile.in 16 Sep 2005 20:45:06 -0000 @@ -304,6 +304,11 @@ #define LIB_X11_LIB -lX11 #endif +/* xmenu.c should not be compiled on OSX. */ +#ifndef HAVE_CARBON +XMENU_OBJ = xmenu.o +#endif + #ifdef HAVE_X_WINDOWS XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o @@ -570,7 +575,7 @@ /* lastfile must follow all files whose initialized data areas should be dumped as pure by dump-emacs. */ -obj= dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \ +obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o \ cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\ emacs.o keyboard.o macros.o keymap.o sysdep.o \