Mesa (master): configure: read libomxil-bellagio.pc only when it exists

Emil Velikov evelikov at kemper.freedesktop.org
Tue Mar 11 13:07:20 UTC 2014


Module: Mesa
Branch: master
Commit: 254aafba3e1c4a50dc79c6cfe2ad9b48152267c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=254aafba3e1c4a50dc79c6cfe2ad9b48152267c0

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Mar  3 02:21:53 2014 +0000

configure: read libomxil-bellagio.pc only when it exists

Currenly configure.ac will print a warning when one is missing the package.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Christian König <christian.koenig at amd.com>

---

 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0735a76..4f78e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1650,11 +1650,16 @@ 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
+
 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=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio`])
+    [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"])
 AC_SUBST([OMX_LIB_INSTALL_DIR])
 
 dnl Directory for OpenCL libs




More information about the mesa-commit mailing list