diff src/Makefile.in @ 96759:1e2f7aab70ba

* Makefile.in: Undef LIB_STANDARD before defining it to silence warning in case it was defined already. USE @GNUSTEP_MAKEFILES@ rather than envvars. * nsterm.m (ns_term_init): Pass Qt and Qnil rather than YES/NO to ns_default. (applicationShouldTerminate, setValuesFromPanel): Use EQ to compare Lisp_Objects. * nsterm.h (Fx_display_grayscale_p, Fx_display_planes) (ns_defined_color, ns_color_to_lisp): Declare. * nsselect.m (ns_handle_selection_request, ns_handle_selection_clear) (Fns_own_selection_internal): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsmenu.m (ns_update_menubar): Use EQ to compare Lisp_Objects. (update_frame_tool_bar): Remove apparently obsolete tests for non-integerness of f->tool_bar_lines. (windowShouldClose, addButton, clicked, runDialogAt): Make the big ugly hack more explicit, so it's accepted even with USE_LISP_UNION_TYPE. * nsfont.m (nsfont_driver): Use just 0 rather than an invalid cast. (nsfont_open): Don't confuse NULL for Qnil. * nsfns.m (ns_implicitly_set_icon_type): Use EQ to compare Lisp_Objects. * menu.h (find_and_call_menu_selection): * menu.c (find_and_call_menu_selection): Use just int for vector size. (find_and_return_menu_selection): Always return something. * frame.h: Include dispextern.h for Display_Info. (display_x_get_resource): Declare. * configure.in: Extract and substitute GNUSTEP_MAKEFILES.

--- a/src/Makefile.in	Thu Jul 17 02:36:16 2008 +0000
+++ b/src/Makefile.in	Thu Jul 17 03:33:59 2008 +0000
@@ -114,6 +114,7 @@
 
 /* Under GNUstep, putting libc on the link line causes problems. */
 #ifdef NS_IMPL_GNUSTEP
+#undef LIB_STANDARD
 #define LIB_STANDARD
 #endif
 
@@ -238,8 +239,8 @@
 /* Pull in stuff from GNUstep-make. */
 FOUNDATION_LIB=gnu
 GUI_LIB=gnu
-include $(GNUSTEP_MAKEFILES)/Additional/base.make
-include $(GNUSTEP_MAKEFILES)/Additional/gui.make
+include @GNUSTEP_MAKEFILES@/Additional/base.make
+include @GNUSTEP_MAKEFILES@/Additional/gui.make
 shared=no
 #endif
 
@@ -899,8 +900,7 @@
   ../lisp/mouse.elc \
   ../lisp/term/x-win.elc \
   ../lisp/term/ns-win.elc \
-  ../lisp/ns-carbon-compat.elc \
-  ../lisp/emacs-lisp/easymenu.elc
+  ../lisp/ns-carbon-compat.elc
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get