[PATCH] configure: if xnest was requested but modules weren't found, fail.

Peter Hutterer peter.hutterer at who-t.net
Thu Oct 1 17:16:27 PDT 2009


Tested-by: Xavier Chantry <shiningxc at gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Acked-by: Julien Cristau <jcristau at debian.org>
---
build error fix. Missing check could have resulted in a build error if
Xnest was explicitly enabled but the modules didn't meet the requirements.

Will go into 1.7.0.

 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7fdcf5a..46421fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1375,6 +1375,9 @@ AC_MSG_RESULT([$XNEST])
 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
 
 if test "x$XNEST" = xyes; then
+	if test "x$have_xnest" = xno; then
+		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])
+	fi
 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB"
 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
 	AC_SUBST([XNEST_LIBS])
-- 
1.6.3.rc1.2.g0164.dirty



More information about the xorg-devel mailing list