[PATCH] only require screensaver-proto if --enable-screensaver

[Mikhail Gusarov <dottedmag@xxxxxxxxxxxxx>]

Attached patch makes screensaver-proto dependency optional, so it won't
be required if --disable-screensaver is passed to configure.

--

Attachment: pgpOkUPryVZWx.pgp
Description: PGP signature

Index: xorg-server/configure.ac
===================================================================
--- xorg-server.orig/configure.ac	2008-09-15 02:50:46.000000000 +0700
+++ xorg-server/configure.ac	2008-09-15 02:51:10.000000000 +0700
@@ -657,7 +657,7 @@
 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.4] [kbproto >= 1.0.3]" 
+REQUIRED_MODULES="[randrproto >= 1.2] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] xtrans bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.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
@@ -804,6 +804,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])

_______________________________________________
xorg mailing list
xorg@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/xorg