Mesa (9.1): configure.ac: Don't check for X11 unconditionally.
Ian Romanick
idr at kemper.freedesktop.org
Mon Mar 25 21:23:58 UTC 2013
Module: Mesa
Branch: 9.1
Commit: 8d43e33ab23c8d8a55ad01bdebfee9553f3d886b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d43e33ab23c8d8a55ad01bdebfee9553f3d886b
Author: Matt Turner <mattst88 at gmail.com>
Date: Mon Mar 4 10:23:54 2013 -0800
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 <brianp at vmware.com>
(cherry picked from commit 35189d768bf80fdedbb6e70f49215cc8b734f343)
---
configure.ac | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4a98996..ce5364b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,20 +826,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*)
More information about the mesa-commit
mailing list