[Emacs-diffs] /srv/bzr/emacs/trunk r108871: * nt/configure.bat (enablechecking): Enable checks through src/config.h.

[Juanma Barranquero]

------------------------------------------------------------
revno: 108871
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-04 19:17:19 +0200
message:
  * 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).
modified:
  nt/ChangeLog
  nt/configure.bat
  nt/gmake.defs
  nt/nmake.defs

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-07-04 16:46:42 +0000
+++ b/nt/ChangeLog      2012-07-04 17:17:19 +0000
@@ -1,3 +1,16 @@
+2012-07-04  Juanma Barranquero <address@hidden>
+           Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * config.nt (LISP_FLOAT_TYPE, HAVE_XFREE386, USE_TEXT_PROPERTIES)

=== modified file 'nt/configure.bat'
--- a/nt/configure.bat  2012-05-31 06:06:42 +0000
+++ b/nt/configure.bat  2012-07-04 17:17:19 +0000
@@ -145,7 +145,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.   --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 "(%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 @@
 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

=== modified file 'nt/gmake.defs'
--- a/nt/gmake.defs     2012-06-28 09:06:11 +0000
+++ b/nt/gmake.defs     2012-07-04 17:17:19 +0000
@@ -199,21 +199,15 @@
 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

=== modified file 'nt/nmake.defs'
--- a/nt/nmake.defs     2012-06-28 09:06:11 +0000
+++ b/nt/nmake.defs     2012-07-04 17:17:19 +0000
@@ -145,18 +145,12 @@
 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