Initial version of fix for the MS-DOS build, not yet tested.

 config.bat: Configure in `lib'.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 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 ...".
 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.
 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.
 src/s/msdos.h (strtold): Define to _strtold.
 admin/admin.el (set-version): Add msdos/sed2v2.inp.

1 files changed, 18 insertions, 1 deletions

diff --git a/config.bat b/config.bat
index f87bcd13a5d..730a33770e9 100644
--- a/config.bat
+++ b/config.bat
@@ -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,22 @@ Rem supports long file names but DJGPP does not
 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

+cd ..

+rem   ----------------------------------------------------------------------

 Echo Configuring the lisp directory...

 cd lisp

 If Exist gnus\.dir-locals.el update gnus/.dir-locals.el gnus/_dir-locals.el