X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fopenbox.m4;h=f4ef76fa9048d01a2a2506e1732af41b8b0919a0;hb=fcfda5345e6eafaaeda4c4229d8693202cc042ac;hp=3c6cd1f041880c3128b54e252ad2a455a6097282;hpb=02601c2856c604786acca84e3aef176baadc5c61;p=chaz%2Fopenbox

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 3c6cd1f0..f4ef76fa 100644
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -10,12 +10,17 @@ AC_DEFUN([OB_DEBUG],
   AC_ARG_ENABLE([debug],
   [  --enable-debug          build a debug version default=no],
   [DEBUG=$enableval],[])
+
+  # cvs builds are always debug
+  test "${VERSION%*cvs}" != "$VERSION" && DEBUG="yes"
+  
   if test "$DEBUG" = "yes"; then
-    AC_MSG_RESULT([debug])
+    AC_MSG_RESULT([DEBUG])
     AC_DEFINE([DEBUG], [1], [Creating a debug build])
   else
-    AC_MSG_RESULT([release])
-    AC_DEFINE([NDEBUG], [1], [Creating a release build])
+    AC_MSG_RESULT([RELEASE])
+# keep the asserts in
+#    AC_DEFINE([NDEBUG], [1], [Creating a release build])
   fi
 ])
 
@@ -36,7 +41,7 @@ AC_DEFUN([OB_COMPILER_FLAGS],
   AC_MSG_CHECKING([for GNU C++])
   if test "$GXX" = "yes"; then
     AC_MSG_RESULT([yes])
-    FLAGS="-Wall -W"
+    FLAGS="-Wall -W -fno-check-new -fno-exceptions"
     # -pedantic
     test "$DEBUG" = "yes" && FLAGS="$FLAGS -g -fno-inline"
   else