[PATCH v3] configure.ac: Include missing proto declarations in SDK_REQUIRED_MODULES

Emil Velikov emil.l.velikov at gmail.com
Tue Oct 23 12:40:33 PDT 2012


Namely - resourceproto, scrnsaverproto and xf86bigfontproto

When compiling xserver with the above enabled, their respective headers are
included in <xorg/extinit.h>, thus they become part of the sdk
(xorg-server-devel as known by distribution packagers).
Currently package maintainers provide various workarounds to avoid issues
while building video and input ddx drivers

Evidently this is what XV and XINERAMA do, so let's fix the last few

NOTE: This is a candidate for the 1.13 branch

v2: Add commit message, include xf86bigfontproto
v3: Spelling typos
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---

Gaetan Nadon, I forgot to mention that the logic regarding resourceproto
applies for scrnsaverproto as well

 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index e686614..2e1ec8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1028,12 +1028,14 @@ 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"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $SCRNSAVERPROTO"
 fi
 
 AM_CONDITIONAL(RES, [test "x$RES" = xyes])
 if test "x$RES" = xyes; then
 	AC_DEFINE(RES, 1, [Support X resource extension])
 	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $RESOURCEPROTO"
 fi
 
 # The XRes extension may support client ID tracking only if it has
@@ -1177,6 +1179,7 @@ AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])
 if test "x$XF86BIGFONT" = xyes; then
 	AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])
 	REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $BIGFONTPROTO"
 fi
 
 AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])
-- 
1.7.12.4



More information about the xorg-devel mailing list