[Mesa-dev] [PATCH] configure.ac: fix omx default installation folder

Alexandre Demers alexandre.f.demers at gmail.com
Mon Jun 30 14:06:58 PDT 2014


Making default OMX installation folder follows the same pattern as 
other state trackers / libs. Fixes bug 80615.

Signed-off-by: Alexandre Demers <alexandre.f.demers at gmail.com>
---
 configure.ac | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98efa43..a684390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1794,16 +1794,12 @@ 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])],
+        [directory for the OMX libraries @<:@default=${libdir}/bellagio@:>@])],
     [OMX_LIB_INSTALL_DIR="$withval"],
-    [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"])
+    [OMX_LIB_INSTALL_DIR="${libdir}/bellagio"])
 AC_SUBST([OMX_LIB_INSTALL_DIR])
 
 dnl Directory for OpenCL libs
-- 
2.0.0



More information about the mesa-dev mailing list