Fix MSDOS build broken by autoconfiscation and changes in symbol handling.

 src/msdos.c (dos_set_window_size):
 src/w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
 instead of `XSYMBOL (foo)->value'.
 config.bat: Allow for 2 leading `#'s in comments in
 src/Makefile.in.
 src/Makefile.in: Don't use Make-style comments past the "start of
 cpp stuff" line.
 (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
 src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
 edited directly by msdos/sed1v2.inp).
 msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
 msdos/sed1v2.inp (@LIB_MATH@): Edit to -lm.
 (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
 (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
 (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
 (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
 (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
 (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
 (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
 (XMENU_OBJ): Edit to xmenu.o.
 (FONT_OBJ): Edit to value used for X on Unix.
 (PRE_ALLOC_OBJ): Edit to lastfile.o.
 (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
 (@unexec@): Edit to unexec.o.
 lisp/cus-start.el (all): Add native condition for tool-bar-* symbols.

12 files changed, 100 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 06a8ad610b6..ffabf7204c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * config.bat: Allow for 2 leading `#'s in comments in
+        src/Makefile.in.
+
 2010-05-07  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
diff --git a/config.bat b/config.bat
index 5a0e9168fa3..271673bc302 100644
--- a/config.bat
+++ b/config.bat
@@ -197,7 +197,7 @@ if exist dir.h ren dir.h vmsdir.h
 

 rem   Create "makefile" from "makefile.in".

 rm -f Makefile junk.c

-sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c

+sed -e "1,/== start of cpp stuff ==/s@^##*[     ].*$@@" <Makefile.in >junk.c

 If "%DJGPP_VER%" == "1" Goto mfV1

 gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile

 goto mfDone

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24e1b98f736..e2aeabf1fe1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Add native condition for tool-bar-* symbols.
+
 2010-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 07f7702e9d6..bc48aa88cc5 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -408,6 +408,10 @@ since it could result in memory overflow and make Emacs crash."
                        (fboundp 'define-fringe-bitmap))
                       ((equal "font-use-system-font" (symbol-name symbol))
                        (featurep 'system-font-setting))
+                      ;; Conditioned on x-create-frame, because that's
+                      ;; the condition for loadup.el to preload tool-bar.el.
+                      ((string-match "tool-bar-" (symbol-name symbol))
+                       (fboundp 'x-create-frame))
                       (t t))))
     (if (not (boundp symbol))
         ;; If variables are removed from C code, give an error here!
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 3d6cd8833d4..5760c7bc582 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,23 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix breakage due to autoconfiscation of Makefile.in files.
+
+        * sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
+
+        * sed1v2.inp (@LIB_MATH@): Edit to -lm.
+        (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
+        (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
+        (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
+        (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
+        (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
+        (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
+        (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
+        (XMENU_OBJ): Edit to xmenu.o.
+        (FONT_OBJ): Edit to value used for X on Unix.
+        (PRE_ALLOC_OBJ): Edit to lastfile.o.
+        (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
+        (@unexec@): Edit to unexec.o.
+
 2010-05-06  Glenn Morris  <rgm@gnu.org>
 
         * sed1v2.inp, sed5x.inp: Remove LN_S, unused.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 84209f59dca..f9c2398c99b 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -38,17 +38,53 @@ s/\.h\.in/.h-in/
 /^CPPFLAGS *=/s/@[^@\n]*@//
 /^LDFLAGS *=/s/@[^@\n]*@//
 /^LIBS *=/s/@[^@\n]*@//
+s/@LIB_MATH@/-lm/
 /^LIBES *=/,/^ *$/ {
   s/@[^@\n]*@//g
 }
 /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/
-/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
+/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
+/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
+/^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
+/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
+/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
+/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
+/^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@//
+/^LIBTIFF *=/s/@LIBTIFF@//
+/^LIBJPEG *=/s/@LIBJPEG@//
+/^LIBPNG *=/s/@LIBPNG@//
+/^LIBGIF *=/s/@LIBGIF@//
+/^LIBXPM *=/s/@LIBXPM@//
+/^XFT_LIBS *=/s/@XFT_LIBS@//
+/^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@//
+/^DBUS_LIBS *=/s/@DBUS_LIBS@//
+/^DBUS_OBJ *=/s/@DBUS_OBJ@//
+/^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@//
+/^GCONF_LIBS *=/s/@GCONF_LIBS@//
+/^GTK_OBJ *=/s/@GTK_OBJ@//
+/^LIBXMU *=/s/@LIBXMU@//
+/^LIBXSM *=/s/@LIBXSM@//
+/^LIBXTR6 *=/s/@LIBXTR6@//
+/^XOBJ *=/s/@XOBJ@//
+/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
 /^LIBSOUND *=/s/@LIBSOUND@//
 /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
 /^RSVG_LIBS *=/s/@RSVG_LIBS@//
 /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
+/^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
+/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
+/^NS_OBJ *=/s/@NS_OBJ@//
+/^NS_SUPPORT *=/s/@NS_SUPPORT@//
+/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
+/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
+/^START_FILES *=/s/@START_FILES@//
 /^OTHER_FILES *=/s/@OTHER_FILES@//
+/^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/
+/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/
 /^EXEEXT *=/s/@EXEEXT@/.exe/
+/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
+/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
+s/@unexec@/unexec.o/g
 /^version *=/s/@[^@\n]*@//
 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 5dcde810c82..0f489d8dacf 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -36,6 +36,7 @@
 /^LIBS_MAIL *=/s/@[^@\n]*@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
+/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
diff --git a/src/ChangeLog b/src/ChangeLog
index 04d9d6b8266..9570c0ce3c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdos.c (dos_set_window_size):
+        * w16select.c (Fx_selection_exists_p): Use `Fsymbol_value (foo)'
+        instead of `XSYMBOL (foo)->value'.
+
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix the MS-DOS build, broken by autoconfiscation.
+
+        * Makefile.in: Don't use Make-style comments past the "start of
+        cpp stuff" line.
+        (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
+
+        * s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
+        edited directly by msdos/sed1v2.inp).
+
 2010-05-07  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
diff --git a/src/Makefile.in b/src/Makefile.in
index 5ea321df78c..43a1cae02dc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -240,8 +240,8 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
         $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
-/* This test needs to say in cpp for the time being, since s/ms-w32.h and
-   s/msdos.h define HAVE_MENUS, possibly overriding configure.  */
+/* This test needs to say in cpp for the time being, since s/msdos.h
+   defines HAVE_MENUS, and does not use the configure script.  */
 #ifdef HAVE_MENUS
 OLDXMENU=@OLDXMENU@
 LIBXMENU=@LIBXMENU@
@@ -321,9 +321,10 @@ LD=ld
 
 #ifdef MSDOS
 #ifdef HAVE_X_WINDOWS
-MSDOS_OBJ = dosfns.o msdos.o xmenu.o
+MSDOS_OBJ = dosfns.o msdos.o
+#define LIBS_SYSTEM -lxext -lsys
 #else
-MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o termcap.o
+MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o
 #endif
 #endif
 
@@ -397,9 +398,9 @@ rallocobj = ralloc.o
 vmlimitobj = vm-limit.o
 #endif /* !SYSTEM_MALLOC */
 
-## Empty on Cygwin, lastfile.o elsewhere.
+/* Empty on Cygwin, lastfile.o elsewhere.  */
 PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
-## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.
+/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.  */
 POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
 /* List of object files that make-docfile should not be told about.  */
diff --git a/src/msdos.c b/src/msdos.c
index 28d621f8cc1..ea604d29992 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -528,8 +528,7 @@ dos_set_window_size (rows, cols)
   /* If the user specified a special video mode for these dimensions,
      use that mode.  */
   sprintf (video_name, "screen-dimensions-%dx%d", *rows, *cols);
-  video_mode = XSYMBOL (Fintern_soft (build_string (video_name),
-                                      Qnil))-> value;
+  video_mode = Fsymbol_value (Fintern_soft (build_string (video_name), Qnil));
 
   if (INTEGERP (video_mode)
       && (video_mode_value = XINT (video_mode)) > 0)
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 8cd9bfc8491..5199799a226 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -131,7 +131,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 /* We have (the code to control) a mouse.  */
 #define HAVE_MOUSE
 
-/* We canuse mouse menus.  */
+/* We can use mouse menus.  */
 #define HAVE_MENUS
 
 /* Define one of these for easier conditionals.  */
@@ -163,7 +163,5 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 #define NO_REMAP
 
-#define UNEXEC unexec.o
-
 /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
    (do not change this comment) */
diff --git a/src/w16select.c b/src/w16select.c
index c6a84e46a60..9ebf6de6250 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -685,8 +685,8 @@ and t is the same as `SECONDARY'.  */)
      into the clipboard if we run under Windows, so we cannot check
      the clipboard alone.)  */
   if ((EQ (selection, Qnil) || EQ (selection, QPRIMARY))
-      && ! NILP (SYMBOL_VALUE (Fintern_soft (build_string ("kill-ring"),
-                                             Qnil))))
+      && ! NILP (Fsymbol_value (Fintern_soft (build_string ("kill-ring"),
+                                              Qnil))))
     return Qt;
 
   if (EQ (selection, QCLIPBOARD))