X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fopenbox.m4;h=645301fd85e98d926fd628cb07802ec38d84a329;hb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;hp=6c56f768a53089fb9fe8add5ce3e86238ee042f1;hpb=8c0857543316c922394ba96768099e2b60aba126;p=chaz%2Fopenbox

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 6c56f768..645301fd 100644
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -12,14 +12,21 @@ AC_DEFUN([OB_DEBUG],
   [DEBUG=$enableval],[])
 
   # cvs builds are always debug
-  test "${VERSION%*cvs}" != "$VERSION" && DEBUG="yes"
-  
+  CVS=""
+  test "${VERSION%*cvs}" != "$VERSION" && CVS="yes"
+  test "$CVS" = "yes" && DEBUG="yes"
+
   if test "$DEBUG" = "yes"; then
-    AC_MSG_RESULT([debug])
+    if test "$CVS" = "yes"; then
+      AC_MSG_RESULT([DEBUG (CVS build)])
+    else
+      AC_MSG_RESULT([DEBUG])
+    fi
     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
 ])
 
@@ -40,7 +47,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