[PATCH xserver 5/3] fixup! build fix for autotools

Adam Jackson ajax at redhat.com
Tue Apr 24 19:57:24 UTC 2018


Have to do AM_CONDITIONAL at global scope because autoconf is stupid and
terrible.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a18170b2fc..3f9752572e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2407,7 +2407,6 @@ if test "x$XWAYLAND" = xyes; then
 		AC_DEFINE(XWL_HAS_EGLSTREAM, 1,
 			  [Build xwayland with eglstream support])
 	fi
-	AM_CONDITIONAL(XWAYLAND_EGLSTREAM, [test "x$XWAYLAND_EGLSTREAM" = "xyes"])
 
 	XWAYLAND_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
 	XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS"
@@ -2430,6 +2429,7 @@ if test "x$XWAYLAND" = xyes; then
 
 	AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
 fi
+AM_CONDITIONAL(XWAYLAND_EGLSTREAM, [test "x$XWAYLAND_EGLSTREAM" = "xyes"])
 
 
 dnl and the rest of these are generic, so they're in config.h
-- 
2.17.0



More information about the xorg-devel mailing list