mirror of https://github.com/BOINC/boinc.git
Moved many of the boinc specific wxWidgets configuration issues out of config.h
and into a separate file in m4. Modified the configuration to use the default wxWidgets configuration if no wx configurations options are found. Configuration will now succeed on a debug build if the wxWidgets debug libraries are not installed. svn path=/trunk/boinc/; revision=16438
This commit is contained in:
parent
5e78b8498b
commit
17f30607e5
|
@ -0,0 +1,95 @@
|
|||
dnl These functions still require wxWidgets.m4
|
||||
|
||||
AC_DEFUN([BOINC_OPTIONS_WXWIDGETS],[
|
||||
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],
|
||||
[ac_cv_have_wxwidgets="${_ac_cv_have_wxwidgets}"])
|
||||
AC_CACHE_SAVE
|
||||
WX_CONFIG="$ac_cv_path_WX_CONFIG_PATH"
|
||||
if test "x${ac_cv_have_wxwidgets}" = "xyes" ; then
|
||||
dnl Find the default wxWidgets options.
|
||||
wx_default_config="`$WX_CONFIG --selected-config`"
|
||||
AC_MSG_CHECKING(for default wxWidgets config)
|
||||
AC_MSG_RESULT($wx_default_config)
|
||||
AC_CACHE_CHECK([for wxwidgets options],[ac_cv_wxwidgets_options],[
|
||||
ac_cv_wxwidgets_options=""
|
||||
if test "x${enable_client_release}" = xyes ; then
|
||||
if $WX_CONFIG $ac_cv_wxwidgets_options --static=yes --selected-config 2>&1 >/dev/null ; then
|
||||
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options} --static=yes"
|
||||
else
|
||||
AC_MSG_WARN(
|
||||
[===============================================================================
|
||||
WARNING: No static libraries for wxWidgets are installed.
|
||||
==> building with dynamic libraries.
|
||||
|
||||
You requested a release build, but configure is unable to find static
|
||||
wxWidgets libraries. This may be OK if your release will be installed with
|
||||
a packaging system that supports dependencies. Be sure to include the
|
||||
wxWidgets dynamic library package as a dependency.
|
||||
|
||||
If not, you have several options. You can install the wxWidgets static
|
||||
libraries on your system and rerun configure. You can link with uninstalled
|
||||
wxWidgets static libraries by using the --with-wxdir=PATH option to
|
||||
configure. Or you can require that people using your build manually install
|
||||
the wxWidgets dynamic libraries.
|
||||
===============================================================================
|
||||
])
|
||||
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options} --static=no"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${enable_unicode}" != x ; then
|
||||
if $WX_CONFIG ${ac_cv_wxwidgets_options} --unicode=${enable_unicode} --selected-config 2>&1 >/dev/null ; then
|
||||
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options} --unicode=${enable_unicode}"
|
||||
else
|
||||
if test "x${enable_unicode}" = xno ; then
|
||||
uprf="ascii"
|
||||
nprf="unicode"
|
||||
else
|
||||
uprf="unicode"
|
||||
nprf="ascii"
|
||||
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}
|
||||
wxWidgets libraries. We will build with the default ${nprf} libraries.
|
||||
===============================================================================
|
||||
])
|
||||
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options}"
|
||||
fi
|
||||
fi
|
||||
|
||||
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}
|
||||
wxWidgets libraries. We will build with the default ${nprf} libraries.
|
||||
===============================================================================
|
||||
])
|
||||
ac_cv_wxwidgets_options="${ac_cv_wxwidgets_options}"
|
||||
fi
|
||||
fi
|
||||
])
|
||||
if test "x${am_cv_wxwidgets_options}" != "x" ; then
|
||||
AM_PATH_WXCONFIG($1, wxWin=1, wxWin=0, ${ac_cv_wxwidgets_options})
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
Loading…
Reference in New Issue