Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow the user to override which wx-config script to use with the WX_CONFIG environment variable.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-09-21 10:57:05 +00:00
parent 19227e0ea6
commit 3b07dcbe73
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.in
View File

@ -816,13 +816,18 @@ dnl Check for wxWindows
dnl dnl
AC_ARG_ENABLE([gui], AC_ARG_ENABLE([gui],
[ --enable-gui compile mkvinfo's GUI and mmg (yes)]) [ --enable-gui compile mkvinfo's GUI and mmg (yes)])
AC_MSG_CHECKING(for wxWidgets)
wxw_ver_req_major=2
wxw_ver_req_minor=4
wxw_ver_req_micro=0
wxw_min_ver=$wxw_ver_req_major.$wxw_ver_req_minor.$wxw_ver_req_micro
if test x"$enable_gui" = x"yes" -o x"$enable_gui" = "x"; then if test x"$enable_gui" = x"yes" -o x"$enable_gui" = "x"; then
if wx-config --cxxflags > /dev/null 2>&1; then AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin)
wxwversion=`wx-config --version` if test x"$WX_CONFIG" != "xno" ; then
wxw_ver_req_major=2 AC_MSG_CHECKING(for wxWidgets $wxw_min_ver or newer)
wxw_ver_req_minor=4
wxw_ver_req_micro=0 wxwversion=`$WX_CONFIG --version`
set - `echo $wxwversion | sed 's/\./\ /g'` set - `echo $wxwversion | sed 's/\./\ /g'`
if test "x$1" = "x" -o $1 -lt ${wxw_ver_req_major} ; then if test "x$1" = "x" -o $1 -lt ${wxw_ver_req_major} ; then
wxwver_ok=0 wxwver_ok=0
@ -843,8 +848,8 @@ dnl
fi fi
if test "$wxwver_ok" = "1" ; then if test "$wxwver_ok" = "1" ; then
WXWINDOWS_CFLAGS=`wx-config --cxxflags` WXWINDOWS_CFLAGS=`$WX_CONFIG --cxxflags`
WXWINDOWS_LIBS=`wx-config --libs | \ WXWINDOWS_LIBS=`$WX_CONFIG --libs | \
sed -e 's/-Wl,--subsystem,windows//' -e 's/-mwindows//'` sed -e 's/-Wl,--subsystem,windows//' -e 's/-mwindows//'`
AC_CACHE_VAL(am_cv_wx_compilation, [ AC_CACHE_VAL(am_cv_wx_compilation, [
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
@ -892,7 +897,7 @@ wxTreeItemId id;
AC_MSG_RESULT(no: wx-config was not found) AC_MSG_RESULT(no: wx-config was not found)
fi fi
else else
AC_MSG_RESULT(no: disabled by user request) echo '*** Not checking for wxWidgets: disabled by user request'
fi fi
if test x"$have_wxwindows" != "xyes" ; then if test x"$have_wxwindows" != "xyes" ; then