*** empty log message ***

svn path=/trunk/boinc/; revision=6227
This commit is contained in:
Rom Walton 2005-05-23 22:01:12 +00:00
parent 6f4fe1379f
commit 75c0ab74c0
2 changed files with 20 additions and 3 deletions

View File

@ -6952,3 +6952,11 @@ David 22 May 2005
api/
boinc_api.C
Rom 23 May 2005
- Modify the configure.ac script to explicitly state which combination
of wxWidget libraries we need to link against, otherwise it will
fall back to a default which may cause more harm than good.
/
configure.ac

View File

@ -361,11 +361,20 @@ AM_OPTIONS_WXCONFIG
dnl check for wxWidgets
if test "${enable_client_release}" = yes ; then
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --debug)
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0])
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=no)
fi
else
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=yes)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=no)
fi
fi
if ( test "${enable_client}" = yes ) && ( test "$wxWin" != 1 ); then
AC_MSG_WARN([