nt/config.nt: Sync with autogen/config.in.

(HAVE_NTGUI): New macro.

src/makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI,
it's now in nt/config.nt.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e7159d5e9a3..1bf35dfcc85 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-10-08  Juanma Barranquero  <lekktu@gmail.com>
 
+        * makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI, it's now
+        in nt/config.nt.
+
         * w32term.c: Remove leftover declaration of keyboard_codepage.
 
 2012-10-08  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 66127d5ba6a..8e0e1d23dfd 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -27,7 +27,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp
 # Size in MBs of the static heap in temacs.exe.
 HEAPSIZE = $(EMACS_HEAPSIZE)
 
-LOCAL_FLAGS     = -Demacs=1 -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
+LOCAL_FLAGS     = -Demacs=1 -I../lib -I../nt/inc $(EMACS_EXTRA_C_FLAGS)
 
 SRC             = .
 EMACS           = $(BLD)/emacs.exe