Mercurial > emacs

changeset 108473:d89b565897dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Glenn Morris <rgm@gnu.org>
date Mon, 10 May 2010 19:51:08 -0700
parents 0eb2f9d5e474
children b246058e9b05
files ChangeLog config.bat lib-src/ChangeLog lib-src/Makefile.in msdos/ChangeLog msdos/sed1x.inp msdos/sed3x.inp src/ChangeLog src/Makefile.in src/s/msdos.h
diffstat 10 files changed, 30 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 11 04:04:13 2010 +0200
+++ b/ChangeLog	Mon May 10 19:51:08 2010 -0700
@@ -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.
--- a/config.bat	Tue May 11 04:04:13 2010 +0200
+++ b/config.bat	Mon May 10 19:51:08 2010 -0700
@@ -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
--- a/lib-src/ChangeLog	Tue May 11 04:04:13 2010 +0200
+++ b/lib-src/ChangeLog	Mon May 10 19:51:08 2010 -0700
@@ -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.
--- a/lib-src/Makefile.in	Tue May 11 04:04:13 2010 +0200
+++ b/lib-src/Makefile.in	Mon May 10 19:51:08 2010 -0700
@@ -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)
 
 
--- a/msdos/ChangeLog	Tue May 11 04:04:13 2010 +0200
+++ b/msdos/ChangeLog	Mon May 10 19:51:08 2010 -0700
@@ -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.
--- a/msdos/sed1x.inp	Tue May 11 04:04:13 2010 +0200
+++ b/msdos/sed1x.inp	Mon May 10 19:51:08 2010 -0700
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/msdos/sed3x.inp	Mon May 10 19:51:08 2010 -0700
@@ -0,0 +1,5 @@
+# -sed3x.inp------------------------------------------------------------
+# Extra configuration script for lib-src/makefile for DesqView/X
+# ----------------------------------------------------------------------
+/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
+
--- a/src/ChangeLog	Tue May 11 04:04:13 2010 +0200
+++ b/src/ChangeLog	Mon May 10 19:51:08 2010 -0700
@@ -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
--- a/src/Makefile.in	Tue May 11 04:04:13 2010 +0200
+++ b/src/Makefile.in	Mon May 10 19:51:08 2010 -0700
@@ -322,7 +322,6 @@
 #endif
 
 #ifdef MSDOS
-LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
 #ifdef HAVE_X_WINDOWS
 MSDOS_OBJ = dosfns.o msdos.o
 #else
--- a/src/s/msdos.h	Tue May 11 04:04:13 2010 +0200
+++ b/src/s/msdos.h	Mon May 10 19:51:08 2010 -0700
@@ -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