Fix the MS-DOS build

* configure.ac (REQUIRE_GNUISH_STRFTIME_AM_PM): Move definition
to...

* src/conf_post.h (REQUIRE_GNUISH_STRFTIME_AM_PM):
...conf_post.h.

(cherry picked from commit e058380324e462c234bb3407d504807f22d825b0)

diff --git a/configure.ac b/configure.ac
index 81f47146bc5494b0e02192630511e42034e5b9d7..b9bcb9a4648ab44f18722ff6f433e0e8f8f3e6ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1566,8 +1566,6 @@ AC_DEFUN([gt_TYPE_WINT_T],
 AC_DEFUN_ONCE([gl_STDLIB_H],
   [AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
    gl_NEXT_HEADERS([stdlib.h])])
-AC_DEFINE([REQUIRE_GNUISH_STRFTIME_AM_PM], [false],
-  [Emacs does not need glibc strftime behavior for AM and PM indicators.])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.

diff --git a/src/conf_post.h b/src/conf_post.h
index 83a0dd1b09b28c27680c35b3e225c03f7c949117..f2353803074e7c47d8686fe365dc1c99685206fc 100644 (file)
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -471,3 +471,7 @@ extern int emacs_setenv_TZ (char const *);
 #undef MB_CUR_MAX
 #define MB_CUR_MAX REPLACEMENT_MB_CUR_MAX
 #endif /* REPLACEMENT_MB_CUR_MAX */
+
+/* Emacs does not need glibc strftime behavior for AM and PM
+   indicators.  */
+#define REQUIRE_GNUISH_STRFTIME_AM_PM false