Hi,

running 1.5.2 xorg-server's configure with the option --disable-screensaver, I 
noticed that configure always checks for screensaverproto. Attached is a patch, 
which moves the check for screensaverproto from the main REQUIRED_MODULES block 
to the conditional screensaver block.

Fine regards,
Christoph Berg
--- xorg-server-1.5.2/configure.ac.old	2008-10-20 13:16:05.643287907 +0200
+++ xorg-server-1.5.2/configure.ac	2008-10-20 13:16:54.435288163 +0200
@@ -662,7 +662,7 @@
 	RENDERPROTO="renderproto"
 fi
 
-REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans bigreqsproto resourceproto fontsproto [inputproto >= 1.4.4] [kbproto >= 1.0.3]"
 REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.9.5]"
 
 dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
@@ -814,6 +814,7 @@
 AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes])
 if test "x$SCREENSAVER" = xyes; then
 	AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES [scrnsaverproto >= 1.1]"
 fi
 
 AM_CONDITIONAL(RES, [test "x$RES" = xyes])

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg

Reply via email to