[Spice-commits] configure.ac src/Makefile.am

[Marc-André Lureau]

 configure.ac    |    5 -----
 src/Makefile.am |    3 ---
 2 files changed, 8 deletions(-)

New commits:
commit 4cc099503c17dcb2fbea11e5293ab30f581361ad
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Mon Nov 9 15:02:10 2015 +0100

    build-sys: remove xrandr
    
    Not needed anymore (probably since gnome-rr was removed in 30986505b)
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>

diff --git a/configure.ac b/configure.ac
index bfafb87..38db8b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,11 +164,6 @@ AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
 
 if [test "x$have_x11" = "xyes" ]
 then
-  PKG_CHECK_MODULES(XRANDR, x11 xrandr, [have_xrandr=yes], [have_xrandr=no])
-  AC_SUBST(XRANDR_CFLAGS)
-  AC_SUBST(XRANDR_LIBS)
-  AS_IF([test "x$have_xrandr" = "xyes"], [AC_DEFINE([HAVE_RANDR], 1, [Have xrandr?])])
-
   AC_CHECK_HEADERS([X11/XKBlib.h])
 fi
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 46162b3..37b89fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -122,7 +122,6 @@ SPICE_GTK_LIBADD_COMMON =		\
 	libspice-client-glib-2.0.la	\
 	$(GTK_LIBS)			\
 	$(CAIRO_LIBS)			\
-	$(XRANDR_LIBS)			\
 	$(LIBM)				\
 	$(NULL)
 
@@ -392,7 +391,6 @@ spicy_SOURCES =					\
 spicy_LDADD =						\
 	libspice-client-gtk-$(SPICE_GTK_API_VERSION).la	\
 	libspice-client-glib-2.0.la			\
-	$(XRANDR_LIBS)					\
 	$(GTHREAD_LIBS)					\
 	$(GTK_LIBS)					\
 	$(LIBM)						\
@@ -400,7 +398,6 @@ spicy_LDADD =						\
 
 spicy_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
-	$(XRANDR_CFLAGS)		\
 	$(GTHREAD_CFLAGS)		\
 	-DSPICE_DISABLE_DEPRECATED	\
 	$(NULL)