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

- applied SF patch #1116663: temporary fix for vbe and cirrus support check

Browse Source 
(the check can be removed when the vga extension option works completely)
This commit is contained in:
Volker Ruppert 2005-02-05 10:05:30 +00:00
parent 23c628e1a7
commit da975f3edf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/configure vendored
View File

@ -33643,7 +33643,7 @@ _ACEOF
fi;
if test "$bx_support_vbe" = 1 && test "$bx_suppot_clgd54xx" = 1; then
if test "$bx_support_vbe" = 1 && test "$bx_support_clgd54xx" = 1; then
{ { echo "$as_me:$LINENO: error: --enable-vbe and --enable-clgd54xx are mutually exclusive" >&5
echo "$as_me: error: --enable-vbe and --enable-clgd54xx are mutually exclusive" >&2;}
{ (exit 1); exit 1; }; }

4
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.267 2005-01-05 19:50:53 vruppert Exp $]])
AC_REVISION([[$Id: configure.in,v 1.268 2005-02-05 10:05:30 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -1538,7 +1538,7 @@ AC_ARG_ENABLE(clgd54xx,
]
)
if test "$bx_support_vbe" = 1 && test "$bx_suppot_clgd54xx" = 1; then
if test "$bx_support_vbe" = 1 && test "$bx_support_clgd54xx" = 1; then
AC_MSG_ERROR([[--enable-vbe and --enable-clgd54xx are mutually exclusive]])
fi