Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Build: fix --disable-wx-debug configure option 

Debug support is by default enabled since wxWidgets 2.9.1 and can be explicitly disabled by setting the compiler flag -DNDEBUG.
This commit is contained in:
Christian Beer 2015-11-06 13:57:02 +01:00
parent fdaff409f1
commit 530eb18989
2 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -1223,17 +1223,14 @@ AC_SUBST(CLIENTLIBS)
## -------------------- ## --------------------
## some more tweaking to turn non-standard libs into statically linked ones ## some more tweaking to turn non-standard libs into statically linked ones
if test "${enable_debug}" = yes; then if test "${enable_debug}" = "yes" ; then
CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -D_DEBUG -DDEBUG" CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -D_DEBUG -DDEBUG"
fi fi
AC_ARG_ENABLE(wx-debug, # disable wxWidgets debug support which is by default enabled since 2.9.1
AS_HELP_STRING([--enable-wx-debug], if test "${enable_wx_debug}" = "no" ; then
[ use wxWidgets debug libraries ]), CLIENTGUIFLAGS="${CLIENTGUIFLAGS} -DNDEBUG"
[enable_wx_debug="yes" fi
AC_DEFINE(USE_WX_DEBUG,[1],[Define to 1 to use the wxWidgets debug libraries])
],
[enable_wx_debug="no"])
CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}" CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS}"

36
m4/boinc_wxwidgets.m4
View File

@ -8,11 +8,11 @@ AC_DEFUN([BOINC_OPTIONS_WXWIDGETS],[
[enable_unicode="$enableval"], [enable_unicode="$enableval"],
[]) [])
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(wx-debug,
AS_HELP_STRING([--enable-debug/--disable-debug], AS_HELP_STRING([--disable-wx-debug],
[enable/disable building the manager with debug support]), [disable wxWidgets debug support]),
[enable_debug="$enableval"], [enable_wx_debug="$enableval"],
[]) [enable_wx_debug=yes])
AM_OPTIONS_WXCONFIG AM_OPTIONS_WXCONFIG
AM_PATH_WXCONFIG($1, [_ac_cv_have_wxwidgets=yes], [_ac_cv_have_wxwidgets=no]) AM_PATH_WXCONFIG($1, [_ac_cv_have_wxwidgets=yes], [_ac_cv_have_wxwidgets=no])
@ -55,31 +55,7 @@ dnl Find the default wxWidgets options.
AC_MSG_WARN([ AC_MSG_WARN([
=============================================================================== ===============================================================================
WARNING: No ${uprf} libraries for wxWidgets are installed. WARNING: No ${uprf} libraries for wxWidgets are installed.
==> building with nprf libraries. ==> building with ${nprf} libraries.
You requested a ${uprf} build, but configure is unable to find ${uprf}
wxWidgets libraries. We will build with the default ${nprf} libraries.
===============================================================================
])
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options}"
fi
fi
wx_default_config="`$WX_CONFIG ${ac_cv_wxwidgets_options} --selected-config`"
if test "x${enable_wx_debug}" != x ; then
if $WX_CONFIG ${ac_cv_wxwidgets_options} --debug=${enable_debug} --selected-config 2>&1 >/dev/null ; then
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options} --debug=${enable_debug}"
else
if test "x${enable_debug}" = xno ; then
uprf="non-debug"
nprf="debug"
else
uprf="debug"
nprf="non-debug"
fi
AC_MSG_WARN([
===============================================================================
WARNING: No ${uprf} libraries for wxWidgets are installed.
==> building with nprf libraries.
You requested a ${uprf} build, but configure is unable to find ${uprf} You requested a ${uprf} build, but configure is unable to find ${uprf}
wxWidgets libraries. We will build with the default ${nprf} libraries. wxWidgets libraries. We will build with the default ${nprf} libraries.