[Emacs-diffs] /srv/bzr/emacs/trunk r100221: On msdos, set LIBS_SYSTEM with config.bat, not cpp.

[Glenn Morris]

------------------------------------------------------------
revno: 100221
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-10 19:51:08 -0700
message:
  On msdos, set LIBS_SYSTEM with config.bat, not cpp.
  
  * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
  
  * src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
  * src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
  
  * msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
  * msdos/sed3x.inp: New file.
  
  * lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
  (config.h) [MSDOS]: Do not include.
added:
  msdos/sed3x.inp
modified:
  ChangeLog
  config.bat
  lib-src/ChangeLog
  lib-src/Makefile.in
  msdos/ChangeLog
  msdos/sed1x.inp
  src/ChangeLog
  src/Makefile.in
  src/s/msdos.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-11 02:04:13 +0000
+++ b/ChangeLog 2010-05-11 02:51:08 +0000
@@ -1,3 +1,7 @@
+2010-05-11  Glenn Morris  <address@hidden>
+
+       * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
+
 2010-05-10  Glenn Morris  <address@hidden>
 
        * configure.in (LIBS_SYSTEM): New output variable, replacing cpp.

=== modified file 'config.bat'
--- a/config.bat        2010-05-07 11:21:29 +0000
+++ b/config.bat        2010-05-11 02:51:08 +0000
@@ -231,6 +231,11 @@
 sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
 :libsrc2
 rm -f makefile.new junk.c
+if "%X11%" == "" goto libsrc2a
+mv Makefile makefile.tmp
+sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile
+rm -f makefile.tmp
+:libsrc2a
 if "%nodebug%" == "" goto libsrc3
 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp
 sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-05-10 02:16:09 +0000
+++ b/lib-src/ChangeLog 2010-05-11 02:51:08 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
+       (config.h) [MSDOS]: Do not include.
+
 2010-05-10  Glenn Morris  <address@hidden>
 
        * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp.

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2010-05-10 02:16:09 +0000
+++ b/lib-src/Makefile.in       2010-05-11 02:51:08 +0000
@@ -167,11 +167,6 @@
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
-#ifdef MSDOS
-#include "../src/config.h"
-LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
-#endif
-
 LOADLIBES=$(LIBS_SYSTEM)
 
 

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-10 02:16:09 +0000
+++ b/msdos/ChangeLog   2010-05-11 02:51:08 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Glenn Morris  <address@hidden>
+
+       * sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
+       * sed3x.inp: New file.
+
 2010-05-10  Glenn Morris  <address@hidden>
 
        * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty.

=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp   2010-01-04 05:35:18 +0000
+++ b/msdos/sed1x.inp   2010-05-11 02:51:08 +0000
@@ -5,6 +5,7 @@
 s!^    @true *$!       @rem!
 s/DOC/DOC-X/g
 #/^LIBXMENU *=/s!= *!= ../oldxmenu/!
+/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
 /^temacs *:/s!OLDXMENU!LIBXMENU!
 
 # arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19

=== added file 'msdos/sed3x.inp'
--- a/msdos/sed3x.inp   1970-01-01 00:00:00 +0000
+++ b/msdos/sed3x.inp   2010-05-11 02:51:08 +0000
@@ -0,0 +1,5 @@
+# -sed3x.inp------------------------------------------------------------
+# Extra configuration script for lib-src/makefile for DesqView/X
+# ----------------------------------------------------------------------
+/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
+

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-11 02:04:13 +0000
+++ b/src/ChangeLog     2010-05-11 02:51:08 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
+       * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
+
 2010-05-10  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (init_iterator): Don't turn on bidi reordering in

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-10 02:16:09 +0000
+++ b/src/Makefile.in   2010-05-11 02:51:08 +0000
@@ -322,7 +322,6 @@
 #endif
 
 #ifdef MSDOS
-LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
 #ifdef HAVE_X_WINDOWS
 MSDOS_OBJ = dosfns.o msdos.o
 #else

=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h     2010-05-10 02:16:09 +0000
+++ b/src/s/msdos.h     2010-05-11 02:51:08 +0000
@@ -140,9 +140,7 @@
    commentary below, in the non-X branch.  The 140KB number was
    measured on GNU/Linux and on MS-WIndows.  */
 #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
-#define MSDOS_LIBS_SYSTEM -lxext -lsys
 #else
-#define MSDOS_LIBS_SYSTEM
 /* We need a little extra space, see ../../lisp/loadup.el.
    As of 20091024, DOS-specific files use up 62KB of pure space.  But
    overall, we end up wasting 130KB of pure space, because