Fix the MSDOS build.

* msdos/sed1v2.inp (GETADDRINFO_A_LIBS, LIBLCMS2, XDBE_LIBS)
(XDBE_FLAGS, HYBRID_MALLOC, LIBSYSTEMD_CFLAGS)
(LIBSYSTEMD_LIBS): Edit to empty.
(LIBRESOLV, DEPFLAGS, MKDEPDIR, YMF_PASS_LDFLAGS)
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): Remove editing.
Remove editing of lines that are no longer present in
src/Makefile.in.
* msdos/sed2v2.inp (NEED_MKTIME_INTERNAL)
(NEED_MKTIME_WORKING): Define to 1.
(HAVE_STRUCT_DIRENT_D_TYPE): Define to 1 for
DJGPP >= 2.05.
(HAVE_STRUCT_ATTRIBUTE_ALIGNED): Define to 1.
Define PACKAGE_VERSION, not VERSION.
(FLEXIBLE_ARRAY_MEMBER): Define to empty.
(HAVE_DECL_*_UNLOCKED): Define to 0.
(HAVE___BUILTIN_FRAME_ADDRESS): Define to 1.
(PENDING_*): Don't define, as Gnulib no longer supports that.
Instead, define _IOERR as it is in libc/file.h.
* msdos/sed3v2.inp: Use $(CURDIR) instead of $(shell cd) to
determine the current directory.
(UPDATE_MANIFEST, UTILITIES): Don't edit.
* msdos/sedlisp.inp (FIND_DELETE): Edit to "-delete".
* msdos/sedlibmk.inp (AUTO_DEPEND): Define to yes.
(HYBRID_MALLOC): Edit to empty.
(am__cd): Don't edit.
(../config.status): Replaces $(top_builddir)/config.status.
Define OMIT_GNULIB_MODULE_foo = true for modules not built for
MS-DOS.  Convert GL_GENERATE_xxx_H_TRUE and
GL_GENERATE_xxx_H_FALSE into values of GL_GENERATE_xxx_H.
* msdos/mainmake.v2 (src): Use 'compile-one-process', and make
the command line shorter to fit into 126-char limit of
command.com.
* config.bat: Generate src/deps/*.d files.  Rename more files
like djtar on plain DOS would.
Don't rename src/dir.h: it is long gone.  Edit
lib/gnulib.mk.in using the same scripts as for
lib/Makefile.in.
* msdos/depfiles.bat: Create *.d files, not *.Po.

* src/thread.c (Fmake_thread) [!THREADS_ENABLED]: Improve the
error message.
* src/thread.h [MSDOS]: Include <signal.h>.
* src/sysselect.h (select) [MSDOS]: Undefine, to avoid
compilation errors.
* src/sysdep.c (block_interrupt_signal, restore_signal_mask):
Expose to MSDOS build.
* src/process.c (update_processes_for_thread_death)
[!subprocess]: No-op implementation.
[HAVE_SETRLIMIT]: Move inclusion of sys/resource.h and
declaration of nofile_limit outside "#ifdef subprocesses", as
it's needed for MSDOS.
* src/msdos.c (faccessat): Declare fullname[].
* src/msdos.h (ENOTSUP): Define to be identical to ENOSYS.
Include termhooks.h.
* src/conf_post.h [WINDOWSNT]: Include ms-w32.h only on
WINDOWSNT, not DOS_NT.

* admin/admin.el (set-version): Set version on PACKAGE_VERSION.

1 files changed, 15 insertions, 9 deletions

diff --git a/config.bat b/config.bat
index d0251df560d..90882218bc6 100644
--- a/config.bat
+++ b/config.bat
@@ -189,9 +189,6 @@ rm -f junk.c junk junk.exe
 update config.h2 config.h >nul

 rm -f config.tmp config.h2

 

-rem   On my system dir.h gets in the way.  It's a VMS file so who cares.

-if exist dir.h ren dir.h vmsdir.h

-

 rem   Create "makefile" from "makefile.in".

 rm -f Makefile makefile.tmp

 copy Makefile.in+deps.mk makefile.tmp

@@ -222,6 +219,10 @@ sed -e "/^LIBXML2_LIBS *=/s/=/= -lxml2 -lz -liconv/" <Makefile >makefile.tmp
 sed -e "/^LIBXML2_CFLAGS *=/s|=|= -I/dev/env/DJDIR/include/libxml2|" <makefile.tmp >Makefile

 rm -f makefile.tmp

 :src7

+Rem Create .d files for new files in src/

+If Not Exist deps\stamp mkdir deps

+for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f

+echo deps-stamp > deps\stamp

 cd ..

 rem   ----------------------------------------------------------------------

 Echo Configuring the library source directory...

@@ -273,6 +274,7 @@ Echo Configuring the lib directory...
 If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/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 alloca.in.h update alloca.in.h alloca.in-h

 If Exist byteswap.in.h update byteswap.in.h byteswap.in-h

 If Exist dirent.in.h update dirent.in.h dirent.in-h

@@ -280,12 +282,12 @@ If Exist errno.in.h update errno.in.h errno.in-h
 If Exist execinfo.in.h update execinfo.in.h execinfo.in-h

 If Exist fcntl.in.h update fcntl.in.h fcntl.in-h

 If Exist getopt.in.h update getopt.in.h getopt.in-h

+If Exist getopt-cdefs.in.h update getopt-cdefs.in.h getopt-cdefs.in-h

 If Exist inttypes.in.h update inttypes.in.h inttypes.in-h

-If Exist stdarg.in.h update stdarg.in.h stdarg.in-h

-If Exist stdalign.in.h update stdalign.in.h stdalign.in-h

-If Exist stdbool.in.h update stdbool.in.h stdbool.in-h

+If Exist limits.in.h update limits.in.h limits.in-h

 If Exist signal.in.h update signal.in.h signal.in-h

-If Exist stdalign.in.h update stdalign.in.h  stdalign.in-h

+If Exist signal.in.h update signal.in.h signal.in-h

+If Exist stdalign.in.h update stdalign.in.h stdalign.in-h

 If Exist stddef.in.h update stddef.in.h  stddef.in-h

 If Exist stdint.in.h update stdint.in.h  stdint.in-h

 If Exist stdio.in.h update stdio.in.h stdio.in-h

@@ -293,16 +295,20 @@ If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
 If Exist string.in.h update string.in.h string.in-h

 If Exist sys_select.in.h update sys_select.in.h sys_select.in-h

 If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h

-If Exist sys_types.in.h update sys_types.in.h sys_types.in-h

 If Exist sys_time.in.h update sys_time.in.h sys_time.in-h

+If Exist sys_types.in.h update sys_types.in.h sys_types.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

+If Exist gnulib.mk.in update gnulib.mk.in gnulib.mk-in

 Rem Only repository has the msdos/autogen directory

 If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp

 If Exist ..\msdos\autogen\Makefile.in sed -f ../msdos/sedlibcf.inp < ..\msdos\autogen\Makefile.in > makefile.tmp

 sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile

 rm -f makefile.tmp

-Rem Create .Po files for new files in lib/

+sed -f ../msdos/sedlibcf.inp < gnulib.mk-in > gnulib.tmp

+sed -f ../msdos/sedlibmk.inp < gnulib.tmp > gnulib.mk

+rm -f gnulib.tmp

+Rem Create .d files for new files in lib/

 If Not Exist deps\stamp mkdir deps

 for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f

 echo deps-stamp > deps\stamp