Skip to content

Commit

Permalink
Build: remove --disable-wx-debug
Browse files Browse the repository at this point in the history
WxWidgets switched to using -DNDEBUG to disable debugging in version 2.9.1 and enabling it by default. My previous change (530eb18) made the debug version the default and one had to disable the debugging for release builds. This is fixed now and the non-debug version is the default. Now WxWidgets debug assertions are switched on if --enable-debug is specified.

fixes #1476
  • Loading branch information
ChristianBeer committed Jan 26, 2016
1 parent d3ec1da commit cc67f46
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
6 changes: 2 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1245,10 +1245,8 @@ AC_SUBST(CLIENTLIBS)

if test "${enable_debug}" = "yes" ; then
CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -D_DEBUG -DDEBUG"
fi

# disable wxWidgets debug support which is by default enabled since 2.9.1
if test "${enable_wx_debug}" = "no" ; then
else
# disable wxWidgets debug support which is by default enabled since 2.9.1
CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
fi

Expand Down
6 changes: 0 additions & 6 deletions m4/boinc_wxwidgets.m4
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ AC_DEFUN([BOINC_OPTIONS_WXWIDGETS],[
[enable_unicode="$enableval"],
[])
AC_ARG_ENABLE(wx-debug,
AS_HELP_STRING([--disable-wx-debug],
[disable wxWidgets debug support]),
[enable_wx_debug="$enableval"],
[enable_wx_debug=yes])
AM_OPTIONS_WXCONFIG
AM_PATH_WXCONFIG($1, [_ac_cv_have_wxwidgets=yes], [_ac_cv_have_wxwidgets=no])
AC_CACHE_CHECK([if wxWidgets works],[ac_cv_have_wxwidgets],
Expand Down

0 comments on commit cc67f46

Please sign in to comment.