summaryrefslogtreecommitdiff
path: root/m4macros
diff options
context:
space:
mode:
authorBenedikt Meurer <benny@xfce.org>2005-03-19 15:56:38 +0000
committerBenedikt Meurer <benny@xfce.org>2005-03-19 15:56:38 +0000
commitc531a54746526b721b42bc9a040f5039aeb8a570 (patch)
tree3fea2a016b2aed3a29bf5ac7d043103480413825 /m4macros
parent5abc1c7221898ee53f5c4204cf77e352e69c9749 (diff)
downloadxfce4-dev-tools-c531a54746526b721b42bc9a040f5039aeb8a570.tar.gz
2005-03-19 Benedikt Meurer <benny@xfce.org>
* m4macros/xdt-features.m4: --enable-final is now on by default again. The glib assertions are now toggled by --disable-asserts, as suggested by Olivier. (Old svn revision: 2281)
Diffstat (limited to 'm4macros')
-rw-r--r--m4macros/xdt-features.m424
1 files changed, 15 insertions, 9 deletions
diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4
index d9d48e5..de09aaa 100644
--- a/m4macros/xdt-features.m4
+++ b/m4macros/xdt-features.m4
@@ -93,23 +93,29 @@ AC_HELP_STRING([--disable-gcov],
AC_MSG_RESULT([no])
fi
+dnl # --disable-asserts
+ AC_ARG_ENABLE([asserts],
+AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]),
+ [], [enable_asserts=no])
+
+ AC_MSG_CHECKING([whether to disable assertions])
+ if test x"$enable_asserts" = x"no"; then
+ AC_MSG_RESULT([yes])
+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT"
+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
+ else
+ AC_MSG_RESULT([no])
+ fi
+
dnl # --enable-final
AC_REQUIRE([AC_PROG_LD])
AC_ARG_ENABLE([final],
AC_HELP_STRING([--enable-final], [Build final version]),
- [], [enable_final=no])
+ [], [enable_final=yes])
AC_MSG_CHECKING([whether to build final version])
if test x"$enable_final" = x"yes"; then
AC_MSG_RESULT([yes])
- AC_MSG_CHECKING([whether to disable assertions])
- if x"$enable_debug" = x"no"; then
- AC_MSG_RESULT([yes])
- CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT"
- CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
- else
- AC_MSG_RESULT([no])
- fi
AC_MSG_CHECKING([whether $LD accepts -O1])
case `$LD -O1 -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)