Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de.

 lib/makefile.w32-in:
 lib/getopt_.h: New files.
 src/s/ms-w32.h (HAVE_MKTIME): Remove.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GNULIB): New variable.
 (LIBS): Add $(GNULIB).
 $(TEMACS): Depend on $(GNULIB).
 <top-level>: Fix font-lock disrupted by a lone `"'.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GETOPTOBJS, GETOPTDEPS): Remove targets.
 (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
 ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
 (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
 and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
 (clean): Don't remove getopt.h.
 (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
 ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
 $(EMACS_ROOT)/lib/getopt.h.
 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
 (bootstrap-clean-gmake, clean-other-dirs-nmake)
 (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
 (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
 (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
 (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
 nt/configure.bat: Create lib/makefile.
 nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
 (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.

4 files changed, 101 insertions, 6 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index e0c5aa2f756..d7301e8ff23 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
+	(bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
+	(bootstrap-clean-gmake, clean-other-dirs-nmake)
+	(clean-other-dirs-gmake, cleanall-other-dirs-nmake)
+	(cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
+	(distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
+	(maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
+
+	* configure.bat: Create lib/makefile.
+
+	* config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
+	(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
+	(HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
+	(_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
+
 2011-01-07  Eli Zaretskii  <eliz@gnu.org>
 
 	* config.nt (HAVE___BUILTIN_UNWIND_INIT) [GCC >= 2.8]: Define.
diff --git a/nt/config.nt b/nt/config.nt
index 6e10c758d3f..53d89701c69 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -224,7 +224,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_SETSID
 #undef HAVE_FPATHCONF
 #undef HAVE_SELECT
-#undef HAVE_MKTIME
 #undef HAVE_EUIDACCESS
 #undef HAVE_GETPAGESIZE
 #undef HAVE_GET_CURRENT_DIR_NAME
@@ -273,6 +272,67 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `getopt_long_only' function. */
 #undef HAVE_GETOPT_LONG_ONLY
 
+/* Preprocessor macros needed for gnulib imports.  */
+
+/* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */
+#ifdef __GNUC__
+#define HAVE_ATTRIBUTE_ALIGNED 1
+#else
+#undef HAVE_ATTRIBUTE_ALIGNED
+#endif
+
+/* Define to 1 if strtold conforms to C99. */
+#ifdef __GNUC__
+#define HAVE_C99_STRTOLD 1
+#else
+#undef HAVE_C99_STRTOLD
+#endif
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#define HAVE_DECL_GETENV 1
+
+/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you
+   don't. */
+#undef HAVE_DECL_LOCALTIME_R
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define if you have the 'wchar_t' type. */
+#define HAVE_WCHAR_T 1
+
+/* Name of package */
+#define PACKAGE "emacs"
+
+/* FIXME: This is defined by the various makefile.w32-in files for
+   now.  Revisit if/when VERSION from config.h is used by any
+   Makefile.in files.  */
+#if 0
+/* Version number of package */
+#define VERSION "24.0.50"
+#endif
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define as a marker that can be attached to declarations that might not
+    be used.  This helps to reduce warnings, such as from
+    GCC -Wunused-parameter.  */
+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+#else
+# define _GL_UNUSED
+#endif
+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
+   is a misnomer outside of parameter lists.  */
+#define _UNUSED_PARAMETER_ _GL_UNUSED
+
+/* End of gnulib-related stuff.  */
+
 /* If using GNU, then support inline function declarations. */
 #ifdef __GNUC__
 #define INLINE __inline__
@@ -344,11 +404,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define RE_TRANSLATE_P(TBL) (XFASTINT (TBL) != 0)
 #endif
 
-/* Avoid link-time collision with system mktime if we will use our own.  */
-#if ! HAVE_MKTIME || BROKEN_MKTIME
-#define mktime emacs_mktime
-#endif
-
 #define my_strftime nstrftime   /* for strftime.c */
 
 #ifndef WINDOWSNT
diff --git a/nt/configure.bat b/nt/configure.bat
index a2ec2ca700f..1450650304d 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -679,6 +679,7 @@ if exist config.tmp del config.tmp
 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile

 if exist ..\admin\unidata copy /b config.settings+%MAKECMD%.defs+..\admin\unidata\makefile.w32-in ..\admin\unidata\makefile

 copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile

