* 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).

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 135326ee585f30b6f279fc461216049ea2e3c640..900456323337bf4ad6782250ac69460f8ad9808f 100644 (file)
--- 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 cecf52ee9276bed50b99ec883b73e0ce134cb620..e91165de473304bc6de0b2e7b6da711f67ad4dd9 100755 (executable)
--- 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\r
 echo.   --no-debug              exclude debug info from executables\r
 echo.   --no-opt                disable optimization\r
-echo.   --enable-checking       enable checks and assertions\r
+echo.   --enable-checking       enable additional run-time checks\r
 echo.   --profile               enable profiling\r
 echo.   --no-cygwin             use -mno-cygwin option with GCC\r
 echo.   --cflags FLAG           pass FLAG to compiler\r
@@ -769,7 +769,6 @@ if not "(%mf%)" == "()" >>config.settings echo MCPU_FLAG=%mf%
 if not "(%dbginfo%)" == "()" >>config.settings echo DEBUG_INFO=%dbginfo%\r
 if (%nodebug%) == (Y) >>config.settings echo NODEBUG=1\r
 if (%noopt%) == (Y) >>config.settings echo NOOPT=1\r
-if (%enablechecking%) == (Y) >>config.settings echo ENABLECHECKS=1\r
 if (%profile%) == (Y) >>config.settings echo PROFILE=1\r
 if (%nocygwin%) == (Y) >>config.settings echo NOCYGWIN=1\r
 if not "(%prefix%)" == "()" >>config.settings echo INSTALL_DIR=%prefix%\r
@@ -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\r
 if (%doldflags%) == (Y) echo #define USER_LDFLAGS " %escuserldflags%" >>config.tmp\r
 if (%profile%) == (Y) echo #define PROFILING 1 >>config.tmp\r
+if (%enablechecking%) == (Y) echo #define ENABLE_CHECKING 1 >>config.tmp\r
 if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp\r
 if not "(%HAVE_GNUTLS%)" == "()" echo #define HAVE_GNUTLS 1 >>config.tmp\r
 if not "(%HAVE_LIBXML2%)" == "()" echo #define HAVE_LIBXML2 1 >>config.tmp\r

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 223b0fec6f9091f675e803d0668aade41ac2f681..0b29c73e741c37155be97db4abfcf3b3e3a9941a 100644 (file)
--- 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 086b28cbd0f15601b583f19913b0ad06cceeaa75..ec6f5102f4c2fd50f422eef7f1b197c09ca4854a 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -145,18 +145,12 @@ DEBUG_CFLAGS      = -DEMACSDEBUG
 DEBUG_CFLAGS   =\r
 !endif\r
 \r
-!ifdef ENABLECHECKS\r
-CHECKING_CFLAGS        = -DENABLE_CHECKING\r
-!else\r
-CHECKING_CFLAGS        =\r
-!endif\r
-\r
 MWINDOWS        = -subsystem:windows -entry:mainCRTStartup\r
 \r
 CFLAGS          = -I. $(ARCH_CFLAGS) \\r
-                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
+                 $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \\r
-                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)\r
+                 $(DEBUG_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)\r
 \r
 #SYS_LDFLAGS   = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
 !ifdef NOOPT\r