diff options
| author | Christian König <christian.koenig@amd.com> | 2014-10-09 18:01:19 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-10-13 12:43:05 +0200 |
| commit | 5ce06d12ff83d84016f380323ea8d2fce380f4ec (patch) | |
| tree | 8b197359010a783b1b0a856beb8b8492b3c2535b /configure.ac | |
| parent | 83365a5b57b6ab966329bceb858d41d6159d7f3d (diff) | |
| download | external_mesa3d-5ce06d12ff83d84016f380323ea8d2fce380f4ec.zip external_mesa3d-5ce06d12ff83d84016f380323ea8d2fce380f4ec.tar.gz external_mesa3d-5ce06d12ff83d84016f380323ea8d2fce380f4ec.tar.bz2 | |
configure: Revert "ask vdpau.pc for the default location of the vdpau drivers"
This reverts commit bbe6f7f865cd4316b5f885507ee0b128a20686eb.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 680dff4..bc589b7 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]) |