mesa: Have configure define NDEBUG, not mtypes.h.

mtypes.h had been defining NDEBUG (used by assert) if DEBUG was not
defined. Confusing and bizarre that you don't get NDEBUG if you don't
include mtypes.h.

... which is just what happened in commit bef38f62e.

Let's let configure define this for us if not using --enable-debug.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/configure.ac b/configure.ac
index beb7a7d1cfdde32fd59f0c42704121f50ba0f430..5fbb7bc31dae3f18e52abf74eac30328a8a69427 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,8 @@ if test "x$enable_debug" = xyes; then
             CXXFLAGS="$CXXFLAGS -O0"
         fi
     fi
+else
+   DEFINES="$DEFINES -DNDEBUG"
 fi
 
 dnl

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 05b5a8120e1b76d4377d8a5c8ac8bc6dbb618a8a..6e997730999778188ede32cef1df5b9bfde9847c 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4512,9 +4512,6 @@ extern int MESA_DEBUG_FLAGS;
 # define MESA_VERBOSE 0
 # define MESA_DEBUG_FLAGS 0
 # define MESA_FUNCTION "a function"
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
 #endif