X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fopenbox.m4;h=29114360f3608e2433bf16797a9b054a302e497f;hb=232817b395ca19dd26af78a629a9e2f601953e6a;hp=319ed7b4906044ab7873fadd07e6062651dac60f;hpb=e6255a026420d69cf01726f1720e3222965b0860;p=chaz%2Fopenbox

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 319ed7b4..29114360 100644
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -8,26 +8,18 @@ AC_DEFUN([OB_DEBUG],
     AC_MSG_CHECKING([build type])
 
     AC_ARG_ENABLE([strict-ansi],
-    [  --enable-strict-ansi    Enable strict ANSI compliance build default=no],
+    AC_HELP_STRING([--enable-strict-ansi],[Enable strict ANSI compliance build [[default=no]]]),
     [STRICT=$enableval], [STRICT="no"])
     if test "$GCC" = "yes" && test "$STRICT" = "yes"; then
 	CFLAGS="$CFLAGS -ansi -pedantic -D_XOPEN_SOURCE"
     fi
 
     AC_ARG_ENABLE([debug],
-    [  --enable-debug          build a debug version default=no],
+    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 "$TEST" = "yes" && DEBUG="yes"
-
-    TEST=""
     test "${PACKAGE_VERSION%*beta*}" != "$PACKAGE_VERSION" && TEST="yes"
     test "$TEST" = "yes" && DEBUG="yes"
 
@@ -36,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
@@ -64,12 +53,18 @@ AC_DEFUN([OB_COMPILER_FLAGS],
 
     FLAGS=""
 
+    if test "$DEBUG" = "yes"; then
+        FLAGS="-DDEBUG"
+    else
+        FLAGS="-DNDEBUG -DG_DISABLE_ASSERT"
+    fi
+
     # Check what compiler we are using
     AC_MSG_CHECKING([for GNU CC])
     if test "$GCC" = "yes"; then
 	AC_MSG_RESULT([yes])
 	if test "$DEBUG" = "yes"; then
-	    FLAGS="-g -fno-inline"
+	    FLAGS="$FLAGS -O0 -g3 -fno-inline -Wwrite-strings"
 	    FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
 	    FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
             # for Python.h
@@ -78,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])
@@ -87,7 +83,7 @@ AC_DEFUN([OB_COMPILER_FLAGS],
 AC_DEFUN([OB_NLS],
 [
     AC_ARG_ENABLE([nls],
-    [  --enable-nls            Enable NLS translations  default=yes],
+    AC_HELP_STRING([--enable-nls],[Enable NLS translations [[default=yes]]]),
     [NLS=$enableval], [NLS="yes"])
 
     if test "$NLS" = yes; then