Updating branch refs/heads/master to 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 (commit) from a79add0b3c27775e76207cced9cbe02745f6974b (commit)
commit 00ea28c6384c46cf7fda51591a2fa2b49970b6e7 Author: Jannis Pohlmann <jan...@xfce.org> Date: Fri Sep 18 04:40:26 2009 +0200 Switch back to previous debug configure code from XDT_FEATURE_DEBUG(). I'd like to see if this has an impact on make distcheck. It could be that only modules using XDT_FEATURE_DEBUG(), like xfconf and Thunar, break due to this error in the scanner code generated by gtk-doc: thunarx-scan.c: In function âdescribe_signed_constantâ: thunarx-scan.c:884: error: comparison between signed and unsigned configure.in.in | 106 +++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/configure.in.in b/configure.in.in index cea90b5..c8b2813 100644 --- a/configure.in.in +++ b/configure.in.in @@ -203,59 +203,59 @@ AM_CONDITIONAL([ENABLE_XML2PO], [test x"$enable_xml2po" = x"yes"]) dnl *********************************** dnl *** Check for debugging support *** dnl *********************************** -XDT_FEATURE_DEBUG() -#AC_ARG_ENABLE([debug], -#AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=thunar_debug_default@:>@]), -# [], [enable_debug=thunar_debug_default]) -#AC_MSG_CHECKING([whether to enable debugging support]) -#if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then -# dnl Print the result -# AC_MSG_RESULT([$enable_debug]) -# -# dnl Make sure we detect possible errors (if supported) -# save_CFLAGS="$CFLAGS" -# CFLAGS="$CFLAGS -Wall -Werror" -# AC_MSG_CHECKING([whether $CC accepts -Wall -Werror]) -# AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ -# AC_MSG_RESULT([yes]) -# PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror" -# ], [ -# AC_MSG_RESULT([no]) -# ]) -# CFLAGS="$save_CFLAGS" -# -# dnl Paranoia for --enable-debug=full -# if test x"$enable_debug" = x"full"; then -# dnl Enable extensive debugging -# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG" -# -# dnl Use -O0 -g3 if the compiler supports it -# save_CFLAGS="$CFLAGS" -# CFLAGS="$CFLAGS -O0 -g3" -# AC_MSG_CHECKING([whether $CC accepts -O0 -g3]) -# AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ -# AC_MSG_RESULT([yes]) -# PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3" -# ], [ -# AC_MSG_RESULT([no]) -# ]) -# CFLAGS="$save_CFLAGS" -# fi -#else -# dnl Print the result -# AC_MSG_RESULT([$enable_debug]) -# -# dnl Disable debugging (release build) -# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG" -# -# dnl Disable object cast checks -# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS" -# -# dnl Disable all checks for --enable-debug=no -# if test x"$enable_debug" = x"no"; then -# PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" -# fi -#fi +#XDT_FEATURE_DEBUG() +AC_ARG_ENABLE([debug], +AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=thunar_debug_default@:>@]), + [], [enable_debug=thunar_debug_default]) +AC_MSG_CHECKING([whether to enable debugging support]) +if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + + dnl Make sure we detect possible errors (if supported) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror" + AC_MSG_CHECKING([whether $CC accepts -Wall -Werror]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ + AC_MSG_RESULT([yes]) + PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror" + ], [ + AC_MSG_RESULT([no]) + ]) + CFLAGS="$save_CFLAGS" + + dnl Paranoia for --enable-debug=full + if test x"$enable_debug" = x"full"; then + dnl Enable extensive debugging + PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG" + + dnl Use -O0 -g3 if the compiler supports it + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -O0 -g3" + AC_MSG_CHECKING([whether $CC accepts -O0 -g3]) + AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [ + AC_MSG_RESULT([yes]) + PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3" + ], [ + AC_MSG_RESULT([no]) + ]) + CFLAGS="$save_CFLAGS" + fi +else + dnl Print the result + AC_MSG_RESULT([$enable_debug]) + + dnl Disable debugging (release build) + PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DNDEBUG" + + dnl Disable object cast checks + PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS" + + dnl Disable all checks for --enable-debug=no + if test x"$enable_debug" = x"no"; then + PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + fi +fi dnl ************************************** dnl *** Check for linker optimizations ***
_______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits