From bbe6f7f865cd4316b5f885507ee0b128a20686eb Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 22 Sep 2014 18:41:58 +0100 Subject: configure: ask vdpau.pc for the default location of the vdpau drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rather than using hardcoded values honor the value set at libvdpau build time - i.e. the moduledir variable from vdpau.pc Update the omx description to match reality while we're here. Cc: Christian König Cc: Alexandre Demers Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80615 Signed-off-by: Emil Velikov Reviewed-by: Matt Turner --- configure.ac | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index bf9059df9b0..4726e83d9f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1769,12 +1769,17 @@ if test "x$enable_gallium_tests" = xyes; then fi AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) +VDPAU_LIB_INSTALL_DIR_DEFAULT='' +if test "x$enable_vdpau" = xyes; then + VDPAU_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=moduledir vdpau` +fi + dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], [AS_HELP_STRING([--with-vdpau-libdir=DIR], - [directory for the VDPAU libraries @<:@default=${libdir}/vdpau@:>@])], + [directory for the VDPAU libraries @<:@default=`pkg-config --variable=moduledir vdpau`@:>@])], [VDPAU_LIB_INSTALL_DIR="$withval"], - [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) + [VDPAU_LIB_INSTALL_DIR="$VDPAU_LIB_INSTALL_DIR_DEFAULT"]) AC_SUBST([VDPAU_LIB_INSTALL_DIR]) OMX_LIB_INSTALL_DIR_DEFAULT='' @@ -1784,7 +1789,7 @@ fi AC_ARG_WITH([omx-libdir], [AS_HELP_STRING([--with-omx-libdir=DIR], - [directory for the OMX libraries])], + [directory for the OMX libraries @<:@default=`pkg-config --variable=pluginsdir libomxil-bellagio`@:>@])], [OMX_LIB_INSTALL_DIR="$withval"], [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"]) AC_SUBST([OMX_LIB_INSTALL_DIR]) -- cgit v1.2.3