From 5ce06d12ff83d84016f380323ea8d2fce380f4ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Thu, 9 Oct 2014 18:01:19 +0200 Subject: [PATCH] configure: Revert "ask vdpau.pc for the default location of the vdpau drivers" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit bbe6f7f865cd4316b5f885507ee0b128a20686eb. Signed-off-by: Christian König Reviewed-by: Emil Velikov Reviewed-by: Ilia Mirkin --- configure.ac | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 680dff4ab42..bc589b79a41 100644 --- a/configure.ac +++ b/configure.ac @@ -1786,17 +1786,12 @@ 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=`pkg-config --variable=moduledir vdpau`@:>@])], + [directory for the VDPAU libraries @<:@default=${libdir}/vdpau@:>@])], [VDPAU_LIB_INSTALL_DIR="$withval"], - [VDPAU_LIB_INSTALL_DIR="$VDPAU_LIB_INSTALL_DIR_DEFAULT"]) + [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) AC_SUBST([VDPAU_LIB_INSTALL_DIR]) OMX_LIB_INSTALL_DIR_DEFAULT='' @@ -1806,7 +1801,7 @@ fi AC_ARG_WITH([omx-libdir], [AS_HELP_STRING([--with-omx-libdir=DIR], - [directory for the OMX libraries @<:@default=`pkg-config --variable=pluginsdir libomxil-bellagio`@:>@])], + [directory for the OMX libraries])], [OMX_LIB_INSTALL_DIR="$withval"], [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"]) AC_SUBST([OMX_LIB_INSTALL_DIR]) -- 2.30.2