xshmfence is usable outside of DRI3, and is currently autodetected which isn't
good for distributions where deterministic builds are desired.
Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
configure.ac | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index c214638..a1ca9ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd,
AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d
AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build
mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval],
[KDRIVE_MOUSE=auto])
AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build
evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval],
[KDRIVE_EVDEV=auto])
AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use
libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"],
[LIBUNWIND="auto"])
+AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable
xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"],
[WANT_XSHMFENCE="auto"])
dnl chown/chmod to be setuid root as part of build
@@ -1235,18 +1236,21 @@ esac
AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes)
-PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE,
- [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
-AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
+PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes],
[HAVE_XSHMFENCE=no])
+if test "x$WANT_XSHMFENCE" = "xauto"; then
+ WANT_XSHMFENCE="$HAVE_XSHMFENCE"
+fi
-case x"$HAVE_XSHMFENCE" in
- xyes)
- AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence
library])
- REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
- ;;
-esac
+if test "x$WANT_XSHMFENCE" = "xyes"; then
+ if test "x$HAVE_XSHMFENCE" != "xyes"; then
+ AC_MSG_ERROR([xshmfence requested but not installed.])
+ fi
+ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support])
+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
+fi
+AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes])
case "$DRI3,$HAVE_XSHMFENCE" in
yes,yes | auto,yes)
--
1.7.10.4
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
