[Spice-commits] configure.ac

[Christophe Fergau]

 configure.ac |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 95253b0fb5b5383ece1ea0f5b54e9cfc944bd765
Author: Nikolay Orlyuk <virkony at gmail.com>
Date:   Mon Jun 18 10:26:06 2012 +0300

    Added configure option --disable-xinerama
    
    This parameter was added to be able to control dependency on
    libXinerama. Which is really useful for package managers.
    Fixes bug #51192

diff --git a/configure.ac b/configure.ac
index aee2975..8f9474e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,10 +309,23 @@ if test "x$have_xrandr12" = "xyes" ; then
   AC_DEFINE([HAVE_XRANDR12], [], [Define if we have XRANDR 12])
 fi
 
-PKG_CHECK_MODULES(XINERAMA,
+# Add parameter for libXinerama
+AC_ARG_ENABLE([xinerama],
+    [AS_HELP_STRING([--disable-xinerama],
+        [disable Xinerama library @<:@default=no@:>@])])
+
+if test "x$enable_xinerama" != "xno"; then
+    PKG_CHECK_MODULES(XINERAMA,
         xinerama >= 1.0,
         have_xinerama=yes,
         have_xinerama=no)
+else
+    have_xinerama=no
+fi
+
+if test "x$enable_xinerama" = "xyes" && test "x$have_xinerama" = "xno"; then
+    AC_MSG_ERROR([Requested Xinerama library was not found])
+fi
 
 AM_CONDITIONAL([HAVE_XINERAMA], [test "x$have_xinerama" = "xyes"])
 if test "x$have_xinerama" = "xyes" ; then