summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-03-02 14:54:28 +0100
committerDiego Biurrun <diego@biurrun.de>2017-03-07 08:32:37 +0100
commit51411eb7ffba1437c1019f992990914f60232c39 (patch)
treebdffe25fe78760c240bd60194f783c7360d3661e
parent003124ebf4a05f1347c74104216887ddd2e5aad4 (diff)
build: Special-case handling of SDL CFLAGS
SDL adds some "special" CFLAGS that interfere with building normal binaries. Capture those CFLAGS separately and avoid adding them to the general CFLAGS.
-rwxr-xr-xconfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index a8e3926b70..9f339e6af6 100755
--- a/configure
+++ b/configure
@@ -4782,7 +4782,13 @@ if enabled nvenc; then
require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
fi
-check_pkg_config sdl "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent
+# 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
! disabled pod2man && check_cmd pod2man --help && enable pod2man || disable pod2man
! disabled texi2html && check_cmd texi2html -version && enable texi2html || disable texi2html