Merge "configure: fix warnings in sdl check"

This commit is contained in:
Pascal Massimino 2017-07-18 07:48:34 +00:00 committed by Gerrit Code Review
commit 461ae5551b

View File

@ -441,7 +441,7 @@ AS_IF([test "x$enable_sdl" != "xno"], [
CLEAR_LIBVARS([SDL]) CLEAR_LIBVARS([SDL])
WITHLIB_OPTION([sdl], [SDL]) WITHLIB_OPTION([sdl], [SDL])
$sdl_header = "no"; sdl_header="no"
LIBCHECK_PROLOGUE([SDL]) LIBCHECK_PROLOGUE([SDL])
AC_CHECK_HEADER([SDL/SDL.h], [sdl_header="SDL_SDL.h"], AC_CHECK_HEADER([SDL/SDL.h], [sdl_header="SDL_SDL.h"],
[AC_CHECK_HEADER([SDL.h], [sdl_header="SDL.h"], [AC_CHECK_HEADER([SDL.h], [sdl_header="SDL.h"],
@ -455,8 +455,8 @@ AS_IF([test "x$enable_sdl" != "xno"], [
sdl_support=yes sdl_support=yes
], ],
AC_MSG_WARN(Optional SDL library not found), AC_MSG_WARN(Optional SDL library not found),
[$MATH_LIBS]), [$MATH_LIBS])
if test x"$sdl_header" == "xSDL.h" ; then if test x"$sdl_header" = "xSDL.h"; then
SDL_INCLUDES="$SDL_INCLUDES -DWEBP_HAVE_JUST_SDL_H" SDL_INCLUDES="$SDL_INCLUDES -DWEBP_HAVE_JUST_SDL_H"
fi fi
fi fi