fix compile errors/warnings -------------------- ChangeLog entries follow: -------------------- lib-src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * digest-doc.c: * make-path.c: `emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get config.h. * getopt.h: Conditionalize on HAVE_CONFIG_H to get real prototypes. src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * Makefile.in.in: * Makefile.in.in (objs): glyphs-shared.o, glyphs-eimage.o only needed when HAVE_WINDOW_SYSTEM. glyphs-widget.o should be too, but we need a bit of work ifdeffing out the subwindow stuff from redisplay.c et al. * bytecode.c (init_opcode_table_multi_op): Change var name to avoid shadowing with `basename'. * emacs.c (main_1): Don't call init/etc. routines for glyphs-shared, glyphs-eimage unless HAVE_WINDOW_SYSTEM is defined. * linuxplay.c: * linuxplay.c (sighandler): * vdb-posix.c (vdb_fault_handler): Use const for variables holding string constants to avoid C++ warnings.

--- a/src/Makefile.in.in	Fri Feb 26 15:52:24 2010 +0000
+++ b/src/Makefile.in.in	Tue Mar 02 05:22:10 2010 -0600
@@ -183,6 +183,10 @@
 event_unixoid_objs=event-unixoid.o
 #endif
 
+#ifdef HAVE_WINDOW_SYSTEM
+glyphs_objs=glyphs-eimage.o glyphs-shared.o
+#endif
+
 #ifdef HAVE_GPM
 gpm_objs=gpmevent.o
 #endif
@@ -281,8 +285,8 @@
  event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\
  faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \
  font-lock.o frame.o\
- gc.o general.o glyphs.o glyphs-eimage.o glyphs-shared.o\
- glyphs-widget.o $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \
+ gc.o general.o glyphs.o $(glyphs_objs) glyphs-widget.o \
+ $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \
  gutter.o\
  hash.o imgproc.o indent.o insdel.o intl.o\
  keymap.o $(RTC_patch_objs) line-number.o $(ldap_objs) lread.o lstream.o\