Revert "make windows stay on screen when they..."

[dana/openbox.git] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 5598865..5a95e84 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -7,31 +7,38 @@ AC_DEFUN([OB_DEBUG],
 [
     AC_MSG_CHECKING([build type])
 
-    DEFAULTDEBUG="no"
-
-  # cvs builds are always debug
-    CVS=""
-    test "${PACKAGE_VERSION%*cvs}" != "$PACKAGE_VERSION" && CVS="yes"
-    test "$CVS" = "yes" && DEFAULTDEBUG="yes"
+    AC_ARG_ENABLE([strict-ansi],
+    AC_HELP_STRING([--enable-strict-ansi],[Enable strict ANSI compliance build [[default=no]]]),
+    [STRICT=$enableval], [STRICT="no"])
 
     AC_ARG_ENABLE([debug],
-    [  --enable-debug          build a debug version default=$DEFAULTDEBUG],
-    [DEBUG=$enableval], [DEBUG=$DEFAULTDEBUG])
+    AC_HELP_STRING([--enable-debug],[build a debug version [[default=no]]]),
+    [DEBUG=$enableval], [DEBUG="no"])
 
-    AC_ARG_ENABLE([strict-ansi],
-    [  --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"
+    AC_ARG_ENABLE([gprof],
+    AC_HELP_STRING([--enable-gprof],[Enable gprof profiling output [[default=no]]]),
+    [PROF=$enableval], [PROF="no"])
+
+    AC_ARG_ENABLE([gprof-libc],
+    AC_HELP_STRING([--enable-gprof-libc],[Link against libc with profiling support [[default=no]]]),
+    [PROFLC=$enableval], [PROFLC="no"])
+
+    if test "$PROFLC" = "yes"; then
+        PROF="yes" # always enable profiling then
     fi
 
+    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"
@@ -54,13 +61,20 @@ AC_DEFUN([OB_COMPILER_FLAGS],
     AC_REQUIRE([AC_PROG_CC])
 
     FLAGS=""
+    L=""
+
+    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
@@ -69,16 +83,24 @@ AC_DEFUN([OB_COMPILER_FLAGS],
        if test "$STRICT" = "yes"; then
            FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE"
        fi
+       if test "$PROF" = "yes"; then
+           FLAGS="$FLAGS -pg -fno-inline"
+       fi
+       if test "$PROFLC" = "yes"; then
+           L="$L -lc_p -lm_p"
+       fi
+       FLAGS="$FLAGS -fno-strict-aliasing"
     fi
     AC_MSG_CHECKING([for compiler specific flags])
     AC_MSG_RESULT([$FLAGS])
     CFLAGS="$CFLAGS $FLAGS"
+    LIBS="$LIBS $L"
 ])
 
 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