+copy /b config.settings+%MAKECMD%.defs+..\lib\makefile.w32-in ..\lib\makefile

 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile

 copy /b config.settings+%MAKECMD%.defs+..\doc\emacs\makefile.w32-in ..\doc\emacs\makefile

 copy /b config.settings+%MAKECMD%.defs+..\doc\misc\makefile.w32-in ..\doc\misc\makefile

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 5ad398fd725..0ce8a5a052e 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -92,6 +92,8 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
 all:	which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)

 

 all-other-dirs-nmake: addsection

+	cd ..\lib

+	$(MAKE) $(MFLAGS) all

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) all

 	cd ..\src

@@ -103,6 +105,7 @@ all-other-dirs-nmake: addsection
 	cd ..\nt

 

 all-other-dirs-gmake: addsection

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all

@@ -158,6 +161,8 @@ bootstrap-nmake: addsection cmdproxy
 	$(MAKE) $(MFLAGS) clean

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) clean

+	cd ..\lib

+	$(MAKE) $(MFLAGS) clean

 	cd ..\src

 	$(MAKE) $(MFLAGS) bootstrap

 	$(MAKE) $(MFLAGS) bootstrap-clean

@@ -173,6 +178,7 @@ bootstrap-gmake: addsection cmdproxy
 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

 	$(CP) $(BLD)/cmdproxy.exe ../bin

@@ -184,11 +190,14 @@ bootstrap-clean: bootstrap-clean-$(MAKETYPE)
 bootstrap-clean-nmake:

 	cd ..\src

 	$(MAKE) $(MFLAGS) bootstrap-clean

+	cd ..\lib

+	$(MAKE) $(MFLAGS) clean

 	cd ..\lisp

 	$(MAKE) $(MFLAGS) bootstrap-clean

 

 bootstrap-clean-gmake:

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

 

 $(INSTALL_DIR):

@@ -297,6 +306,8 @@ clean:	clean-other-dirs-$(MAKETYPE)
 	- $(DEL) ../etc/DOC ../etc/DOC-X

 

 clean-other-dirs-nmake:

+	cd ..\lib

+	$(MAKE) $(MFLAGS) clean

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) clean

 	cd ..\src

@@ -314,6 +325,7 @@ clean-other-dirs-nmake:
 	cd ..\nt

 

 clean-other-dirs-gmake:

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean

@@ -323,6 +335,8 @@ clean-other-dirs-gmake:
 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean

 

 cleanall-other-dirs-nmake:

+	cd ..\lib

+	$(MAKE) $(MFLAGS) cleanall

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) cleanall

 	cd ..\src

@@ -330,6 +344,7 @@ cleanall-other-dirs-nmake:
 	cd ..\nt

 

 cleanall-other-dirs-gmake:

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib cleanall

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall

 

@@ -355,6 +370,8 @@ top-distclean:
 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean

 

 distclean-other-dirs-nmake:

+	cd ..\lib

+	$(MAKE) $(MFLAGS) distclean

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) distclean

 	cd ..\src

@@ -374,6 +391,7 @@ distclean-other-dirs-nmake:
 	cd ..\nt

 

 distclean-other-dirs-gmake:

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean

@@ -386,6 +404,8 @@ distclean-other-dirs-gmake:
 maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean

 

 maintainer-clean-other-dirs-nmake:

+	cd ..\lib

+	$(MAKE) $(MFLAGS) maintainer-clean

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) maintainer-clean

 	cd ..\src

@@ -405,6 +425,7 @@ maintainer-clean-other-dirs-nmake:
 	cd ..\nt

 

 maintainer-clean-other-dirs-gmake:

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean

 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean

@@ -424,6 +445,7 @@ TAGS-gmake: frc
 	../lib-src/$(BLD)/etags $(CURDIR)/*.c

 	$(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP

 	$(MAKE) $(MFLAGS) -C ../lib-src TAGS

+	$(MAKE) $(MFLAGS) -C ../lib TAGS

 

 TAGS-nmake:

 	echo This target is not supported with NMake