| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | |
| 2 | The libwebp package is outside of openembedded-core, so make it |
| 3 | explicitly configurable. Make it deterministic, so that if libwebp |
| 4 | dependencies are missing, autoconf throws a fatal error. |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Index: weston-1.5.0/configure.ac |
| 9 | =================================================================== |
| 10 | --- weston-1.5.0.orig/configure.ac |
| 11 | +++ weston-1.5.0/configure.ac |
| 12 | @@ -268,9 +268,22 @@ fi |
| 13 | |
| 14 | PKG_CHECK_MODULES(PIXMAN, [pixman-1]) |
| 15 | PKG_CHECK_MODULES(PNG, [libpng]) |
| 16 | -PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) |
| 17 | -AS_IF([test "x$have_webp" = "xyes"], |
| 18 | - [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) |
| 19 | +AC_ARG_ENABLE(webp, |
| 20 | + AS_HELP_STRING([--disable-webp], |
| 21 | + [Disable libwebp support]),, |
| 22 | + enable_webp=auto) |
| 23 | +AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) |
| 24 | +AS_IF([test "x$enable_webp" != "xno"], |
| 25 | + PKG_CHECK_MODULES(WEBP, |
| 26 | + [libwebp], |
| 27 | + [have_webp=yes], |
| 28 | + [have_webp=no]) |
| 29 | + AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], |
| 30 | + AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) |
| 31 | + AS_IF([test "x$have_webp" = "xyes"], |
| 32 | + [enable_webp=yes] |
| 33 | + [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) |
| 34 | +) |
| 35 | |
| 36 | AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, |
| 37 | enable_vaapi_recorder=auto) |