From 0566bc954097aae81a0efda950c4567be3139c23 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 4 Jul 2012 19:17:19 +0200
Subject: [PATCH] * nt/configure.bat (enablechecking): Enable checks through
 src/config.h.

* nt/gmake.defs (DEBUG_CFLAGS): Add -fno-crossjumping.
(CHECKING_CFLAGS): Remove.
(CFLAGS, ESC_CFLAGS): Do not include $(CHECKING_CFLAGS).

* nt/nmake.defs (CHECKING_CFLAGS): Remove.
(CFLAGS, ESC_CFLAGS): Do not include $(CHECKING_CFLAGS).
---
 nt/ChangeLog     | 13 +++++++++++++
 nt/configure.bat |  4 ++--
 nt/gmake.defs    | 12 +++---------
 nt/nmake.defs    | 10 ++--------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 135326ee585..90045632333 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-04  Juanma Barranquero	<lekktu@gmail.com>
+	    Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.bat (enablechecking): Enable checks through src/config.h,
+	not the compiler's command line.
+
+	* nmake.defs (CHECKING_CFLAGS): Remove.
+	(CFLAGS, ESC_CFLAGS): Do not include $(CHECKING_CFLAGS).
+
+	* gmake.defs (DEBUG_CFLAGS): Add -fno-crossjumping.
+	(CHECKING_CFLAGS): Remove.
+	(CFLAGS, ESC_CFLAGS): Do not include $(CHECKING_CFLAGS).
+
 2012-07-04  Juanma Barranquero  <lekktu@gmail.com>
 
 	* config.nt (LISP_FLOAT_TYPE, HAVE_XFREE386, USE_TEXT_PROPERTIES)
diff --git a/nt/configure.bat b/nt/configure.bat
index cecf52ee927..e91165de473 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -145,7 +145,7 @@ echo.   --with-gcc              use GCC to compile Emacs
 echo.   --with-msvc             use MSVC to compile Emacs
 echo.   --no-debug              exclude debug info from executables
 echo.   --no-opt                disable optimization
-echo.   --enable-checking       enable checks and assertions
+echo.   --enable-checking       enable additional run-time checks
 echo.   --profile               enable profiling
 echo.   --no-cygwin             use -mno-cygwin option with GCC
 echo.   --cflags FLAG           pass FLAG to compiler
@@ -769,7 +769,6 @@ if not "(%mf%)" == "()" >>config.settings echo MCPU_FLAG=%mf%
 if not "(%dbginfo%)" == "()" >>config.settings echo DEBUG_INFO=%dbginfo%
 if (%nodebug%) == (Y) >>config.settings echo NODEBUG=1
 if (%noopt%) == (Y) >>config.settings echo NOOPT=1
-if (%enablechecking%) == (Y) >>config.settings echo ENABLECHECKS=1
 if (%profile%) == (Y) >>config.settings echo PROFILE=1
 if (%nocygwin%) == (Y) >>config.settings echo NOCYGWIN=1
 if not "(%prefix%)" == "()" >>config.settings echo INSTALL_DIR=%prefix%
@@ -794,6 +793,7 @@ rem   processing of compiler options in w32.c:get_emacs_configuration_options
 if (%docflags%) == (Y) echo #define USER_CFLAGS " %escusercflags%" >>config.tmp
 if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%" >>config.tmp
 if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp
+if (%enablechecking%) == (Y) echo #define ENABLE_CHECKING 1 >>config.tmp
 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp
 if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp
 if not "(%HAVE_LIBXML2%)" == "()" echo #define HAVE_LIBXML2 1 >>config.tmp
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 223b0fec6f9..0b29c73e741 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -199,21 +199,15 @@ OBJ1_c		= $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
 OBJ2_c		= $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2))
 
 ifdef NOOPT
-DEBUG_CFLAGS	= -DEMACSDEBUG
+DEBUG_CFLAGS	= -DEMACSDEBUG -fno-crossjumping
 else
 DEBUG_CFLAGS	=
 endif
 
-ifdef ENABLECHECKS
-CHECKING_CFLAGS	= -DENABLE_CHECKING -fno-crossjumping
-else
-CHECKING_CFLAGS	=
-endif
-
 MWINDOWS        = -mwindows
 
-CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
-ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
+CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
 
 ifdef PROFILE
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 086b28cbd0f..ec6f5102f4c 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -145,18 +145,12 @@ DEBUG_CFLAGS	= -DEMACSDEBUG
 DEBUG_CFLAGS	=
 !endif
 
-!ifdef ENABLECHECKS
-CHECKING_CFLAGS	= -DENABLE_CHECKING
-!else
-CHECKING_CFLAGS	=
-!endif
-
 MWINDOWS        = -subsystem:windows -entry:mainCRTStartup
 
 CFLAGS          = -I. $(ARCH_CFLAGS) \
-		  $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+		  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \
-		  $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
+		  $(DEBUG_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
 
 #SYS_LDFLAGS	= -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
 !ifdef NOOPT
-- 
2.39.2