X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fopenbox.m4;h=319ed7b4906044ab7873fadd07e6062651dac60f;hb=e6255a026420d69cf01726f1720e3222965b0860;hp=55988650a03223f96810076469b59158e5f80f57;hpb=14cab4f9331570ae678096a0ed90f6ac17c56524;p=chaz%2Fopenbox diff --git a/m4/openbox.m4 b/m4/openbox.m4 index 55988650..319ed7b4 100644 --- a/m4/openbox.m4 +++ b/m4/openbox.m4 @@ -7,17 +7,6 @@ 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([debug], - [ --enable-debug build a debug version default=$DEFAULTDEBUG], - [DEBUG=$enableval], [DEBUG=$DEFAULTDEBUG]) - AC_ARG_ENABLE([strict-ansi], [ --enable-strict-ansi Enable strict ANSI compliance build default=no], [STRICT=$enableval], [STRICT="no"]) @@ -25,6 +14,23 @@ AC_DEFUN([OB_DEBUG], CFLAGS="$CFLAGS -ansi -pedantic -D_XOPEN_SOURCE" fi + 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 "$CVS" = "yes" && DEBUG="yes" + + TEST="" + test "${PACKAGE_VERSION%*alpha*}" != "$PACKAGE_VERSION" && TEST="yes" + test "$TEST" = "yes" && DEBUG="yes" + + TEST="" + test "${PACKAGE_VERSION%*beta*}" != "$PACKAGE_VERSION" && TEST="yes" + test "$TEST" = "yes" && DEBUG="yes" + if test "$DEBUG" = "yes"; then MSG="DEBUG" else @@ -33,6 +39,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