mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed GTK detection for wxGTK (enable GTK check only if wx gui is enabled)

Browse Source 
- fixed GTK detection switch for the X11 gui
- enable GTK detection for the sdl gui on non-win32 platforms
This commit is contained in:
Volker Ruppert 2009-02-01 12:41:28 +00:00
parent 882269acaa
commit 4f1684d07b
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.384 2009/01/31 10:04:25 sshwarts Exp .
# From configure.in Id: configure.in,v 1.386 2009/02/01 12:40:30 vruppert Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@ -37102,6 +37102,7 @@ echo "${ECHO_T}$WX_CONFIG" >&6; }
ok_wx_version=0
wx_multi_lib=0
needs_gtk2=0
wx_needs_gtk2=0
{ echo "$as_me:$LINENO: checking for wxWidgets library version" >&5
echo $ECHO_N "checking for wxWidgets library version... $ECHO_C" >&6; }
if test x$WX_CONFIG != xnot_found; then
@ -37118,8 +37119,8 @@ if test x$WX_CONFIG != xnot_found; then
ok_wx_version=1
wx_multi_lib=1
case x$WX_BASENAME in
xwx_gtk2|xwx_gtk2u) needs_gtk2=1 ;;
*) ;;
xwx_gtk2|xwx_gtk2u) wx_needs_gtk2=1 ;;
*) ;;
esac
;;
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
@ -37135,6 +37136,9 @@ if test "$cross_configure" = 0; then
if test "$with_all_libs" = yes; then
with_wx=yes
fi
if test "$with_wx" = yes; then
needs_gtk2=$wx_needs_gtk2
fi
else
if test "$with_wx" = yes; then
{ echo "$as_me:$LINENO: WARNING: Bochs for wxWidgets cannot be compiled here, disabling it" >&5
@ -37171,7 +37175,7 @@ _ACEOF
GUI_CXXFLAGS="$GUI_CXXFLAGS \$(X_CFLAGS)"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_X)"
# The enhanced X debugger depends on GTK2
if test "$BX_DEBUGGER_GUI" = 1; then
if test "$gui_debugger" = 1; then
needs_gtk2=1
fi
check_xpm=0
@ -37362,6 +37366,10 @@ _ACEOF
GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS"
GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
# The enhanced X debugger depends on GTK2
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
needs_gtk2=1
fi
if test "$with_win32" != yes -a "$with_wx" != yes; then
case $target in
*-pc-windows*)

16
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.385 2009-01-31 10:43:23 sshwarts Exp $]])
AC_REVISION([[$Id: configure.in,v 1.386 2009-02-01 12:40:30 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -2319,6 +2319,7 @@ AC_MSG_RESULT($WX_CONFIG)
ok_wx_version=0
wx_multi_lib=0
needs_gtk2=0
wx_needs_gtk2=0
AC_MSG_CHECKING(for wxWidgets library version)
if test x$WX_CONFIG != xnot_found; then
WX_VERSION=`$WX_CONFIG --version`
@ -2334,8 +2335,8 @@ if test x$WX_CONFIG != xnot_found; then
ok_wx_version=1
wx_multi_lib=1
case x$WX_BASENAME in
xwx_gtk2|xwx_gtk2u) needs_gtk2=1 ;;
*) ;;
xwx_gtk2|xwx_gtk2u) wx_needs_gtk2=1 ;;
*) ;;
esac
;;
x[3-9]*) ok_wx_version=1 ;; # version 3 or greater
@ -2350,6 +2351,9 @@ if test "$cross_configure" = 0; then
if test "$with_all_libs" = yes; then
with_wx=yes
fi
if test "$with_wx" = yes; then
needs_gtk2=$wx_needs_gtk2
fi
else
if test "$with_wx" = yes; then
AC_MSG_WARN([Bochs for wxWidgets cannot be compiled here, disabling it])
@ -2380,7 +2384,7 @@ if test "$with_x11" = yes; then
GUI_CXXFLAGS="$GUI_CXXFLAGS \$(X_CFLAGS)"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_X)"
# The enhanced X debugger depends on GTK2
if test "$BX_DEBUGGER_GUI" = 1; then
if test "$gui_debugger" = 1; then
needs_gtk2=1
fi
check_xpm=0
@ -2426,6 +2430,10 @@ if test "$with_sdl" = yes; then
GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS"
GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)"
# The enhanced X debugger depends on GTK2
if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then
needs_gtk2=1
fi
if test "$with_win32" != yes -a "$with_wx" != yes; then
case $target in
*-pc-windows*)