From: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: CVS HEAD currently broken on OSX
Date: Fri, 16 Sep 2005 23:47:23 +0300 [thread overview]
Message-ID: <ubr2sn3j8.fsf@gnu.org> (raw)
In-Reply-To: <8664t1565r.fsf@blue.stonehenge.com> (merlyn@stonehenge.com)
> Cc: emacs-devel@gnu.org
> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 16 Sep 2005 09:28:00 -0700
>
> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> 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 \
next prev parent reply other threads:[~2005-09-16 20:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-15 19:39 CVS HEAD currently broken on OSX Randal L. Schwartz
2005-09-16 11:12 ` Eli Zaretskii
2005-09-16 12:21 ` Jason Rumney
2005-09-16 15:40 ` Steven Tamm
2005-09-16 16:06 ` Stefan Monnier
2005-09-16 16:10 ` Randal L. Schwartz
2005-09-16 20:48 ` Eli Zaretskii
2005-09-16 16:21 ` Eli Zaretskii
2005-09-16 16:15 ` Eli Zaretskii
2005-09-16 14:31 ` Randal L. Schwartz
2005-09-16 16:19 ` Eli Zaretskii
2005-09-16 16:28 ` Randal L. Schwartz
2005-09-16 20:47 ` Eli Zaretskii [this message]
2005-09-16 21:12 ` Randal L. Schwartz
2005-09-17 9:08 ` Eli Zaretskii
2005-09-16 21:58 ` Randal L. Schwartz
2005-09-17 9:09 ` Eli Zaretskii
2005-09-17 12:34 ` Randal L. Schwartz
2005-09-17 13:49 ` Eli Zaretskii
2005-09-17 0:43 ` YAMAMOTO Mitsuharu
2005-09-17 9:04 ` Eli Zaretskii
2005-09-17 4:57 ` Richard M. Stallman
2005-09-17 9:03 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ubr2sn3j8.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).