Fix the DJGPP build

* msdos/sedlibmk.inp (LIB_SELINUX, USE_SELINUX_SELINUX_H):
Define to 0.

* src/conf_post.h (_GL_DIT_NOTDIR, ENOTSUP) [MSDOS]: Define to
appropriate values.

(cherry picked from commit 03249f78153a34aab70b30f23d26210c1e7ff2a3)

diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index 624983798c478301255fd94419b30918f1add6fb..15939c85547826a82db2747d13f77a940b213809 100644 (file)
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -278,6 +278,7 @@ s/@PACKAGE@/emacs/
 /^LDFLAGS *=/s/@[^@\n]*@//
 /^LD_FIRSTFLAG *=/s/@[^@\n]*@//
 /^LIB_PTHREAD *=/s/@[^@\n]*@//
+/^LIB_SELINUX *=/s/@[^@\n]*@//
 /^LIBS *=/s/@[^@\n]*@//
 /^MAKEINFO *=/s/@MAKEINFO@/makeinfo/
 # MKDIR_P lines are edited further below
@@ -367,6 +368,7 @@ s/@PACKAGE@/emacs/
 /^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/
 /^UNISTD_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/
 /^UNDEFINE_STRTOK_R *=/s/@UNDEFINE_STRTOK_R@/0/
+/^USE_SELINUX_SELINUX_H *=/s/@USE_SELINUX_SELINUX_H@/0/
 /^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/
 /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
 /^GNULIBHEADERS_OVERRIDE_WINT_T *=/s/@[^@\n]*@/0/

diff --git a/src/conf_post.h b/src/conf_post.h
index f2353803074e7c47d8686fe365dc1c99685206fc..e68d5a56d9b14c049bc3420c35c2cee64fc9ae69 100644 (file)
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -475,3 +475,10 @@ extern int emacs_setenv_TZ (char const *);
 /* Emacs does not need glibc strftime behavior for AM and PM
    indicators.  */
 #define REQUIRE_GNUISH_STRFTIME_AM_PM false
+
+#ifdef MSDOS
+/* These are required by file-has-acl.c but defined in dirent.h and
+   errno.h, which are not generated on DOS.  */
+#define _GL_DT_NOTDIR 0x100   /* Not a directory */
+#define ENOTSUP 2007
+#endif /* MSDOS */