From 35189d768bf80fdedbb6e70f49215cc8b734f343 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 4 Mar 2013 10:23:54 -0800 Subject: [PATCH] configure.ac: Don't check for X11 unconditionally. X11 is already checked conditionally below. Fixes OSMesa-only configurations to not require X11. Note: This is a candidate for the 9.1 branch. Reviewed-by: Brian Paul --- configure.ac | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac index 785259554bb..1b13d06be3a 100644 --- a/configure.ac +++ b/configure.ac @@ -832,20 +832,12 @@ if test "x$enable_dri" = xyes; then fi fi -dnl Find out if X is available. -PKG_CHECK_MODULES([X11], [x11], [no_x=no], [no_x=yes]) - dnl Try to tell the user that the --x-* options are only used when dnl pkg-config is not available. This must be right after AC_PATH_XTRA. m4_divert_once([HELP_BEGIN], [These options are only used when the X libraries cannot be found by the pkg-config utility.]) -dnl We need X for xlib and dri, so bomb now if it's not found -if test "x$enable_glx" = xyes -a "x$no_x" = xyes; then - AC_MSG_ERROR([X11 development libraries needed for GLX]) -fi - dnl Direct rendering or just indirect rendering case "$host_os" in gnu*)