Regenerated after SDL2 changes

This commit is contained in:
Volker Ruppert 2014-07-06 17:45:55 +00:00
parent 45589bf375
commit e4747ee712

35
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 12382 2014-06-21 08:22:22Z vruppert .
# From configure.in Id: configure.in 12397 2014-07-06 17:45:21Z vruppert .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -21408,9 +21408,27 @@ fi
fi
fi
if test "$with_sdl" != yes; then
can_compile_sdl=1
ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL.h" "ac_cv_header_SDL_SDL_h" "$ac_includes_default"
if test "$with_sdl" != yes -a "$with_sdl2" != yes; then
can_compile_sdl=2
ac_fn_c_check_header_mongrel "$LINENO" "SDL2/SDL.h" "ac_cv_header_SDL2_SDL_h" "$ac_includes_default"
if test "x$ac_cv_header_SDL2_SDL_h" = xyes; then :
else
can_compile_sdl=0
fi
ac_fn_c_check_header_mongrel "$LINENO" "SDL2/SDL_main.h" "ac_cv_header_SDL2_SDL_main_h" "$ac_includes_default"
if test "x$ac_cv_header_SDL2_SDL_main_h" = xyes; then :
else
can_compile_sdl=0
fi
if test $can_compile_sdl != 2; then
can_compile_sdl=1
ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL.h" "ac_cv_header_SDL_SDL_h" "$ac_includes_default"
if test "x$ac_cv_header_SDL_SDL_h" = xyes; then :
else
@ -21418,7 +21436,7 @@ else
fi
ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_main.h" "ac_cv_header_SDL_SDL_main_h" "$ac_includes_default"
ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_main.h" "ac_cv_header_SDL_SDL_main_h" "$ac_includes_default"
if test "x$ac_cv_header_SDL_SDL_main_h" = xyes; then :
else
@ -21426,8 +21444,11 @@ else
fi
if test $can_compile_sdl = 1; then
with_sdl=yes
if test $can_compile_sdl = 1; then
with_sdl=yes
fi
else
with_sdl2=yes
fi
fi