CVS HEAD currently broken on OSX

CVS HEAD currently broken on OSX

[Randal L. Schwartz]

Is someone working on this?   Here's the tail of "make clean bootstrap":

gcc -I/sw/include -L/sw/lib -c -fpascal-strings -fno-common -DMAC_OSX -I../mac/src   -Demacs -DHAVE_CONFIG_H   -I. -I/Users/merlyn/MIRROR/emacs-CVS/src -fpascal-strings -fno-common -DMAC_OSX -I../mac/src -Dtemacs -g -O2 xmenu.c
xmenu.c: In function 'x_menu_wait_for_event':
xmenu.c:1178: error: 'x_display_list' undeclared (first use in this function)
xmenu.c:1178: error: (Each undeclared identifier is reported only once
xmenu.c:1178: error: for each function it appears in.)
xmenu.c:1178: error: dereferencing pointer to incomplete type
xmenu.c:1180: error: dereferencing pointer to incomplete type
xmenu.c: In function 'pop_down_menu':
xmenu.c:3261: error: 'XMenu' undeclared (first use in this function)
xmenu.c:3261: error: 'menu' undeclared (first use in this function)
xmenu.c:3265: error: 'CurrentTime' undeclared (first use in this function)
xmenu.c: In function 'xmenu_show':
xmenu.c:3299: error: 'XMenu' undeclared (first use in this function)
xmenu.c:3299: error: 'menu' undeclared (first use in this function)
xmenu.c:3364: error: 'XM_FAILURE' undeclared (first use in this function)
xmenu.c:3409: warning: pointer targets in assignment differ in signedness
xmenu.c:3502: error: 'ButtonReleaseMask' undeclared (first use in this function)
xmenu.c:3507: error: 'XM_SUCCESS' undeclared (first use in this function)
xmenu.c:3549: error: 'XM_IA_SELECT' undeclared (first use in this function)
xmenu.c:3552: error: 'XM_NO_SELECT' undeclared (first use in this function)
make[1]: *** [xmenu.o] Error 1
make: *** [bootstrap-build] Error 2


-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 15 Sep 2005 12:39:11 -0700
> 
> 
> Is someone working on this?   Here's the tail of "make clean bootstrap":

Thanks.

However, this information is insufficient to fix the bug without
breaking other systems, and I don't have access to OSX to reproduce
the problem myself.  So please send at least the details of how you
ran the configure script, and what it printed when it finished.  (I
think xmenu.c should not be compiled at all on OSX, but I need to
understand what conditionals to use to correctly specify that.)

Re: CVS HEAD currently broken on OSX

[Jason Rumney]

Eli Zaretskii wrote:

>I
>think xmenu.c should not be compiled at all on OSX, but I need to
>understand what conditionals to use to correctly specify that.)
>  
>
Perhaps this change has caused xmenu.c to be compiled when it shouldn't be.


2005-09-15  Richard M. Stallman  <rms@gnu.org>

    * Makefile.in (XMENU_OBJ): Variable deleted.
    (obj): Use xmenu.o unconditionally.
    (SOME_MACHINE_OBJECTS): Delete xmenu.o.

    * emacs.c (main): Don't conditionalize syms_of_xmenu on HAVE_XMENU.

Re: CVS HEAD currently broken on OSX

[Steven Tamm]

Reverting this change fixes the build.  Just remove xmenu.o from the  
Makefile and keep going.

Why was this change made?

-Steven

On Sep 16, 2005, at 5:21 AM, Jason Rumney wrote:

> Eli Zaretskii wrote:
>
>
>> I
>> think xmenu.c should not be compiled at all on OSX, but I need to
>> understand what conditionals to use to correctly specify that.)
>>
>>
> Perhaps this change has caused xmenu.c to be compiled when it  
> shouldn't be.
>
>
> 2005-09-15  Richard M. Stallman  <rms@gnu.org>
>
>    * Makefile.in (XMENU_OBJ): Variable deleted.
>    (obj): Use xmenu.o unconditionally.
>    (SOME_MACHINE_OBJECTS): Delete xmenu.o.
>
>    * emacs.c (main): Don't conditionalize syms_of_xmenu on HAVE_XMENU.
>
>
>
>
> _______________________________________________
> Emacs-devel mailing list
> Emacs-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-devel
>

