From 9f5b54964c36cda46acc6b3a0f5596355f252cda Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Thu, 3 Nov 2011 15:14:58 -0400
Subject: [PATCH] Don't error out if --disable-avcodec was specified but not
 --disable-libva

---
 configure.ac | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index be981b1dfa..8f631c4295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2470,11 +2470,10 @@ dnl
 AC_ARG_ENABLE(libva,
   [  --enable-libva          VAAPI GPU decoding support (libVA) (default auto)])
 
+AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [
+  AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.])
+])
 AS_IF([test "${enable_libva}" != "no"], [
-  AS_IF([test "${have_avcodec}" != "yes"], [
-    AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
-  ])
-
   PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [
     VLC_SAVE_FLAGS
     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-- 
2.39.5