[Emacs-diffs] /srv/bzr/emacs/trunk r100843: * configure.bat: New option --enable-checking.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100843
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-18 11:41:48 +0200
message:
  * configure.bat: New option --enable-checking.
  * gmake.defs, nmake.defs (CHECKING_CFLAGS): New define.
    (CFLAGS): Include it.
modified:
  nt/ChangeLog
  nt/configure.bat
  nt/gmake.defs
  nt/nmake.defs

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2010-07-12 18:16:54 +0000
+++ b/nt/ChangeLog      2010-07-18 09:41:48 +0000
@@ -1,3 +1,9 @@
+2010-07-18  Juanma Barranquero  <address@hidden>
+
+       * configure.bat: New option --enable-checking.
+       * gmake.defs, nmake.defs (CHECKING_CFLAGS): New define.
+       (CFLAGS): Include it.
+
 2010-07-12  Dan Nicolaescu  <address@hidden>
 
        * config.nt (volatile): Remove definition.

=== modified file 'nt/configure.bat'
--- a/nt/configure.bat  2010-01-13 08:35:10 +0000
+++ b/nt/configure.bat  2010-07-18 09:41:48 +0000
@@ -80,6 +80,7 @@
 set prefix=
 set nodebug=N
 set noopt=N
+set enablechecking=N
 set profile=N
 set nocygwin=N
 set COMPILER=
@@ -100,6 +101,7 @@
 if "%1" == "--with-msvc" goto withmsvc
 if "%1" == "--no-debug" goto nodebug
 if "%1" == "--no-opt" goto noopt
+if "%1" == "--enable-checking" goto enablechecking
 if "%1" == "--profile" goto profile
 if "%1" == "--no-cygwin" goto nocygwin
 if "%1" == "--cflags" goto usercflags
@@ -119,6 +121,7 @@
 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.   --profile               enable profiling
 echo.   --no-cygwin             use -mno-cygwin option with GCC
 echo.   --cflags FLAG           pass FLAG to compiler
@@ -157,6 +160,11 @@
 shift
 goto again
 rem ----------------------------------------------------------------------
+:enablechecking
+set enablechecking=Y
+shift
+goto again
+rem ----------------------------------------------------------------------
 :profile
 set profile=Y
 shift
@@ -529,6 +537,7 @@
 if not "(%dbginfo%)" == "()" echo DEBUG_INFO=%dbginfo%>>config.settings
 if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings
 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings
+if (%enablechecking%) == (Y) echo ENABLECHECKS=1 >>config.settings
 if (%profile%) == (Y) echo PROFILE=1 >>config.settings
 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
 if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings
@@ -660,6 +669,7 @@
 set prefix=
 set nodebug=
 set noopt=
+set enablechecking=
 set profile=
 set nocygwin=
 set COMPILER=

=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs     2010-01-13 08:35:10 +0000
+++ b/nt/gmake.defs     2010-07-18 09:41:48 +0000
@@ -198,7 +198,14 @@
 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

=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs     2010-01-13 08:35:10 +0000
+++ b/nt/nmake.defs     2010-07-18 09:41:48 +0000
@@ -136,8 +136,15 @@
 !else
 DEBUG_CFLAGS   =
 !endif
+
+!ifdef ENABLECHECKS
+CHECKING_CFLAGS        = -DENABLE_CHECKING -DXASSERTS
+!else
+CHECKING_CFLAGS        =
+!endif
+
 CFLAGS          = -I. $(ARCH_CFLAGS) \
-                 $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) 
$(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS =
 
 SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd 
-swaprun:net setargv.obj