X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fopenbox.m4;h=645301fd85e98d926fd628cb07802ec38d84a329;hb=5af3950710c00891c4508100d59301a6903c7b79;hp=cd76bb634ab51ad4c74b73af80f823c57e69ffa6;hpb=be56b6d1620e61c2b9b655a9925f8b0ba1c3c3b8;p=chaz%2Fopenbox

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index cd76bb63..645301fd 100644
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -10,12 +10,23 @@ AC_DEFUN([OB_DEBUG],
   AC_ARG_ENABLE([debug],
   [  --enable-debug          build a debug version default=no],
   [DEBUG=$enableval],[])
+
+  # cvs builds are always debug
+  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
 ])
 
@@ -36,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
@@ -61,5 +72,3 @@ AC_DEFUN([OB_COMPILER_FLAGS],
   AC_MSG_RESULT([$FLAGS])
   CXXFLAGS="$CXXFLAGS $FLAGS"
 ])
-
-