Mesa (master): configure: Use WAYLAND_SCANNER_RULES only if available
Benjamin Franzke
bnf at kemper.freedesktop.org
Thu Jan 26 10:51:46 UTC 2012
Module: Mesa
Branch: master
Commit: 412042523e80ddb19196851b6e729238b5cc0609
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=412042523e80ddb19196851b6e729238b5cc0609
Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date: Thu Jan 26 10:50:04 2012 +0100
configure: Use WAYLAND_SCANNER_RULES only if available
This has the drawback that when creating configure for
distribution, wayland needs to be available for the packager.
Also the the macros has the wayland prefix hardcoded, so
we cant copy it in mesa right now.
---
configure.ac | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 59919f0..c9e658c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1710,7 +1710,8 @@ yes)
[AC_MSG_ERROR([cannot find libwayland-client])])
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland"
- WAYLAND_SCANNER_RULES(['$(top_srcdir)/src/egl/wayland/wayland-drm/protocol'])
+ m4_ifdef([WAYLAND_SCANNER_RULES],
+ [WAYLAND_SCANNER_RULES(['$(top_srcdir)/src/egl/wayland/wayland-drm/protocol'])])
fi
if test "$plat" = "drm" && test "x$enable_gbm" = "xno"; then
AC_MSG_ERROR([EGL platform drm needs gbm])
More information about the mesa-commit
mailing list