just some fixes to the autoconf stuff

[chaz/openbox] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 319ed7b4906044ab7873fadd07e6062651dac60f..dcc5927a25eee7268afd50daeb98fef3be072d4f 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -8,14 +8,14 @@ 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
@@ -25,9 +25,6 @@ AC_DEFUN([OB_DEBUG],
 
     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"
 
@@ -64,12 +61,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 -g -fno-inline"
            FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
            FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
             # for Python.h
@@ -87,7 +90,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