add the new m4s

[chaz/openbox] / m4 / openbox.m4

diff --git a/m4/openbox.m4 b/m4/openbox.m4
index fb75eccd2efba1d2976635d7ec2e4699fa924fae..7c19ab4b1bfb0333eb3101a4fbc4e64238092c00 100644 (file)
--- a/m4/openbox.m4
+++ b/m4/openbox.m4
@@ -7,10 +7,6 @@ AC_DEFUN([OB_DEBUG],
 [
     AC_MSG_CHECKING([build type])
 
-    AC_ARG_ENABLE([debug],
-    [  --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"])
@@ -18,11 +14,20 @@ AC_DEFUN([OB_DEBUG],
        CFLAGS="$CFLAGS -ansi -pedantic -D_XOPEN_SOURCE"
     fi
 
-  # cvs builds are always debug
+    AC_ARG_ENABLE([debug],
+    [  --enable-debug          build a debug version default=no],
+    [DEBUG=$enableval], [DEBUG="no"])
+
+    # these special builds are always debug
     CVS=""
-    test "${PACKAGE_VERSION%*cvs}" != "$PACKAGE_VERSION" && CVS="yes"
+    test "${PACKAGE_VERSION%*cvs*}" != "$PACKAGE_VERSION" && CVS="yes"
     test "$CVS" = "yes" && DEBUG="yes"
 
+    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
@@ -31,6 +36,9 @@ AC_DEFUN([OB_DEBUG],
     if test "$CVS" = "yes"; then
        MSG="$MSG (CVS build)"
     fi
+    if test "$TEST" = "yes"; then
+       MSG="$MSG (test release)"
+    fi
     if test "$STRICT" = "yes"; then
        MSG="$MSG with strict ANSI compliance"
     fi
@@ -38,8 +46,6 @@ AC_DEFUN([OB_DEBUG],
     
     test "$DEBUG" = "yes" && \
        AC_DEFINE([DEBUG], [1], [Creating a debug build])
-
-    AM_CONDITIONAL(CVS, test "$CVS" = "yes")
 ])
 
 
@@ -82,7 +88,7 @@ AC_DEFUN([OB_NLS],
     [NLS=$enableval], [NLS="yes"])
 
     if test "$NLS" = yes; then
-       CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
+       DEFS="$DEFS -DENABLE_NLS"
     fi
 ])