add strict ansi compliance

1 files changed, 25 insertions, 32 deletions

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index aef68281..98033c9f 100644
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -5,12 +5,18 @@
 # Sets the CVS environment variable when building CVS sources.
 AC_DEFUN([OB_DEBUG],
 [
-  DEBUG="no"
-  AC_MSG_CHECKING([build target type])
+  AC_MSG_CHECKING([build type])
 
   AC_ARG_ENABLE([debug],
-  [  --enable-debug          build a debug version default=no],
-  [DEBUG=$enableval],[])
+  [  --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],
+  [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=""
@@ -18,17 +24,20 @@ AC_DEFUN([OB_DEBUG],
   test "$CVS" = "yes" && DEBUG="yes"
 
   if test "$DEBUG" = "yes"; then
-    if test "$CVS" = "yes"; then
-      AC_MSG_RESULT([DEBUG (CVS build)])
-    else
-      AC_MSG_RESULT([DEBUG])
-    fi
-    AC_DEFINE([DEBUG], [1], [Creating a debug build])
+    MSG="DEBUG"
   else
-    AC_MSG_RESULT([RELEASE])
-# keep the asserts in
-#    AC_DEFINE([NDEBUG], [1], [Creating a release build])
+    MSG="RELEASE"
   fi
+  if test "$CVS" = "yes"; then
+    MSG="$MSG (CVS build)"
+  fi
+  if test "$STRICT" = "yes"; then
+    MSG="$MSG with strict ANSI compliance"
+  fi
+  AC_MSG_RESULT([$MSG])
+  
+  test "$DEBUG" = "yes" && \
+      AC_DEFINE([DEBUG], [1], [Creating a debug build])
 
   AM_CONDITIONAL(CVS, test "$CVS" = "yes")
 ])
@@ -56,26 +65,10 @@ AC_DEFUN([OB_COMPILER_FLAGS],
       FLAGS="$FLAGS -Wcast-qual -Wbad-function-cast -Wpointer-arith"
       # for Python.h
       FLAGS="$FLAGS -Wno-long-long"
-    else
-      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
+    if test "$STRICT" = "yes"; then
+      FLAGS="$FLAGS -ansi -pedantic -D_XOPEN_SOURCE"
+    fi
   fi
   AC_MSG_CHECKING([for compiler specific flags])
   AC_MSG_RESULT([$FLAGS])