10 files changed, 30 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 52abe513e23..d65a6060a60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
+
 2010-05-10  Glenn Morris  <rgm@gnu.org>
 
         * configure.in (LIBS_SYSTEM): New output variable, replacing cpp.
diff --git a/config.bat b/config.bat
index 271673bc302..e2e57bb5ef9 100644
--- a/config.bat
+++ b/config.bat
@@ -231,6 +231,11 @@ Goto libsrc2
 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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 608d5c618b3..6f3879fb266 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
+        (config.h) [MSDOS]: Do not include.
+
 2010-05-10  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 5f0fb6e671f..683a97393db 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -167,11 +167,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src
 # ========================== 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)
 
 
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6922c6f55db..bed87472907 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
+        * sed3x.inp: New file.
+
 2010-05-10  Glenn Morris  <rgm@gnu.org>
 
         * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty.
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 2a7ce82d528..8be94aafa03 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -5,6 +5,7 @@ s!^	cd \${oldXMenudir}; \${MAKE}.*$!	${MAKE} -C ${oldXMenudir}.!
 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
diff --git a/msdos/sed3x.inp b/msdos/sed3x.inp
new file mode 100644
index 00000000000..71148c9800d
--- /dev/null
+++ b/msdos/sed3x.inp
@@ -0,0 +1,5 @@
+# -sed3x.inp------------------------------------------------------------
+# Extra configuration script for lib-src/makefile for DesqView/X
+# ----------------------------------------------------------------------
+/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
+
diff --git a/src/ChangeLog b/src/ChangeLog
index fab6d2034cc..8bac6573c23 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
+        * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
+
 2010-05-10  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (init_iterator): Don't turn on bidi reordering in
diff --git a/src/Makefile.in b/src/Makefile.in
index 69e37fb236a..292429fc7b4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -322,7 +322,6 @@ LD=ld
 #endif
 
 #ifdef MSDOS
-LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
 #ifdef HAVE_X_WINDOWS
 MSDOS_OBJ = dosfns.o msdos.o
 #else
diff --git a/src/s/msdos.h b/src/s/msdos.h
index a594bb850f4..4d7ca08d3c0 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -140,9 +140,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    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