dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "configure: fix warnings in sdl check"

Browse Source
This commit is contained in:
Pascal Massimino 2017-07-18 07:48:34 +00:00 committed by Gerrit Code Review
commit 461ae5551b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -441,12 +441,12 @@ 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"],
[AC_MSG_WARN(SDL library not available - no sdl.h)])]) [AC_MSG_WARN(SDL library not available - no sdl.h)])])
if test x"$sdl_header" != "xno" ; then if test x"$sdl_header" != "xno"; then
AC_CHECK_LIB(SDL, SDL_Init, AC_CHECK_LIB(SDL, SDL_Init,
[SDL_LIBS="-lSDL" [SDL_LIBS="-lSDL"
SDL_INCLUDES="-DWEBP_HAVE_SDL" SDL_INCLUDES="-DWEBP_HAVE_SDL"
@ -455,14 +455,14 @@ 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
LIBCHECK_EPILOGUE([SDL]) LIBCHECK_EPILOGUE([SDL])
if test "$sdl_support" = "yes" ; then if test "$sdl_support" = "yes"; then
build_vwebp_sdl=yes build_vwebp_sdl=yes
fi fi
]) ])