[FFmpeg-cvslog] configure: fix enabling SDL2 without pkg-config

James Almer git at videolan.org
Fri Sep 29 03:34:57 EEST 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Sep 28 21:34:38 2017 -0300| [e16ea52ed35cab948f428eac6a0cc02ca5129674] | committer: James Almer

configure: fix enabling SDL2 without pkg-config

Regression since d81b34069e80cb04160689ef5a160b9aee858257.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e16ea52ed35cab948f428eac6a0cc02ca5129674
---

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9cf98c8cc2..8e4775be8c 100755
--- a/configure
+++ b/configure
@@ -6115,8 +6115,8 @@ if enabled sdl2; then
         sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
         check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x020001" $sdl2_cflags &&
         check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x020100" $sdl2_cflags &&
-        check_func SDL_Init $sdl2_extralibs $sdl2_cflags ||
-            disable sdl2
+        check_func SDL_Init $sdl2_extralibs $sdl2_cflags &&
+            enable sdl2
     fi
     if test $target_os = "mingw32"; then
         sdl2_extralibs="$sdl2_extralibs -mconsole"



More information about the ffmpeg-cvslog mailing list