merge the C branch into HEAD

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

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index 645301f..aef6828 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -2,6 +2,7 @@
 #
 # Check if the user has requested a debug build.
 # Sets the DEBUG or NDEBUG variables as appropriate
+# Sets the CVS environment variable when building CVS sources.
 AC_DEFUN([OB_DEBUG],
 [
   DEBUG="no"
@@ -28,47 +29,55 @@ AC_DEFUN([OB_DEBUG],
 # keep the asserts in
 #    AC_DEFINE([NDEBUG], [1], [Creating a release build])
   fi
+
+  AM_CONDITIONAL(CVS, test "$CVS" = "yes")
 ])
 
 
 # OB_COMPILER_FLAGS()
 #
 # Check what compiler is being used for compilation.
-# It sets the CXXFLAGS variable appropriately for the compiler, including flags
+# It sets the CFLAGS variable appropriately for the compiler, including flags
 # for debug builds.
 AC_DEFUN([OB_COMPILER_FLAGS],
 [
-  AC_REQUIRE([AC_PROG_CXXCPP])
-  AC_REQUIRE([AC_PROG_CXX])
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_CC])
 
   FLAGS=""
 
   # Check what compiler we are using
-  AC_MSG_CHECKING([for GNU C++])
-  if test "$GXX" = "yes"; then
+  AC_MSG_CHECKING([for GNU CC])
+  if test "$GCC" = "yes"; then
     AC_MSG_RESULT([yes])
-    FLAGS="-Wall -W -fno-check-new -fno-exceptions"
-    # -pedantic
-    test "$DEBUG" = "yes" && FLAGS="$FLAGS -g -fno-inline"
-  else
-    AC_MSG_RESULT([no, trying other compilers])
-    AC_MSG_CHECKING(for MIPSpro)
-    mips_pro_ver=`$CXX -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
-    if test -z "$mips_pro_ver"; then
-      AC_MSG_RESULT([no])
+    if test "$DEBUG" = "yes"; then
+      FLAGS="-g -fno-inline"
+      FLAGS="$FLAGS -Wall -Wsign-compare -Waggregate-return"
+      FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
+      # for Python.h
+      FLAGS="$FLAGS -Wno-long-long"
     else
-      AC_MSG_RESULT([yes, version $mips_pro_ver.])
-      AC_MSG_CHECKING(for -LANG:std in CXXFLAGS)
-      lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
-      if test "x$lang_std_not_set" = "x"; then
-        AC_MSG_RESULT([not set, setting.])
-        FLAGS="-LANG:std"
-      else
-        AC_MSG_RESULT([already set.])
-      fi
+      FLAGS=""
     fi
+#  else
+#    AC_MSG_RESULT([no, trying other compilers])
+#    AC_MSG_CHECKING(for MIPSpro)
+#    mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
+#    if test -z "$mips_pro_ver"; then
+#      AC_MSG_RESULT([no])
+#    else
+#      AC_MSG_RESULT([yes, version $mips_pro_ver.])
+#      AC_MSG_CHECKING(for -LANG:std in CFLAGS)
+#      lang_std_not_set=`echo $CFLAGS | grep "\-LANG:std"`
+#      if test "x$lang_std_not_set" = "x"; then
+#        AC_MSG_RESULT([not set, setting.])
+#        FLAGS="-LANG:std"
+#      else
+#        AC_MSG_RESULT([already set.])
+#      fi
+#    fi
   fi
   AC_MSG_CHECKING([for compiler specific flags])
   AC_MSG_RESULT([$FLAGS])
-  CXXFLAGS="$CXXFLAGS $FLAGS"
+  CFLAGS="$CFLAGS $FLAGS"
 ])