Mesa (master): configure: respect $libdir for the OMX installation dir
Christian König
deathsimple at kemper.freedesktop.org
Mon Oct 13 10:50:36 UTC 2014
Module: Mesa
Branch: master
Commit: d3004a267af1c2c408601665f41c2f7c5f699aa2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3004a267af1c2c408601665f41c2f7c5f699aa2
Author: Christian König <christian.koenig at amd.com>
Date: Thu Oct 9 18:42:58 2014 +0200
configure: respect $libdir for the OMX installation dir
Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
configure.ac | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index bc589b7..c37018f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1794,16 +1794,13 @@ AC_ARG_WITH([vdpau-libdir],
[VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau'])
AC_SUBST([VDPAU_LIB_INSTALL_DIR])
-OMX_LIB_INSTALL_DIR_DEFAULT=''
-if test "x$enable_omx" = xyes; then
- OMX_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio`
-fi
+dnl Directory for OMX libs
AC_ARG_WITH([omx-libdir],
[AS_HELP_STRING([--with-omx-libdir=DIR],
[directory for the OMX libraries])],
[OMX_LIB_INSTALL_DIR="$withval"],
- [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"])
+ [OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`])
AC_SUBST([OMX_LIB_INSTALL_DIR])
dnl Directory for VA libs
More information about the mesa-commit
mailing list