Commit 97ccc689e614918a3b21ef58ce77ce297ace27fa
1 parent
c98baaac
Configure check for graphical output (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1460 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
11 additions
and
0 deletions
configure
| @@ -84,6 +84,7 @@ linux="no" | @@ -84,6 +84,7 @@ linux="no" | ||
| 84 | kqemu="no" | 84 | kqemu="no" |
| 85 | kernel_path="" | 85 | kernel_path="" |
| 86 | cocoa="no" | 86 | cocoa="no" |
| 87 | +check_gfx="yes" | ||
| 87 | 88 | ||
| 88 | # OS specific | 89 | # OS specific |
| 89 | targetos=`uname -s` | 90 | targetos=`uname -s` |
| @@ -186,6 +187,8 @@ for opt do | @@ -186,6 +187,8 @@ for opt do | ||
| 186 | ;; | 187 | ;; |
| 187 | --enable-cocoa) cocoa="yes" ; sdl="no" | 188 | --enable-cocoa) cocoa="yes" ; sdl="no" |
| 188 | ;; | 189 | ;; |
| 190 | + --disable-gfx-check) check_gfx="no" | ||
| 191 | + ;; | ||
| 189 | esac | 192 | esac |
| 190 | done | 193 | done |
| 191 | 194 | ||
| @@ -613,6 +616,14 @@ if expr $target : '.*-user' > /dev/null ; then | @@ -613,6 +616,14 @@ if expr $target : '.*-user' > /dev/null ; then | ||
| 613 | target_user_only="yes" | 616 | target_user_only="yes" |
| 614 | fi | 617 | fi |
| 615 | 618 | ||
| 619 | +if test "$target_user_only" = "no" -a "$check_gfx" = "yes" \ | ||
| 620 | + -a "$sdl" = "no" -a "$cocoa" = "no" ; then | ||
| 621 | + echo "ERROR: QEMU requires SDL or Cocoa for graphical output" | ||
| 622 | + echo "To build QEMU with graphical output configure with --disable-gfx-check" | ||
| 623 | + echo "Note that this will disable all output from the virtual graphics card." | ||
| 624 | + exit 1; | ||
| 625 | +fi | ||
| 626 | + | ||
| 616 | #echo "Creating $config_mak, $config_h and $target_dir/Makefile" | 627 | #echo "Creating $config_mak, $config_h and $target_dir/Makefile" |
| 617 | 628 | ||
| 618 | mkdir -p $target_dir | 629 | mkdir -p $target_dir |