Re: CVS HEAD currently broken on OSX

[Stefan Monnier]

> Reverting this change fixes the build.  Just remove xmenu.o from the
> Makefile and keep going.

> Why was this change made?

Otherwise calling (x-popup-menu nil map) doesn't work in an Emacs compiled
without any window-system support.


        Stefan

Re: CVS HEAD currently broken on OSX

[Randal L. Schwartz]

>>>>> "Stefan" == Stefan Monnier <monnier@iro.umontreal.ca> writes:

Stefan> Otherwise calling (x-popup-menu nil map) doesn't work in an
Stefan> Emacs compiled without any window-system support.

Sorry for walking in the middle of this, but why should it "work"?  What
would it do?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Cc: Steven Tamm <steventamm@mac.com>,  Jason Rumney <jasonr@gnu.org>,
> 	  Eli Zaretskii <eliz@gnu.org>,  emacs-devel@gnu.org
> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 16 Sep 2005 09:10:26 -0700
> 
> >>>>> "Stefan" == Stefan Monnier <monnier@iro.umontreal.ca> writes:
> 
> Stefan> Otherwise calling (x-popup-menu nil map) doesn't work in an
> Stefan> Emacs compiled without any window-system support.
> 
> Sorry for walking in the middle of this, but why should it "work"?  What
> would it do?

I think I explained that in my mail, sent a bit after Stefan's.

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org,
>         "Randal L. Schwartz" <merlyn@stonehenge.com>
> From: Steven Tamm <steventamm@mac.com>
> Date: Fri, 16 Sep 2005 08:40:43 -0700
> 
> Reverting this change fixes the build.  Just remove xmenu.o from the  
> Makefile and keep going.
> 
> Why was this change made?

See my other mail in this thread.

Reverting this change is not an option.  We need to find a way to fix
OSX without reverting.

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Date: Fri, 16 Sep 2005 13:21:22 +0100
> From: Jason Rumney <jasonr@gnu.org>
> CC: "Randal L. Schwartz" <merlyn@stonehenge.com>,  emacs-devel@gnu.org
> 
> Perhaps this change has caused xmenu.c to be compiled when it shouldn't be.
> 
> 
> 2005-09-15  Richard M. Stallman  <rms@gnu.org>
> 
>     * Makefile.in (XMENU_OBJ): Variable deleted.
>     (obj): Use xmenu.o unconditionally.
>     (SOME_MACHINE_OBJECTS): Delete xmenu.o.
> 
>     * emacs.c (main): Don't conditionalize syms_of_xmenu on HAVE_XMENU.

It is quite clear that this change broke OSX, but I don't want to
revert it, because Richard was solving a problem (keyboard shortcuts
not displayed in tmm-menu in non-X builds).  I want to find a way to
fix OSX without breaking the other platforms and without taking out
keyboard shortcuts in tmm-menu.

Re: CVS HEAD currently broken on OSX

[Randal L. Schwartz]

>>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:

Eli> However, this information is insufficient to fix the bug without
Eli> breaking other systems, and I don't have access to OSX to reproduce
Eli> the problem myself.  So please send at least the details of how you
Eli> ran the configure script, and what it printed when it finished.  (I
Eli> think xmenu.c should not be compiled at all on OSX, but I need to
Eli> understand what conditionals to use to correctly specify that.)

$ ./configure --prefix=/opt/emacs --without-x
[after much probing and printing... ]

