* configure.bat: New option --enable-checking.

* gmake.defs, nmake.defs (CHECKING_CFLAGS): New define.
  (CFLAGS): Include it.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6e6ed00..0d10a81 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-18  Juanma Barranquero  <lekktu@gmail.com>
+
+       * configure.bat: New option --enable-checking.
+       * gmake.defs, nmake.defs (CHECKING_CFLAGS): New define.
+       (CFLAGS): Include it.
+
 2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * config.nt (volatile): Remove definition.

diff --git a/nt/configure.bat b/nt/configure.bat
index 7317416..705d4e9 100755 (executable)
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -80,6 +80,7 @@ rem   Default settings.
 set prefix=\r
 set nodebug=N\r
 set noopt=N\r
+set enablechecking=N\r
 set profile=N\r
 set nocygwin=N\r
 set COMPILER=\r
@@ -100,6 +101,7 @@ if "%1" == "--with-gcc" goto withgcc
 if "%1" == "--with-msvc" goto withmsvc\r
 if "%1" == "--no-debug" goto nodebug\r
 if "%1" == "--no-opt" goto noopt\r
+if "%1" == "--enable-checking" goto enablechecking\r
 if "%1" == "--profile" goto profile\r
 if "%1" == "--no-cygwin" goto nocygwin\r
 if "%1" == "--cflags" goto usercflags\r
@@ -119,6 +121,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.   --profile               enable profiling\r
 echo.   --no-cygwin             use -mno-cygwin option with GCC\r
 echo.   --cflags FLAG           pass FLAG to compiler\r
@@ -157,6 +160,11 @@ set noopt=Y
 shift\r
 goto again\r
 rem ----------------------------------------------------------------------\r
+:enablechecking\r
+set enablechecking=Y\r
+shift\r
+goto again\r
+rem ----------------------------------------------------------------------\r
 :profile\r
 set profile=Y\r
 shift\r
@@ -529,6 +537,7 @@ if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings
 if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo%>>config.settings\r
 if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings\r
 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings\r
+if (%enablechecking%) == (Y) echo ENABLECHECKS=1 >>config.settings\r
 if (%profile%) == (Y) echo PROFILE=1 >>config.settings\r
 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings\r
 if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings\r
@@ -660,6 +669,7 @@ set $foo$=
 set prefix=\r
 set nodebug=\r
 set noopt=\r
+set enablechecking=\r
 set profile=\r
 set nocygwin=\r
 set COMPILER=\r

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 7b2aba4..f552113 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -198,7 +198,14 @@ DEBUG_CFLAGS       = -DEMACSDEBUG
 else
 DEBUG_CFLAGS   =
 endif
-CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+
+ifdef ENABLECHECKS
+CHECKING_CFLAGS        = -DENABLE_CHECKING -DXASSERTS
+else
+CHECKING_CFLAGS        =
+endif
+
+CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(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 c065ee6..412b014 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -136,8 +136,15 @@ DEBUG_CFLAGS       = -DEMACSDEBUG
 !else\r
 DEBUG_CFLAGS   =\r
 !endif\r
+\r
+!ifdef ENABLECHECKS\r
+CHECKING_CFLAGS        = -DENABLE_CHECKING -DXASSERTS\r
+!else\r
+CHECKING_CFLAGS        =\r
+!endif\r
+\r
 CFLAGS          = -I. $(ARCH_CFLAGS) \\r
-                 $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
+                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
 EMACS_EXTRA_C_FLAGS =\r
 \r
 SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r