[Emacs-diffs] /srv/bzr/emacs/trunk r100185: Fix MSDOS build broken by autoconfiscation and changes in symbol handling.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100185 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-07 17:07:51 +0300
message:
  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.
modified:
  ChangeLog
  config.bat
  lisp/ChangeLog
  lisp/cus-start.el
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed3v2.inp
  src/ChangeLog
  src/Makefile.in
  src/msdos.c
  src/s/msdos.h
  src/w16select.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-07 02:55:47 +0000
+++ b/ChangeLog 2010-05-07 11:21:29 +0000
@@ -1,3 +1,8 @@
+2010-05-07  Eli Zaretskii  <address@hidden>
+
+       * config.bat: Allow for 2 leading `#'s in comments in
+       src/Makefile.in.
+
 2010-05-07  Glenn Morris  <address@hidden>
 
        * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.

=== modified file 'config.bat'
--- a/config.bat        2010-03-27 10:49:18 +0000
+++ b/config.bat        2010-05-07 11:21:29 +0000
@@ -197,7 +197,7 @@
 
 rem   Create "makefile" from "makefile.in".
 rm -f Makefile junk.c
-sed -e "1,/== start of cpp stuff ==/address@hidden .*$@@" <Makefile.in >junk.c
+sed -e "1,/== start of cpp stuff ==/address@hidden     ].*$@@" <Makefile.in 
>junk.c
 If "%DJGPP_VER%" == "1" Goto mfV1
 gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile
 goto mfDone

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-07 12:49:14 +0000
+++ b/lisp/ChangeLog    2010-05-07 14:07:51 +0000
@@ -1,3 +1,7 @@
+2010-05-07  Eli Zaretskii  <address@hidden>
+
+       * cus-start.el (all): Add native condition for tool-bar-* symbols.
+
 2010-05-07  Stefan Monnier  <address@hidden>
 
        * files.el (auto-save-mode): Move to simple.el to fix bootstrap.

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2010-04-20 18:52:07 +0000
+++ b/lisp/cus-start.el 2010-05-07 13:52:25 +0000
@@ -408,6 +408,10 @@
                       (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!

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-06 07:24:18 +0000
+++ b/msdos/ChangeLog   2010-05-07 12:57:24 +0000
@@ -1,3 +1,23 @@
+2010-05-07  Eli Zaretskii  <address@hidden>
+
+       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  <address@hidden>
 
        * sed1v2.inp, sed5x.inp: Remove LN_S, unused.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-06 07:24:18 +0000
+++ b/msdos/sed1v2.inp  2010-05-07 12:57:24 +0000
@@ -38,17 +38,53 @@
 /^CPPFLAGS *=/s/@address@hidden@//
 /^LDFLAGS *=/s/@address@hidden@//
 /^LIBS *=/s/@address@hidden@//
+s/@LIB_MATH@/-lm/
 /^LIBES *=/,/^ *$/ {
   s/@address@hidden@//g
 }
 /^LIBOBJS *=/s/@address@hidden@/getloadavg.o/
-/^GETLOADAVG_LIBS *=/s/@address@hidden@//
+/^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/@address@hidden@//
+/^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/@address@hidden@//
 /^M_FILE *=/address@hidden@address@hidden/intel386.h!
 /^S_FILE *=/address@hidden@address@hidden/msdos.h!

=== modified file 'msdos/sed3v2.inp'
--- a/msdos/sed3v2.inp  2010-03-27 10:49:18 +0000
+++ b/msdos/sed3v2.inp  2010-05-07 12:57:24 +0000
@@ -36,6 +36,7 @@
 /^LIBS_MAIL *=/s/@address@hidden@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
+/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/address@hidden@!!
 /^EXEEXT *=/address@hidden@!!

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-07 02:55:47 +0000
+++ b/src/ChangeLog     2010-05-07 14:07:51 +0000
@@ -1,3 +1,20 @@
+2010-05-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
+
+       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  <address@hidden>
 
        * Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-07 02:55:47 +0000
+++ b/src/Makefile.in   2010-05-07 12:57:24 +0000
@@ -240,8 +240,8 @@
        $(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
 address@hidden@
 address@hidden@
@@ -321,9 +321,10 @@
 
 #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 @@
 vmlimitobj = vm-limit.o
 #endif /* !SYSTEM_MALLOC */
 
-## Empty on Cygwin, lastfile.o elsewhere.
+/* Empty on Cygwin, lastfile.o elsewhere.  */
 address@hidden@
-## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.
+/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.  */
 address@hidden@
 
 /* List of object files that make-docfile should not be told about.  */

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2010-05-04 04:00:10 +0000
+++ b/src/msdos.c       2010-05-07 13:51:16 +0000
@@ -528,8 +528,7 @@
   /* 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)

=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h     2010-05-04 04:00:10 +0000
+++ b/src/s/msdos.h     2010-05-07 12:57:24 +0000
@@ -131,7 +131,7 @@
 /* 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 @@
 
 #define NO_REMAP
 
-#define UNEXEC unexec.o
-
 /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
    (do not change this comment) */

=== modified file 'src/w16select.c'
--- a/src/w16select.c   2010-04-01 14:59:46 +0000
+++ b/src/w16select.c   2010-05-07 13:51:16 +0000
@@ -685,8 +685,8 @@
      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))