Configured for `powerpc-apple-darwin8.2.0'.

  Where should the build process find the source code?    /Users/merlyn/MIRROR/emacs-CVS
  What operating system and machine description files should Emacs use?
        `s/darwin.h' and `m/powermac.h'
  What compiler should emacs be built with?               gcc -I/sw/include -L/sw/lib -g -O2
  Should Emacs use the GNU version of malloc?             no
    (The GNU allocators don't work with this system configuration.)
  Should Emacs use a relocating allocator for buffers?    no
  Should Emacs use mmap(2) for buffer allocation?         no
  What window system should Emacs use?                    mac
  What toolkit should Emacs use?                          none
  Where do we find X Windows header files?                NONE
  Where do we find X Windows libraries?                   NONE
  Does Emacs use -lXaw3d?                                 no
  Does Emacs use -lXpm?                                   no
  Does Emacs use -ljpeg?                                  no
  Does Emacs use -ltiff?                                  no
  Does Emacs use -lungif?                                 no
  Does Emacs use -lpng?                                   no
  Does Emacs use X toolkit scroll bars?                   yes

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 16 Sep 2005 07:31:58 -0700
> 
> $ ./configure --prefix=/opt/emacs --without-x
> [after much probing and printing... ]
> 
> Configured for `powerpc-apple-darwin8.2.0'.
> 
>   Where should the build process find the source code?    /Users/merlyn/MIRROR/emacs-CVS
>   What operating system and machine description files should Emacs use?
>         `s/darwin.h' and `m/powermac.h'
>   What compiler should emacs be built with?               gcc -I/sw/include -L/sw/lib -g -O2
>   Should Emacs use the GNU version of malloc?             no
>     (The GNU allocators don't work with this system configuration.)
>   Should Emacs use a relocating allocator for buffers?    no
>   Should Emacs use mmap(2) for buffer allocation?         no
>   What window system should Emacs use?                    mac
>   What toolkit should Emacs use?                          none
>   Where do we find X Windows header files?                NONE
>   Where do we find X Windows libraries?                   NONE
>   Does Emacs use -lXaw3d?                                 no
>   Does Emacs use -lXpm?                                   no
>   Does Emacs use -ljpeg?                                  no
>   Does Emacs use -ltiff?                                  no
>   Does Emacs use -lungif?                                 no
>   Does Emacs use -lpng?                                   no
>   Does Emacs use X toolkit scroll bars?                   yes

Thanks.

One more question: is HAVE_CARBON defined (probably in src/config.h)
in that build?

Re: CVS HEAD currently broken on OSX

[Randal L. Schwartz]

>>>>> "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

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.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> 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 \

Re: CVS HEAD currently broken on OSX

[Randal L. Schwartz]

>>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:

Eli> Thanks.  Please see if the patch below causes bootstrap to work again
Eli> for you.

After "make clean; ./configure --prefix=/opt/emacs --without-x; make bootstrap",
looks like it compiles clean....

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 16 Sep 2005 14:12:27 -0700
> Cc: emacs-devel@gnu.org
> 
> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> 
> Eli> Thanks.  Please see if the patch below causes bootstrap to work again
> Eli> for you.
> 
> After "make clean; ./configure --prefix=/opt/emacs --without-x; make bootstrap",
> looks like it compiles clean....

Thanks, I installed the patch.

Re: CVS HEAD currently broken on OSX

[Randal L. Schwartz]

>>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:

>> 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.

Eli> Yes, please do try that.  I'd like to know whether the non-Carbon
Eli> build works as on OSX with this patch.

And confirming this, building --with-x gives me a binary
that works fine in both x11 and curses modes.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 16 Sep 2005 14:58:11 -0700
> Cc: emacs-devel@gnu.org
> 
> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> 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.
> 
> Eli> Yes, please do try that.  I'd like to know whether the non-Carbon
> Eli> build works as on OSX with this patch.
> 
> And confirming this, building --with-x gives me a binary
> that works fine in both x11 and curses modes.

Please also make sure that tmm-menu works in both --without-x
and --with-x builds, and shows the keyboard bindings for
the menu items in both cases.  This was the reason for having
xmenu.c compile in all builds.

TIA

Re: CVS HEAD currently broken on OSX

[Randal L. Schwartz]

>>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:

Eli> Please also make sure that tmm-menu works in both --without-x
Eli> and --with-x builds, and shows the keyboard bindings for
Eli> the menu items in both cases.  This was the reason for having
Eli> xmenu.c compile in all builds.

Ahh, tmm.  That thing I never use, but invoke accidentally all the
time.  Just confirmed works --without-x (carbon mode), but I threw
away the --with-x binary, and not sure I have time to build it before
I travel this morning.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: merlyn@stonehenge.com (Randal L. Schwartz)
> Date: 17 Sep 2005 05:34:30 -0700
> 
> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> 
> Eli> Please also make sure that tmm-menu works in both --without-x
> Eli> and --with-x builds, and shows the keyboard bindings for
> Eli> the menu items in both cases.  This was the reason for having
> Eli> xmenu.c compile in all builds.
> 
> Ahh, tmm.  That thing I never use, but invoke accidentally all the
> time.  Just confirmed works --without-x (carbon mode), but I threw
> away the --with-x binary, and not sure I have time to build it before
> I travel this morning.

Thanks for testing.

Re: CVS HEAD currently broken on OSX

[YAMAMOTO Mitsuharu]

>>>>> On Fri, 16 Sep 2005 23:47:23 +0300, Eli Zaretskii <eliz@gnu.org> said:

> Yes, please do try that.  I'd like to know whether the non-Carbon
> build works as on OSX with this patch.

Alternatively, how about this one?  It is essentially the same, but
the intention is to enhance symmetry.  I tried it with terminal-only,
X11, and Carbon builds.

				     YAMAMOTO Mitsuharu
				mituharu@math.s.chiba-u.ac.jp

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.314
diff -c -r1.314 Makefile.in
*** src/Makefile.in	15 Sep 2005 13:13:54 -0000	1.314
--- src/Makefile.in	17 Sep 2005 00:30:54 -0000
***************
*** 563,576 ****
  
  #ifdef HAVE_CARBON
  mac = $(dot)$(dot)/mac/
! MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o
  emacsapp = $(PWD)/$(mac)Emacs.app/
  emacsappsrc = ${srcdir}/../mac/Emacs.app/
  #endif
  
  /* 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 \
  	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 \
--- 563,582 ----
  
  #ifdef HAVE_CARBON
  mac = $(dot)$(dot)/mac/
! MAC_OBJ = mac.o macterm.o macfns.o macselect.o fontset.o fringe.o image.o
  emacsapp = $(PWD)/$(mac)Emacs.app/
  emacsappsrc = ${srcdir}/../mac/Emacs.app/
  #endif
  
+ #ifndef HAVE_CARBON
+ MENU_OBJ = xmenu.o
+ #else
+ MENU_OBJ = macmenu.o
+ #endif
+ 
  /* 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 $(MENU_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 \
***************
*** 589,595 ****
     These go in the DOC file on all machines
     in case they are needed there.  */
  SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
!   xterm.o xfns.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
    mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
    w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
    w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o
--- 595,601 ----
     These go in the DOC file on all machines
     in case they are needed there.  */
  SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
!   xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
    mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
    w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
    w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> Date: Sat, 17 Sep 2005 09:43:59 +0900
> From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
> Cc: emacs-devel@gnu.org, "Randal L. Schwartz" <merlyn@stonehenge.com>
> 
> >>>>> On Fri, 16 Sep 2005 23:47:23 +0300, Eli Zaretskii <eliz@gnu.org> said:
> 
> > Yes, please do try that.  I'd like to know whether the non-Carbon
> > build works as on OSX with this patch.
> 
> Alternatively, how about this one?  It is essentially the same, but
> the intention is to enhance symmetry.

Thanks.

I prefer the asymmetric patch, because I still hope that someone will
merge macmenu.c and w32menu.c into xmenu.c, and we will then maintain
a single file.  When that happens, dealing with an asymmetric patch
will be easier: just remove the asymmetric part.

Re: CVS HEAD currently broken on OSX

[Richard M. Stallman]

xmenu.c should be compiled on all systems,
unless some other file does the same job instead.

Re: CVS HEAD currently broken on OSX

[Eli Zaretskii]

> From: "Richard M. Stallman" <rms@gnu.org>
> CC: merlyn@stonehenge.com, emacs-devel@gnu.org
> Date: Sat, 17 Sep 2005 00:57:31 -0400
> 
> xmenu.c should be compiled on all systems,
> unless some other file does the same job instead.

The Mac OS ports indeed use a replacement file: macmenu.c.
(MS-Windows also uses a replacement in w32menu.c, but the Windows
build doesn't use src/Makefile.in, so it is unaffected by these
changes.)