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.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index b0dcb99..e659b87 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-08  Juanma Barranquero  <lekktu@gmail.com>
+
+       * config.nt: Sync with autogen/config.in.
+       (HAVE_NTGUI): New macro.
+
 2012-10-02  Eli Zaretskii  <eliz@gnu.org>
 
        * preprep.c (RVA_TO_PTR): Cast the result to 'void *', to avoid

diff --git a/nt/config.nt b/nt/config.nt
index e342c78..cd695bc 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -701,6 +701,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Mac OS X. */
 #undef HAVE_NS
 
+/* Define to use native Windows GUI. */
+#define HAVE_NTGUI 1
+
 /* Define to 1 if libotf has OTF_get_variation_glyphs. */
 #undef HAVE_OTF_GET_VARIATION_GLYPHS
 

diff --git a/src/ChangeLog b/src/ChangeLog
index e7159d5..1bf35df 100644 (file)
--- 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 66127d5..8e0e1d2 100644 (file)
--- 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