On 19/08/16 01:35 PM, marcandre.lureau@xxxxxxxxxx wrote: > From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> > > We no longer need the gtk+-quartz/win32 check, however we can simplify > the x11 check if building gtk+-x11 > Much better than mine! My patch for spice-gtk-0.31 used that PKG_CHECK_EXISTS on gtk+-x11 but that check had been dropped from HEAD so I went the other way. > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> > --- > 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], >
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel