diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-08-19 21:33:53 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-08-25 18:42:02 +0400 |
| commit | 1d9a7b7291b57d0780d686263a0bef5d77ad86c0 (patch) | |
| tree | b8da149603ca3688b1247c315b6bc7c8bd2bdb6d | |
| parent | 463145a8989cf650cacf098df79008c010669246 (diff) | |
build-sys: simplify checking for x11
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@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 1 insertions, 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], |