*** empty log message ***

svn path=/trunk/boinc/; revision=10085
This commit is contained in:
Rom Walton 2006-05-02 23:56:48 +00:00
parent f6a01ea730
commit fdb2395d69
1 changed files with 26 additions and 4 deletions

View File

@ -47,6 +47,12 @@ else
fi
fi
AC_ARG_ENABLE(unicode,
AS_HELP_STRING([--disable-unicode],
[disable building the manager with unicode support]),
[enable_unicode=no],
[enable_unicode=yes])
dnl ======================================================================
dnl some vodoo required for building portable client-binary (client, clientgui)
@ -469,15 +475,31 @@ dnl check for wxWidgets
if test "${enable_client_release}" = yes ; then
echo 'Portable client-build: checking for *static* wx-libs ...'
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --debug=yes)
if test "${enable_unicode}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=yes --debug=yes)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
fi
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --debug=no)
if test "${enable_unicode}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=yes --debug=no)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=no)
fi
fi
else
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --debug=yes)
if test "${enable_unicode}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=yes --debug=yes)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=yes)
fi
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --debug=no)
if test "${enable_unicode}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=yes --debug=no)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=no)
fi
fi
fi