From ebfcce16ac44b83f6e815c70e91231bed9fcbc97 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Fri, 29 Sep 2017 22:56:09 -0300
Subject: [PATCH] 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>
---
configure | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index aa87ac7279c..4e91e318b09 100755
--- a/configure
+++ b/configure
@@ -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
--
GitLab