Merge branch 'backport' into work

[chaz/openbox] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index dcc5927a25eee7268afd50daeb98fef3be072d4f..18e271788a1d969da9d7ce5380a7a33c66a4df10 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -18,11 +18,6 @@ AC_DEFUN([OB_DEBUG],
     AC_HELP_STRING([--enable-debug],[build a debug version [[default=no]]]),
     [DEBUG=$enableval], [DEBUG="no"])
 
-    # these special builds are always debug
-    CVS=""
-    test "${PACKAGE_VERSION%*cvs*}" != "$PACKAGE_VERSION" && CVS="yes"
-    test "$CVS" = "yes" && DEBUG="yes"
-
     TEST=""
     test "${PACKAGE_VERSION%*alpha*}" != "$PACKAGE_VERSION" && TEST="yes"
     test "${PACKAGE_VERSION%*beta*}" != "$PACKAGE_VERSION" && TEST="yes"
@@ -33,9 +28,6 @@ AC_DEFUN([OB_DEBUG],
     else
        MSG="RELEASE"
     fi
-    if test "$CVS" = "yes"; then
-       MSG="$MSG (CVS build)"
-    fi
     if test "$TEST" = "yes"; then
        MSG="$MSG (test release)"
     fi
@@ -72,7 +64,7 @@ AC_DEFUN([OB_COMPILER_FLAGS],
     if test "$GCC" = "yes"; then
        AC_MSG_RESULT([yes])
        if test "$DEBUG" = "yes"; then
-           FLAGS="$FLAGS -g -fno-inline"
+           FLAGS="$FLAGS -O0 -ggdb -fno-inline -Wwrite-strings"
            FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
            FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
             # for Python.h
@@ -81,6 +73,7 @@ AC_DEFUN([OB_COMPILER_FLAGS],
        if test "$STRICT" = "yes"; then
            FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE"
        fi
+       FLAGS="$FLAGS -fno-strict-aliasing"
     fi
     AC_MSG_CHECKING([for compiler specific flags])
     AC_MSG_RESULT([$FLAGS])