diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-29 22:56:09 -0300 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-10-04 19:12:36 +0200 |
| commit | ebfcce16ac44b83f6e815c70e91231bed9fcbc97 (patch) | |
| tree | adad6b85e06ff2750aff179af534198befccb311 /configure | |
| parent | d66fe7ff53a5cade7a702100a9006dfe5ae1c473 (diff) | |
configure: Use test_pkg_config() for the SDL check
Removes the extra code to preserve global CFLAGS.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -4871,13 +4871,9 @@ if enabled nvenc; then require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6" fi -# SDL is "special" and adds some CFLAGS that should not pollute anything else. -if enabled avplay; then - CFLAGS_SAVE=$CFLAGS - 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 +# SDL adds some CFLAGS that should not be part of the general CFLAGS. +enabled avplay && + test_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent ! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man ! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html |