xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit ea3b7db4b747f883ef7b8b524ee13bf8a63add14
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Oct 7 18:29:25 2013 +0100

    configure.ac: Include missing proto declarations in SDK_REQUIRED_MODULES
    
    Commits a1d41e311c21e, 7d859bd87834d & 3ed2c6e11298c made extinit.h require
    the XF86 Big Font, XRes & ScrnSaver proto headers, but failed to add them
    to the SDK_REQUIRED_MODULES so pkg-config would find them for driver builds.
    
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 3df579a..67ef3c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1035,12 +1035,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
@@ -1184,6 +1186,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])