[Spice-devel] [PATCH spice-gtk 2/2] build-sys: simplify checking for x11

[marcandre.lureau at redhat.com]

From: Marc-André Lureau <marcandre.lureau at redhat.com>

We no longer need the gtk+-quartz/win32 check, however we can simplify
the x11 check if building gtk+-x11

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 configure.ac | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1e27202..0f416cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,17 +154,8 @@ AC_CHECK_FUNCS(gdk_event_get_scancode)
 LIBS="$old_LIBS"
 CFLAGS="$old_CFLAGS"
 
-PKG_CHECK_EXISTS([gtk+-quartz-$with_gtk], [have_quartz=yes], [have_quartz=no])
-AS_IF([test "x$have_quartz" = "xyes"], [AC_DEFINE([HAVE_QUARTZ], 1, [Have Quartz?])])
-AM_CONDITIONAL([WITH_DISPLAY_QUARTZ], [test "x$have_quartz" = "xyes"])
-
-PKG_CHECK_EXISTS([gtk+-win32-$with_gtk], [have_win32=yes], [have_win32=no])
-AS_IF([test "x$have_win32" = "xyes"], [AC_DEFINE([HAVE_WINDOWS], 1, [Have Win32?])])
-AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
-
+PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [PKG_CHECK_MODULES(X11, x11)])
 AC_CHECK_HEADERS([X11/XKBlib.h])
-AS_IF([test "x$have_quartz" != "xyes" && test "x$have_win32" != "xyes"],
-      [PKG_CHECK_MODULES(X11,x11)])
 
 AC_ARG_WITH([pnp-ids-path],
   AC_HELP_STRING([--with-pnp-ids-path],
-- 
2.9.0