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.

3 files changed, 17 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 340ca37aae4..7f19b02ef38 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h (HAVE_MKTIME): Remove.
+
+        * 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 `"'.
+
 2011-01-29  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsselect.m (ns_string_from_pasteboard): Get length of string
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 549acf8f6b3..ad21419ca7f 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -28,7 +28,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
 #
-LOCAL_FLAGS     = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
+LOCAL_FLAGS     = -Demacs=1 -DHAVE_CONFIG_H -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
 
 SRC             = .
 EMACS           = $(BLD)/emacs.exe
@@ -40,6 +40,7 @@ TLIB2           = $(BLD)/temacs2.$(A)
 TOBJ            = $(BLD)/firstfile.$(O)
 TRES            = $(BLD)/emacs.res
 TLASTLIB        = $(BLD)/lastfile.$(A)
+GNULIB          = ../lib/$(BLD)/libgnu.$(A)
 
 DOC             = $(OBJDIR)/etc/DOC-X
 
@@ -140,6 +141,7 @@ LIBS =  $(TLIB0)	\
         $(TLIB1)        \
         $(TLIB2)        \
         $(TLASTLIB)     \
+        $(GNULIB)       \
         $(WINMM)        \
         $(ADVAPI32)     \
         $(GDI32)        \
@@ -174,7 +176,7 @@ $(EMACS):       $(DOC) $(TEMACS)
 #
 temacs:         stamp_BLD $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
-                  ../nt/$(BLD)/addsection.exe
+                  ../nt/$(BLD)/addsection.exe $(GNULIB)
         $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
         "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
 
@@ -192,6 +194,9 @@ make-buildobj-CMD:
         echo $(OBJ2)            \>> buildobj.h
         echo ^">> buildobj.h
 
+# "
+# The above line is here to countermand the single quote
+# on the last "echo" command above, wrt font-lock.
 make-buildobj-SH:
         echo '#define BUILDOBJ $(DQUOTE)\'  > buildobj.h
         echo $(OBJ0)                   '\' >> buildobj.h
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index e9a580629af..d247cf866f9 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -150,7 +150,6 @@ struct sigaction {
 #undef  HAVE_SETSID
 #undef  HAVE_FPATHCONF
 #define HAVE_SELECT 1
-#define HAVE_MKTIME 1
 #undef  HAVE_EUIDACCESS
 #define HAVE_GETPAGESIZE 1
 #define HAVE_TZSET 1