glib can't handle -Wcast-qual

[mikachu/openbox.git] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 18e2717..86d3e0b 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -10,14 +10,23 @@ AC_DEFUN([OB_DEBUG],
     AC_ARG_ENABLE([strict-ansi],
     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],
     AC_HELP_STRING([--enable-debug],[build a debug version [[default=no]]]),
     [DEBUG=$enableval], [DEBUG="no"])
 
+    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"
@@ -52,6 +61,7 @@ AC_DEFUN([OB_COMPILER_FLAGS],
     AC_REQUIRE([AC_PROG_CC])
 
     FLAGS=""
+    L=""
 
     if test "$DEBUG" = "yes"; then
         FLAGS="-DDEBUG"
@@ -66,18 +76,27 @@ AC_DEFUN([OB_COMPILER_FLAGS],
        if test "$DEBUG" = "yes"; then
            FLAGS="$FLAGS -O0 -ggdb -fno-inline -Wwrite-strings"
            FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
-           FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
+           FLAGS="$FLAGS -Wbad-function-cast -Wpointer-arith"
+           # glib can't handle this flag
+           # -Wcast-qual
             # for Python.h
            #FLAGS="$FLAGS -Wno-long-long"
        fi
        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],