[Spice-commits] 2 commits - configure.ac

[Christophe Fergau]

 configure.ac |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 84b3a5079d6014d50e3018b24949d5a2e18e3c78
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Nov 21 10:47:22 2014 +0100

    configure.ac: Never add xinerama to SPICE_REQUIRES
    
    SPICE_REQUIRES is only used to generate the Requires.private line of
    spice-server.pc. The server code is not using xinerama, so we don't need
    to list xinerama in Requires.private.

diff --git a/configure.ac b/configure.ac
index 51f120c..c9d83e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,7 +333,6 @@ if test "x$have_xinerama" = "xyes" ; then
   AC_DEFINE([HAVE_XINERAMA], [], [Define if we have Xinerama])
   AC_SUBST(XINERAMA_CFLAGS)
   AC_SUBST(XINERAMA_LIBS)
-  AS_VAR_APPEND([SPICE_REQUIRES], [" xinerama"])
 fi
 
 # Add parameter for (partial) static linkage of spice client.
commit 87149e48ed49bd4b33f231d08c44dbc55d400e09
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Nov 21 10:45:23 2014 +0100

    configure.ac: Only check for xinerama for client builds
    
    Xinerama support is only used for the X11 client, but is currently
    being checked even for server only builds. This commit ensures Xinerama
    is not checked for/added to spice-server.pc when not building the
    client.

diff --git a/configure.ac b/configure.ac
index 8b731ee..51f120c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,6 +282,11 @@ AC_SUBST(GL_CFLAGS)
 AC_SUBST(GL_LIBS)
 AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $GL_LIBS"])
 
+# Add parameter for libXinerama
+AC_ARG_ENABLE([xinerama],
+    [AS_HELP_STRING([--disable-xinerama],
+        [disable Xinerama library @<:@default=no@:>@])])
+
 if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
 	if test "$os_linux" = yes; then
 		PKG_CHECK_MODULES(ALSA, alsa)
@@ -301,8 +306,21 @@ if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
 	        xrandr >= 1.2,
 	        have_xrandr12=yes,
 	        have_xrandr12=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
 else
 	have_xrandr12=no
+	have_xinerama=no
 fi
 
 AM_CONDITIONAL([HAVE_XRANDR12], [test "x$have_xrandr12" = "xyes"])
@@ -310,24 +328,6 @@ if test "x$have_xrandr12" = "xyes" ; then
   AC_DEFINE([HAVE_XRANDR12], [], [Define if we have XRANDR 12])
 fi
 
-# 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
   AC_DEFINE([HAVE_XINERAMA], [], [Define if we have Xinerama])