vlc | branch: master | Rafaël Carré <[email protected]> | Thu Nov 3 15:14:58 2011 -0400| [9f5b54964c36cda46acc6b3a0f5596355f252cda] | committer: Rafaël Carré
Don't error out if --disable-avcodec was specified but not --disable-libva > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9f5b54964c36cda46acc6b3a0f5596355f252cda --- configure.ac | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index be981b1..8f631c4 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}" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
