har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Use test_pkg_config() for the SDL check

Browse Source 
Removes the extra code to preserve global CFLAGS.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
James Almer 2017-09-29 22:56:09 -03:00 committed by Diego Biurrun
parent d66fe7ff53
commit ebfcce16ac
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -4871,13 +4871,9 @@ if enabled nvenc; then
require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
fi fi
# SDL is "special" and adds some CFLAGS that should not pollute anything else. # SDL adds some CFLAGS that should not be part of the general CFLAGS.
if enabled avplay; then enabled avplay &&
CFLAGS_SAVE=$CFLAGS test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent
check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent &&
sdl_cflags=$pkg_cflags
CFLAGS=$CFLAGS_SAVE
fi
! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man ! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man
! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html ! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html