summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aclocal.m45
-rwxr-xr-xconfigure5
-rw-r--r--m4/debug.m45
3 files changed, 9 insertions, 6 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 756ed3561..b0e52c932 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2296,9 +2296,9 @@ AC_HELP_STRING([--enable-debug[=yes|no|full]], [Build with debugging support])
AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
[ac_cv_debug=$enableval], [ac_cv_debug=no])
AC_MSG_CHECKING([whether to build with debugging support])
- if test x$ac_cv_debug != xno; then
+ if test x"$ac_cv_debug" != x"no"; then
AC_DEFINE(DEBUG, 1, Define for debugging support)
- if test x$ac_cv_debug == xfull; then
+ if test x"$ac_cv_debug" = x"full"; then
CFLAGS="$CFLAGS -g3 -Wall -Werror -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_MSG_RESULT([full])
else
@@ -2306,6 +2306,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
AC_MSG_RESULT([yes])
fi
else
+ CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
AC_MSG_RESULT([no])
fi
])
diff --git a/configure b/configure
index 29ab85c3e..0ecfe8dfc 100755
--- a/configure
+++ b/configure
@@ -9002,13 +9002,13 @@ else
fi;
echo "$as_me:$LINENO: checking whether to build with debugging support" >&5
echo $ECHO_N "checking whether to build with debugging support... $ECHO_C" >&6
- if test x$ac_cv_debug != xno; then
+ if test x"$ac_cv_debug" != x"no"; then
cat >>confdefs.h <<\_ACEOF
#define DEBUG 1
_ACEOF
- if test x$ac_cv_debug == xfull; then
+ if test x"$ac_cv_debug" = x"full"; then
CFLAGS="$CFLAGS -g3 -Wall -Werror -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
echo "$as_me:$LINENO: result: full" >&5
echo "${ECHO_T}full" >&6
@@ -9018,6 +9018,7 @@ echo "${ECHO_T}full" >&6
echo "${ECHO_T}yes" >&6
fi
else
+ CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
diff --git a/m4/debug.m4 b/m4/debug.m4
index 279bdc29d..1782bef9f 100644
--- a/m4/debug.m4
+++ b/m4/debug.m4
@@ -13,9 +13,9 @@ AC_HELP_STRING([--enable-debug[=yes|no|full]], [Build with debugging support])
AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
[ac_cv_debug=$enableval], [ac_cv_debug=no])
AC_MSG_CHECKING([whether to build with debugging support])
- if test x$ac_cv_debug != xno; then
+ if test x"$ac_cv_debug" != x"no"; then
AC_DEFINE(DEBUG, 1, Define for debugging support)
- if test x$ac_cv_debug == xfull; then
+ if test x"$ac_cv_debug" = x"full"; then
CFLAGS="$CFLAGS -g3 -Wall -Werror -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
AC_MSG_RESULT([full])
else
@@ -23,6 +23,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support [default]]),
AC_MSG_RESULT([yes])
fi
else
+ CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
AC_MSG_RESULT([no])
fi
])