[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103352: Adapt and fix the MS-DOS por
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103352: Adapt and fix the MS-DOS port due to gnulib imports. |
|
Date: |
Sat, 19 Feb 2011 21:56:29 +0200 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103352 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-19 21:56:29 +0200
message:
Adapt and fix the MS-DOS port due to gnulib imports.
msdos/depfiles.bat: New file.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
(BUILT_EMACS): Rename from BUILT-EMACS.
msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
(ENVADD): Adjust to MAKEINFO_OPTS.
(texinputdir): Don't edit.
msdos/sed3v2.inp (-DVERSION): Edit out.
(LOADLIBES): Don't edit to empty.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
(my_strftime): Edit to nstrftime.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
(LIBOBJS): Edit to empty.
($(libsrc)/make-docfile): Two new edits, one each for every
invocation of make-docfile.
(move-if-change): Fix edit.
Remove some unused switches from $(ALL_CFLAGS), to make the GCC
command line shorter.
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
(lib, lib-src, src): Specify "all" as an explicit target.
.bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
Add lib/deps/.
config.bat: Configure in `lib'.
Generate *.Po files in lib/deps.
src/termcap.c (tputs): Don't declare baud_rate.
src/s/msdos.h (strtold): Define to _strtold.
added:
msdos/depfiles.bat
msdos/sedlibcf.inp
msdos/sedlibmk.inp
modified:
.bzrignore
ChangeLog
admin/ChangeLog
admin/admin.el
config.bat
msdos/ChangeLog
msdos/mainmake.v2
msdos/sed1v2.inp
msdos/sed2v2.inp
msdos/sed3v2.inp
msdos/sed6.inp
msdos/sedleim.inp
src/ChangeLog
src/s/msdos.h
src/termcap.c
=== modified file '.bzrignore'
--- a/.bzrignore 2011-02-16 00:33:44 +0000
+++ b/.bzrignore 2011-02-19 16:53:10 +0000
@@ -29,6 +29,7 @@
subdirs.el
TAGS
TAGS-LISP
+cxxdefs.h
info/*
admin/unidata/unidata.txt
leim/leim-list.el
@@ -36,6 +37,7 @@
leim/changed.misc
leim/changed.tit
lib/.deps/
+lib/deps/
lib/arg-nonnull.h
lib/c++defs.h
lib/getopt.h
@@ -43,6 +45,13 @@
lib/time.h
lib/unistd.h
lib/warn-on-use.h
+lib/getopt.in-h
+lib/stdbool.in-h
+lib/stddef.in-h
+lib/stdlib.in-h
+lib/time.in-h
+lib/unistd.in-h
+lib/cxxdefs.h
lib-src/stamp-*
lib-src/ctags
lib-src/ctags.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-18 07:41:43 +0000
+++ b/ChangeLog 2011-02-19 16:53:10 +0000
@@ -1,3 +1,11 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
+ Add lib/deps/.
+
+ * config.bat: Configure in `lib'.
+ Generate *.Po files in lib/deps.
+
2011-02-18 Paul Eggert <address@hidden>
Import IRIX 6.5 getloadavg fixes from gnulib.
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2011-02-16 00:33:44 +0000
+++ b/admin/ChangeLog 2011-02-19 15:57:35 +0000
@@ -1,3 +1,7 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * admin.el (set-version): Add msdos/sed2v2.inp.
+
2011-02-16 Paul Eggert <address@hidden>
Remove no-longer needed getloadavg symbols.
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2011-01-31 19:36:08 +0000
+++ b/admin/admin.el 2011-02-19 15:57:35 +0000
@@ -77,6 +77,10 @@
(rx (and bol "#" (0+ blank) "define" (1+ blank)
"VERSION" (1+ blank)
(submatch (1+ (in "0-9."))))))
+ (set-version-in-file root "msdos/sed2v2.inp" version
+ (rx (and bol "/^#undef " (1+ not-newline)
+ "define VERSION" (1+ space)
+ (submatch (1+ (in "0-9."))))))
(set-version-in-file root "nt/makefile.w32-in" version
(rx (and "VERSION" (0+ space) "=" (0+ space)
(submatch (1+ (in "0-9."))))))
=== modified file 'config.bat'
--- a/config.bat 2011-01-15 23:16:57 +0000
+++ b/config.bat 2011-02-19 16:53:10 +0000
@@ -2,7 +2,8 @@
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
-rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
Foundation, Inc.
+rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+rem Inc.
rem This file is part of GNU Emacs.
@@ -273,6 +274,25 @@
for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp
< %%d\Makefile.in > %%d\Makefile
cd ..
rem ----------------------------------------------------------------------
+Echo Configuring the lib directory...
+If Exist c++defs.h update c++defs.h cxxdefs.h
+cd lib
+Rem Rename files like djtar on plain DOS filesystem would.
+If Exist c++defs.h update c++defs.h cxxdefs.h
+If Exist getopt.in.h update getopt.in.h getopt.in-h
+If Exist stddef.in.h update stddef.in.h stddef.in-h
+If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
+If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
+If Exist time.in.h update time.in.h time.in-h
+If Exist unistd.in.h update unistd.in.h unistd.in-h
+sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
+sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
+rm -f makefile.tmp
+If Not Exist deps\stamp mkdir deps
+If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
+If Not Exist deps\stamp echo deps-stamp > deps\stamp
+cd ..
+rem ----------------------------------------------------------------------
Echo Configuring the lisp directory...
cd lisp
If Exist gnus\.dir-locals.el update gnus/.dir-locals.el gnus/_dir-locals.el
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2011-01-25 04:08:28 +0000
+++ b/msdos/ChangeLog 2011-02-19 19:56:29 +0000
@@ -1,3 +1,50 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * depfiles.bat: New file.
+
+ * sedlibmk.inp: New file.
+
+ * sedlibcf.inp: New file.
+
+ * sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
+ (BUILT_EMACS): Rename from BUILT-EMACS.
+
+ * sed6.inp (MAKEINFO): Edit to "makeinfo".
+ (ENVADD): Adjust to MAKEINFO_OPTS.
+ (texinputdir): Don't edit.
+
+ * sed3v2.inp (-DVERSION): Edit out.
+ (LOADLIBES): Don't edit to empty.
+
+ * sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
+ BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
+ (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
+ (HAVE__BOOL): Edit to 1.
+ (VERSION, inline, restrict): Edit for DJGPP.
+ (my_strftime): Edit to nstrftime.
+
+ * sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
+ (@true): Edit to "@rem".
+ (move-if-change): Edit to "update".
+ (echo): Edit to "djecho".
+ (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
+ (LIBOBJS): Edit to empty.
+ ($(libsrc)/make-docfile): Two new edits, one each for every
+ invocation of make-docfile.
+ (move-if-change): Fix edit.
+ Remove some unused switches from $(ALL_CFLAGS), to make the GCC
+ command line shorter.
+
+ * mainmake.v2 (version): Remove, no longer needed (config.in
+ defines VERSION).
+ (all): Add lib.
+ (lib): New target and recipe.
+ (lib-src): Depend on lib.
+ (src): Depend on lib and lib-src.
+ (clean, mostlyclean, distclean, maintainer-clean, extraclean)
+ (bootstrap-clean): Recurse into lib.
+ (lib, lib-src, src): Specify "all" as an explicit target.
+
2011-01-08 Glenn Morris <address@hidden>
* sedleim.inp (RUN-EMACS): -batch implies --no-init-file.
=== added file 'msdos/depfiles.bat'
--- a/msdos/depfiles.bat 1970-01-01 00:00:00 +0000
+++ b/msdos/depfiles.bat 2011-02-19 16:53:10 +0000
@@ -0,0 +1,25 @@
address@hidden off
+rem ----------------------------------------------------------------------
+rem Auxiliary script for MSDOS, run by ../config.bat
+rem Copyright (C) 2011 Free Software Foundation, Inc.
+
+rem This file is part of GNU Emacs.
+
+rem GNU Emacs is free software: you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License as published by
+rem the Free Software Foundation, either version 3 of the License, or
+rem (at your option) any later version.
+
+rem GNU Emacs is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+rem GNU General Public License for more details.
+
+rem You should have received a copy of the GNU General Public License
+rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/.
+
+rem ----------------------------------------------------------------------
+
+echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat
+call tdepfile
+del tdepfile.bat
=== modified file 'msdos/mainmake.v2'
--- a/msdos/mainmake.v2 2011-01-25 04:08:28 +0000
+++ b/msdos/mainmake.v2 2011-02-19 17:54:18 +0000
@@ -63,9 +63,6 @@
# Generate a full pathname of the top-level installation directory
top_srcdir := $(subst \,/,$(shell cd))
-# Find out which version of Emacs this is.
-version := ${shell sed -n -e '/^static const char
emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
-
# Q: Do we need to bootstrap?
# A: Only if we find admin/admin.el, i.e. we are building out of
# a VCS-checkout (not a release) and src/b-emacs.exe does not exist.
@@ -82,11 +79,16 @@
# compiled lisp files are part of the distribution. (If we are
# bootstrapping, the src target will run Make in `lisp' as well.)
# leim is not included because it is part of the src target.
-all: lib-src src emacs misc lispref lispintro
-
-lib-src: FRC
+all: lib lib-src src emacs misc lispref lispintro
+
+lib: FRC
+ cd lib
+ $(MAKE) top_srcdir=${top_srcdir} all
+ cd ..
+
+lib-src: lib FRC
cd lib-src
- $(MAKE) top_srcdir=${top_srcdir} version=${version}
+ $(MAKE) top_srcdir=${top_srcdir} all
cd ..
# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
@@ -98,9 +100,9 @@
# file src/foo.c forces dumping a new bootstrap-emacs, then re-byte-compiling
# all preloaded elisp files, and only then dump the actual src/emacs, which
# is not wrong, but is overkill in 99.99% of the cases.
-src: FRC
+src: lib lib-src FRC
cd src
- $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}"
+ $(MAKE) top_srcdir=${top_srcdir} BOOTSTRAPEMACS="${boot}" all
djecho -s '/-geometry/s,^.*,set environment HOME $(top_srcdir),' \
'/environment *TERM/s/^.*/set environment TERM internal/' \
>gdb.sed
@@ -168,6 +170,9 @@
@echo "We don't have any tests for GNU Emacs yet."
clean mostlyclean:
+ cd lib
+ $(MAKE) $(MFLAGS) $@
+ cd ..
cd lib-src
$(MAKE) $(MFLAGS) $@
cd ..
@@ -199,6 +204,9 @@
$(MAKE) $(MFLAGS) $@
if exist bootlisp rm -f bootlisp
cd ..
+ cd lib
+ $(MAKE) $(MFLAGS) $@
+ cd ..
cd lib-src
$(MAKE) $(MFLAGS) $@
cd ..
@@ -228,6 +236,9 @@
cd src
$(MAKE) $(MFLAGS) $@
cd ..
+ cd lib
+ $(MAKE) $(MFLAGS) $@
+ cd ..
cd lib-src
$(MAKE) $(MFLAGS) $@
cd ..
@@ -257,6 +268,9 @@
.PHONY: bootstrap
bootstrap-clean: FRC
+ cd lib
+ $(MAKE) $(MFLAGS) $@
+ cd ..
cd src
$(MAKE) $(MFLAGS) $@
cd ..
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2011-01-25 04:08:28 +0000
+++ b/msdos/sed1v2.inp 2011-02-19 19:49:10 +0000
@@ -35,7 +35,7 @@
/^LIBES *=/,/^ *$/ {
s/@address@hidden@//g
}
-/^LIBOBJS *=/s/@address@hidden@/getloadavg.o/
+/^LIBOBJS *=/s/@address@hidden@//
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
@@ -98,6 +98,7 @@
/^ns_appbindir *=/s/@ns_appbindir@//
/^ns_appsrc *=/s/@ns_appsrc@//
/^NS_OBJ *=/s/@NS_OBJ@//
+/^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@//
/^NS_SUPPORT *=/s/@NS_SUPPORT@//
/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
/^LIBRESOLV *=/s/@LIBRESOLV@//
@@ -130,7 +131,8 @@
/^M_FILE *=/address@hidden@!$(srcdir)/m/intel386.h!
/^S_FILE *=/address@hidden@!$(srcdir)/s/msdos.h!
/address@hidden@$/s/@SET_MAKE@//
-/^.\$(libsrc)\/make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
+/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o
../etc/DOC!
+/^.\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
/^.\$(libsrc)\/make-doc/s!>.*$!!
/^[ ]*$/d
/^ if test -f/,/^ fi$/c\
@@ -145,6 +147,13 @@
stubedit emacs.exe minstack=2048k
s/ || exit 1\; \\$//
s/ || true\; \\$//
+s/ @true *$/ @rem/
+s/^ [^ ]*move-if-change / update /
+/^ echo[ ][ ]*timestamp/s/echo /djecho /
+/^ .*djecho timestamp/a\
+ @rm -f gl-tmp
+/^ cd \$(lib) && \$(MAKE)/c\
+ $(MAKE) $(MFLAGS) -C $(lib) libgnu.a
/^RUN_TEMACS *=/s|`/bin/pwd`|.|
/^ address@hidden(MKDEPDIR) *$/d
/^ mv \.\/\.gdbinit/d
@@ -176,4 +185,11 @@
/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src|
/^ *THEFILE=/s|$|\; cd ../src|
/^ echo.* buildobj.h/s|echo |djecho |
-
+# Make the GCC command line fit one screen line
+/^[ ][ ]*\$(C_SWITCH_X_SYSTEM)/d
+/^[ ][ ]*\$(GCONF_CFLAGS)/d
+/^[ ][ ]*\$(LIBGNUTLS_CFLAGS)/d
+s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) //
+s/ \$(C_SWITCH_X_SITE)//
+s/ \$(DBUS_CFLAGS)//
+s| -I\$(srcdir)/../lib||
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2011-01-25 04:08:28 +0000
+++ b/msdos/sed2v2.inp 2011-02-19 19:41:00 +0000
@@ -34,6 +34,8 @@
/^#undef HAVE_FREXP *$/s/^.*$/#define HAVE_FREXP 1/
/^#undef HAVE_FMOD *$/s/^.*$/#define HAVE_FMOD 1/
/^#undef HAVE_RINT *$/s/^.*$/#define HAVE_RINT 1/
+/^#undef HAVE_ATTRIBUTE_ALIGNED *$/s/^.*$/#define HAVE_ATTRIBUTE_ALIGNED 1/
+/^#undef HAVE_C99_STRTOLD *$/s/^.*$/#define HAVE_C99_STRTOLD 1/
/^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/
/^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/
/^#undef HAVE_FPATHCONF *$/s/^.*$/#define HAVE_FPATHCONF 1/
@@ -56,8 +58,14 @@
/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
+/^#undef VERSION/s/^.*$/#define VERSION "24.0.50"/
+/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
/^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/
+/^#undef HAVE__BOOL/s/^.*$/#define HAVE__BOOL 1/
+/^#undef inline/s/^.*$/#define inline __inline__/
+/^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/
+/^#undef restrict/s/^.*$/#define restrict __restrict/
/^#undef GNU_MALLOC *$/s/^.*$/#define GNU_MALLOC 1/
/^#undef REL_ALLOC *$/s/^.*$/#define REL_ALLOC 1/
@@ -69,15 +77,6 @@
s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
-# ------------------------------------------------------------
-# Without this ifndef, gcc -E -traditional barfs with GCC 3.0
-# on the line which says if ! HAVE_MKTIME...
-# ------------------------------------------------------------
-/^#if ! HAVE_MKTIME || BROKEN_MKTIME/i\
-#ifndef __DJGPP__
-/^#define mktime emacs_mktime/a\
-#endif
-
/^#undef HAVE_STDINT_H/c\
#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\
#define HAVE_STDINT_H 1\
=== modified file 'msdos/sed3v2.inp'
--- a/msdos/sed3v2.inp 2011-01-25 04:08:28 +0000
+++ b/msdos/sed3v2.inp 2011-02-19 17:54:18 +0000
@@ -18,7 +18,7 @@
/^# DIST: /d
/^SHELL *=/s/^/# /
/^CC *=/s/=.*$/=gcc/
-/-DVERSION=/s/@version@/\${version}/
+s/-DVERSION[^ ]* //
/^configname *=/s/=.*$/=msdos/
/^archlibdir *=/s!=.*$!=/emacs/bin!
/^bindir *=/s!=.*$!=/emacs/bin!
@@ -40,7 +40,6 @@
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
-/^LOADLIBES *=/s!=.*$!=!
/^ALLOCA *=/address@hidden@!!
/^EXEEXT *=/address@hidden@!!
/^GETOPT_H *=/address@hidden@!getopt.h!
=== modified file 'msdos/sed6.inp'
--- a/msdos/sed6.inp 2011-01-25 04:08:28 +0000
+++ b/msdos/sed6.inp 2011-02-19 19:41:00 +0000
@@ -18,13 +18,11 @@
# ----------------------------------------------------------------------
/^srcdir *=/s/@address@hidden@/./
/^VPATH *=/s/@address@hidden@/./
-/^ENVADD/c\
+/^MAKEINFO *=/s/@address@hidden@/makeinfo/
+/^ENVADD/,/^$/c\
ENVADD =\
export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\
-export MAKEINFO := $(MAKEINFO) -I$(srcdir)
-/^texinputdir/c\
-texinputdir =\
-export texinputdir := $(srcdir)";"$(TEXINPUTS)
+export MAKEINFO := $(MAKEINFO) $(MAKEINFO_OPTS)
/^SHELL *=/s/^/# /
/^elisp.dvi:/,/^$/ {
/^ *if \[ *\a${permuted_index}/,/^ *fi *$/c\
=== modified file 'msdos/sedleim.inp'
--- a/msdos/sedleim.inp 2011-01-25 04:08:28 +0000
+++ b/msdos/sedleim.inp 2011-02-19 19:41:00 +0000
@@ -31,9 +31,9 @@
s|\([ ]\)echo|\1djecho|g
/^ @true *$/d
-/RUN-EMACS *=/,/^$/c\
+/RUN_EMACS *=/,/^$/c\
export EMACSLOADPATH=${buildlisppath}\
-RUN-EMACS = ${BUILT-EMACS} -batch --no-site-file
+RUN_EMACS = ${BUILT_EMACS} -batch --no-site-file
/^ cd ../c\
${MAKE} -C ../src ${MFLAGS} emacs
=== added file 'msdos/sedlibcf.inp'
--- a/msdos/sedlibcf.inp 1970-01-01 00:00:00 +0000
+++ b/msdos/sedlibcf.inp 2011-02-19 16:05:27 +0000
@@ -0,0 +1,22 @@
+# -sedlibcf.inp-----------------------------------------------------------
+# Configuration script for lib/Makefile.in under DJGPP v2.x
+#
+# This script is run by config.bat to account for renaming of
+# files whose names are invalid on DOS 8+3 filesystems.
+# ----------------------------------------------------------------------
+#
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# This file is free software; as a special exception, the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# ----------------------------------------------------------------------
+s/c++defs/cxxdefs/g
+s/\([a-zA-Z0-9_]*\)\.in\.h/\1.in-h/g
=== added file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp 1970-01-01 00:00:00 +0000
+++ b/msdos/sedlibmk.inp 2011-02-19 19:41:00 +0000
@@ -0,0 +1,312 @@
+# -sedlibmk.inp-----------------------------------------------------------
+# Configuration script for lib/Makefile under DJGPP v2.x
+# ----------------------------------------------------------------------
+#
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# This file is free software; as a special exception, the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# ----------------------------------------------------------------------
+#
+# Replace @..@ constants.
+/^\# @configure_input@/address@hidden@!lib/Makefile. Generated from
Makefile.in by config.bat!
+/address@hidden@$/s/@SET_MAKE@//
+/^VPATH *=/s/@address@hidden@/./
+s/@PACKAGE@/emacs/
+/^am__cd *=/c\
+am__cd = cd
+/^ALLOCA *=/s/@address@hidden@//
+/^ALSA_CFLAGS *=/s/@address@hidden@//
+/^ALSA_LIBS *=/s/@address@hidden@//
+/^AWK *=/s/@address@hidden@/gawk/
+/^CANNOT_DUMP *=/s/@address@hidden@/no/
+/^CC *=/s/@address@hidden@/gcc/
+/^CPP *=/s/@address@hidden@/gcc -e/
+/^CPPFLAGS *=/s/@address@hidden@//
+/^CCDEPMODE *=/s/@address@hidden@/depmode=gcc3/
+/^CFLAGS *=/s/@address@hidden@/-g -O2/
+/^CYGPATH_W *=/s/@address@hidden@//
+/^CYGWIN_OBJ *=/s/@address@hidden@//
+/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
+/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@//
+/^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@//
+/^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
+/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
+/^DEFS *=/s/@address@hidden@/-DHAVE_CONFIG_H/
+/^DEPDIR *=/s/@address@hidden@/deps/
+/^DEPFLAGS *=/s/@address@hidden@/-MMD -MF ${DEPDIR}\/$*.d/
+/^ECHO_N *=/s/@address@hidden@/-n/
+/^EXEEXT *=/s/@address@hidden@/.exe/
+/^GETOPT_H *=/s/@address@hidden@/getopt.h/
+#
+# Some GNULIB_* are replaced with zero even though DJGPP does not have
+# these features. That's because the gnulib replacements cannot
+# possibly work for DJGPP, so we prefer to fail the link than have a
+# subtly botched executable.
+/^GNULIB_ATOLL *=/s/@GNULIB_ATOLL@/1/
+/^GNULIB_CALLOC_POSIX *=/s/@GNULIB_CALLOC_POSIX@/0/
+/^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/
+/^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/
+/^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/
+/^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/
+/^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/
+/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/
+/^GNULIB_EUIDACCESS *=/s/@GNULIB_EUIDACCESS@/0/
+/^GNULIB_FACCESSAT *=/s/@GNULIB_FACCESSAT@/0/
+/^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/
+/^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/
+/^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/
+/^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/
+/^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/
+/^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/
+/^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/
+/^GNULIB_GETGROUPS *=/s/@GNULIB_GETGROUPS@/0/
+/^GNULIB_GETHOSTNAME *=/s/@GNULIB_GETHOSTNAME@/0/
+/^GNULIB_GETLOADAVG *=/s/@GNULIB_GETLOADAVG@/1/
+/^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/
+/^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/
+/^GNULIB_GETPAGESIZE *=/s/@GNULIB_GETPAGESIZE@/0/
+/^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/
+/^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/
+/^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/
+/^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/
+/^GNULIB_LINK *=/s/@GNULIB_LINK@/0/
+/^GNULIB_LINKAT *=/s/@GNULIB_LINKAT@/0/
+/^GNULIB_LSEEK *=/s/@GNULIB_LSEEK@/0/
+/^GNULIB_MALLOC_POSIX *=/s/@GNULIB_MALLOC_POSIX@/0/
+/^GNULIB_MKDTEMP *=/s/@GNULIB_MKDTEMP@/0/
+/^GNULIB_MKOSTEMP *=/s/@GNULIB_MKOSTEMP@/0/
+/^GNULIB_MKOSTEMPS *=/s/@GNULIB_MKOSTEMPS@/0/
+/^GNULIB_MKSTEMP *=/s/@GNULIB_MKSTEMP@/0/
+/^GNULIB_MKSTEMPS *=/s/@GNULIB_MKSTEMPS@/0/
+/^GNULIB_MKTIME *=/s/@GNULIB_MKTIME@/0/
+/^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/
+/^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/
+/^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/
+/^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/
+/^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/
+/^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/
+/^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/
+/^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/
+/^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/
+/^GNULIB_READLINKAT *=/s/@GNULIB_READLINKAT@/0/
+/^GNULIB_REALLOC_POSIX *=/s/@GNULIB_REALLOC_POSIX@/0/
+/^GNULIB_REALPATH *=/s/@GNULIB_REALPATH@/0/
+/^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/
+/^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
+/^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/
+/^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/
+/^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/
+/^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/
+/^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/
+/^GNULIB_STRTOULL *=/s/@GNULIB_STRTOULL@/0/
+/^GNULIB_SYMLINK *=/s/@GNULIB_SYMLINK@/0/
+/^GNULIB_SYMLINKAT *=/s/@GNULIB_SYMLINKAT@/0/
+/^GNULIB_SYSTEM_POSIX *=/s/@GNULIB_SYSTEM_POSIX@/0/
+/^GNULIB_TIMEGM *=/s/@GNULIB_TIMEGM@/0/
+/^GNULIB_TIME_R *=/s/@GNULIB_TIME_R@/1/
+/^GNULIB_TTYNAME_R *=/s/@GNULIB_TTYNAME_R@/0/
+/^GNULIB_UNISTD_H_GETOPT *=/s/@GNULIB_UNISTD_H_GETOPT@/1/
+/^GNULIB_UNISTD_H_SIGPIPE *=/s/@GNULIB_UNISTD_H_SIGPIPE@/0/
+/^GNULIB_UNLINK *=/s/@GNULIB_UNLINK@/0/
+/^GNULIB_UNLINKAT *=/s/@GNULIB_UNLINKAT@/0/
+/^GNULIB_UNLOCKPT *=/s/@GNULIB_UNLOCKPT@/0/
+/^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/
+/^GNULIB_USLEEP *=/s/@GNULIB_USLEEP@/0/
+/^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/
+/^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/
+/^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/
+/^HAVE_CANONICALIZE_FILE_NAME *=/s/@HAVE_CANONICALIZE_FILE_NAME@/0/
+/^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/
+/^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/
+/^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/
+/^HAVE_DECL_GETDOMAINNAME *=/s/@HAVE_DECL_GETDOMAINNAME@/0/
+/^HAVE_DECL_GETLOADAVG *=/s/@HAVE_DECL_GETLOADAVG@/0/
+/^HAVE_DECL_GETLOGIN_R *=/s/@HAVE_DECL_GETLOGIN_R@/0/
+/^HAVE_DECL_GETPAGESIZE *=/s/@HAVE_DECL_GETPAGESIZE@/1/
+/^HAVE_DECL_GETUSERSHELL *=/s/@HAVE_DECL_GETUSERSHELL@/0/
+/^HAVE_DECL_LOCALTIME_R *=/s/@HAVE_DECL_LOCALTIME_R@/0/
+/^HAVE_DECL_SETENV *=/s/@HAVE_DECL_SETENV@/1/
+/^HAVE_DECL_TTYNAME_R *=/s/@HAVE_DECL_TTYNAME_R@/0/
+/^HAVE_DECL_UNSETENV *=/s/@HAVE_DECL_UNSETENV@/0/
+/^HAVE_DUP2 *=/s/@HAVE_DUP2@/1/
+/^HAVE_DUP3 *=/s/@HAVE_DUP3@/0/
+/^HAVE_EUIDACCESS *=/s/@HAVE_EUIDACCESS@/0/
+/^HAVE_FACCESSAT *=/s/@HAVE_FACCESSAT@/0/
+/^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/
+/^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/
+/^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/
+/^HAVE_FTRUNCATE *=/s/@HAVE_FTRUNCATE@/1/
+/^HAVE_GETDTABLESIZE *=/s/@HAVE_GETDTABLESIZE@/0/
+/^HAVE_GETGROUPS *=/s/@HAVE_GETGROUPS@/0/
+/^HAVE_GETHOSTNAME *=/s/@HAVE_GETHOSTNAME@/1/
+/^HAVE_GETLOGIN *=/s/@HAVE_GETLOGIN@/1/
+/^HAVE_GETOPT_H *=/s/@HAVE_GETOPT_H@/0/
+/^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/
+/^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/
+/^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/
+/^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/
+/^HAVE_LINK *=/s/@HAVE_LINK@/1/
+/^HAVE_LINKAT *=/s/@HAVE_LINKAT@/0/
+/^HAVE_MAKEINFO *=/s/@HAVE_MAKEINFO@/yes/
+/^HAVE_MKDTEMP *=/s/@HAVE_MKDTEMP@/0/
+/^HAVE_MKOSTEMP *=/s/@HAVE_MKOSTEMP@/0/
+/^HAVE_MKOSTEMPS *=/s/@HAVE_MKOSTEMPS@/0/
+/^HAVE_MKSTEMP *=/s/@HAVE_MKSTEMP@/1/
+/^HAVE_MKSTEMPS *=/s/@HAVE_MKSTEMPS@/0/
+/^HAVE_NANOSLEEP *=/s/@HAVE_NANOSLEEP@/0/
+/^HAVE_OS_H *=/s/@HAVE_OS_H@/0/
+/^HAVE_PIPE *=/s/@HAVE_PIPE@/0/
+/^HAVE_PIPE2 *=/s/@HAVE_PIPE2@/0/
+/^HAVE_PREAD *=/s/@HAVE_PREAD@/0/
+/^HAVE_PTSNAME *=/s/@HAVE_PTSNAME@/0/
+/^HAVE_PWRITE *=/s/@HAVE_PWRITE@/0/
+/^HAVE_RANDOM_H *=/s/@HAVE_RANDOM_H@/1/
+/^HAVE_RANDOM_R *=/s/@HAVE_RANDOM_R@/0/
+/^HAVE_READLINK *=/s/@HAVE_READLINK@/0/
+/^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/
+/^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/
+/^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
+/^HAVE_SETENV *=/s/@HAVE_SETENV@/1/
+/^HAVE_SLEEP *=/s/@HAVE_SLEEP@/1/
+/^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/
+/^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/
+/^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/
+/^HAVE_STRTOULL *=/s/@HAVE_STRTOULL@/1/
+/^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/
+/^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/
+/^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/
+/^HAVE_SYS_LOADAVG_H *=/s/@HAVE_SYS_LOADAVG_H@/0/
+/^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/
+/^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/
+/^HAVE_UNISTD_H *=/s/@HAVE_UNISTD_H@/1/
+/^HAVE_UNLINKAT *=/s/@HAVE_UNLINKAT@/0/
+/^HAVE_UNLOCKPT *=/s/@HAVE_UNLOCKPT@/0/
+/^HAVE_USLEEP *=/s/@HAVE_USLEEP@/1/
+/^HAVE_WCHAR_T *=/s/@HAVE_WCHAR_T@/1/
+/^HAVE_XSERVER *=/s/@HAVE_XSERVER@/0/
+/^HAVE__BOOL *=/s/@HAVE__BOOL@/1/
+/^HAVE__EXIT *=/s/@HAVE__EXIT@/1/
+/^INCLUDE_NEXT *=/s/@INCLUDE_NEXT@/include_next/
+/^INCLUDE_NEXT_AS_FIRST_DIRECTIVE *=/s/@address@hidden@/include_next/
+/^LDFLAGS *=/s/@address@hidden@//
+/^LD_FIRSTFLAG *=/s/@address@hidden@//
+/^LIBS *=/s/@address@hidden@//
+/^MAKEINFO *=/s/@MAKEINFO@/makeinfo/
+/^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@address@hidden@/<getopt.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@address@hidden@//
+/^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@address@hidden@/<stdlib.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@address@hidden@/<time.h>/
+/^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@address@hidden@/<unistd.h>/
+/^NEXT_GETOPT_H *=/s/@address@hidden@/<getopt.h>/
+/^NEXT_STDDEF_H *=/s/@address@hidden@//
+/^NEXT_STDLIB_H *=/s/@address@hidden@/<stdlib.h>/
+/^NEXT_TIME_H *=/s/@address@hidden@/<time.h>/
+/^NEXT_UNISTD_H *=/s/@address@hidden@/<unistd.h>/
+/^OBJEXT *=/s/@address@hidden@/o/
+/^PRAGMA_COLUMNS *=/s/@address@hidden@//
+/^PRAGMA_SYSTEM_HEADER *=/s/@address@hidden@/\\\#pragma GCC system_header/
+/^PTHREAD_H_DEFINES_STRUCT_TIMESPEC *=/s/@address@hidden@/0/
+/^RANLIB *=/s/@address@hidden@/ranlib/
+/^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/
+/^REPLACE_CANONICALIZE_FILE_NAME *=/s/@REPLACE_CANONICALIZE_FILE_NAME@/0/
+/^REPLACE_CHOWN *=/s/@REPLACE_CHOWN@/0/
+/^REPLACE_CLOSE *=/s/@REPLACE_CLOSE@/0/
+/^REPLACE_DUP *=/s/@REPLACE_DUP@/0/
+/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/
+/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/
+/^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/
+/^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/
+/^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/
+/^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/
+/^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/0/
+/^REPLACE_LCHOWN *=/s/@REPLACE_LCHOWN@/0/
+/^REPLACE_LINK *=/s/@REPLACE_LINK@/0/
+/^REPLACE_LINKAT *=/s/@REPLACE_LINKAT@/0/
+/^REPLACE_LOCALTIME_R *=/s/@REPLACE_LOCALTIME_R@/0/
+/^REPLACE_LSEEK *=/s/@REPLACE_LSEEK@/0/
+/^REPLACE_MALLOC *=/s/@REPLACE_MALLOC@/0/
+/^REPLACE_MKSTEMP *=/s/@REPLACE_MKSTEMP@/0/
+/^REPLACE_MKTIME *=/s/@REPLACE_MKTIME@/0/
+/^REPLACE_NANOSLEEP *=/s/@REPLACE_NANOSLEEP@/0/
+/^REPLACE_NULL *=/s/@REPLACE_NULL@/0/
+/^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/
+/^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/
+/^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/
+/^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/
+/^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/
+/^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/
+/^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/
+/^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/
+/^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/
+/^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/
+/^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/
+/^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/
+/^REPLACE_TTYNAME_R *=/s/@REPLACE_TTYNAME_R@/0/
+/^REPLACE_UNLINK *=/s/@REPLACE_UNLINK@/0/
+/^REPLACE_UNLINKAT *=/s/@REPLACE_UNLINKAT@/0/
+/^REPLACE_UNSETENV *=/s/@REPLACE_UNSETENV@/0/
+/^REPLACE_USLEEP *=/s/@REPLACE_USLEEP@/0/
+/^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/
+/^STDBOOL_H *=/s/@address@hidden@//
+/^STDDEF_H *=/s/@address@hidden@//
+/^SYS_TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@address@hidden@/0/
+/^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@address@hidden@/0/
+/^UNISTD_H_HAVE_WINSOCK2_H *=/s/@address@hidden@/0/
+/^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@address@hidden@/0/
+/^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o
getloadavg.o/
+/^srcdir *=/s/@address@hidden@/./
+/^top_srcdir *=/s/@address@hidden@/../
+/^top_builddir *=/s/@address@hidden@/../
+s/@PRAGMA_SYSTEM_HEADER@/\#pragma GCC system_header/
+s/@PRAGMA_COLUMNS@//
+#
+# Delete the recipes we don't want to get in our way.
+/^\$(srcdir)\/Makefile\.in:/,/^[ ][ ]*\$(AUTOMAKE)/d
+/^Makefile:/,/^[ ][ ]*esac/d
+/^\$(top_srcdir)\/configure:/,/^\$(ACLOCAL_M4)/d
+#
+# Fix the include-dependency lines
+s/address@hidden@//
+s/address@hidden@/\#/
+s/@am__include@/include/
+s/@am__quote@//g
+s/address@hidden@//
+s/address@hidden/\#/
+#
+# Fix the *-clean rules, to not use a Unixy `test' command. Empty
+# lists are replaced with a dummy file, to avoid an error message from
+# "rm -f" with no arguments.
+/^CONFIG_CLEAN_FILES *= *$/c\
+CONFIG_CLEAN_FILES = xyzzy
+/^CONFIG_CLEAN_VPATH_FILES *= *$/c\
+CONFIG_CLEAN_VPATH_FILES = xyzzy
+s/^ -*test -z.*|| rm/ -rm/
+s/@echo /@djecho/
+#
+# Fix the recipes for header files
+/^arg-nonnull\.h:/,/^[ ][ ]*mv /c\
+arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h\
+ sed -n -e '/GL_ARG_NONNULL/,$$p' < $(top_srcdir)/./arg-nonnull.h > $@
+/^cxxdefs\.h:/,/^[ ][ ]*mv /c\
+cxxdefs.h: $(top_srcdir)/./cxxdefs.h\
+ sed -n -e '/_GL_CXXDEFS/,$$p' < $(top_srcdir)/./cxxdefs.h > $@
+s/^ [ ]*{ echo \(.*\); \\/ djecho \1 > address@hidden/
+s/^ [ ]*{ echo \(.*\) && \\/ djecho \1 > address@hidden/
+s/ \&\& \\ *$//
+s/\.in-h\; *\\$/.in-h >> address@hidden/
+/^ [ ]*} /d
+/^stdlib\.h:/,/^ [ ]*mv /{
+ s/'\; \\ *$/' >> address@hidden/
+}
+/^unistd\.h:/,/^ [ ]*mv /{
+ s/'\; \\ *$/' >> address@hidden/
+}
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-19 19:40:59 +0000
+++ b/src/ChangeLog 2011-02-19 19:56:29 +0000
@@ -1,3 +1,9 @@
+2011-02-19 Eli Zaretskii <address@hidden>
+
+ * termcap.c (tputs): Don't declare baud_rate.
+
+ * s/msdos.h (strtold): Define to _strtold.
+
2011-02-18 Stefan Monnier <address@hidden>
* process.c (Fstart_process, Fmake_serial_process)
=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h 2011-02-14 17:58:13 +0000
+++ b/src/s/msdos.h 2011-02-19 15:57:35 +0000
@@ -73,6 +73,15 @@
#define HAVE_INVERSE_HYPERBOLIC
#define FLOAT_CHECK_DOMAIN
+/* Start of gnulib-related stuff */
+
+/* lib/ftoastr.c wants strtold, but DJGPP only has _strtold. DJGPP >
+ 2.03 has it, but it also has _strtold as a stub that jumps to
+ strtold, so use _strtold in all versions. */
+#define strtold _strtold
+
+/* End of gnulib-related stuff. */
+
/* When $TERM is "internal" then this is substituted: */
#define INTERNAL_TERMINAL "pc|bios|IBM PC with color display:\
:co#80:li#25:Co#16:pa#256:km:ms:cm=<CM>:cl=<CL>:ce=<CE>:\
=== modified file 'src/termcap.c'
--- a/src/termcap.c 2011-01-17 19:01:01 +0000
+++ b/src/termcap.c 2011-02-19 19:41:00 +0000
@@ -268,7 +268,6 @@
register int padcount = 0;
register int speed;
- extern EMACS_INT baud_rate;
speed = baud_rate;
/* For quite high speeds, convert to the smaller
units to avoid overflow. */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103352: Adapt and fix the MS-DOS port due to gnulib imports.,
Eli Zaretskii <=