X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fopenbox.m4;h=18e271788a1d969da9d7ce5380a7a33c66a4df10;hb=20b8fcfa33feeade5946bc7f3046705da5d164fe;hp=84044f36005809be0e4e4a8a40f850a27ff5c907;hpb=86f1830d0ab76b07999ed35e29a32d405ee22ac4;p=chaz%2Fopenbox

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 84044f36..18e27178 100644
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -7,29 +7,29 @@ AC_DEFUN([OB_DEBUG],
 [
     AC_MSG_CHECKING([build type])
 
-    AC_ARG_ENABLE([debug],
-    [  --enable-debug          build a debug version default=yes],
-    [DEBUG=$enableval], [DEBUG="yes"])
-
     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
 
-  # cvs builds are always debug
-    CVS=""
-    test "${PACKAGE_VERSION%*cvs}" != "$PACKAGE_VERSION" && CVS="yes"
-    test "$CVS" = "yes" && DEBUG="yes"
+    AC_ARG_ENABLE([debug],
+    AC_HELP_STRING([--enable-debug],[build a debug version [[default=no]]]),
+    [DEBUG=$enableval], [DEBUG="no"])
+
+    TEST=""
+    test "${PACKAGE_VERSION%*alpha*}" != "$PACKAGE_VERSION" && TEST="yes"
+    test "${PACKAGE_VERSION%*beta*}" != "$PACKAGE_VERSION" && TEST="yes"
+    test "$TEST" = "yes" && DEBUG="yes"
 
     if test "$DEBUG" = "yes"; then
 	MSG="DEBUG"
     else
 	MSG="RELEASE"
     fi
-    if test "$CVS" = "yes"; then
-	MSG="$MSG (CVS build)"
+    if test "$TEST" = "yes"; then
+	MSG="$MSG (test release)"
     fi
     if test "$STRICT" = "yes"; then
 	MSG="$MSG with strict ANSI compliance"
@@ -53,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 -ggdb -fno-inline -Wwrite-strings"
 	    FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
 	    FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
             # for Python.h
@@ -67,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])
@@ -76,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