diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-31 17:57:50 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-31 18:44:53 -0700 |
| commit | c61d8ce1507318476b75b81bf871da19cb1bf747 (patch) | |
| tree | 9022b98c93e8ea9183745a9a0ff5f54de584e43e | |
| parent | 1c37be80982151a5acd74fe4b960695f604f22ca (diff) | |
Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names
bigreqsproto >= 1.1.0
xcmiscproto >= 1.2.0
xf86bigfontproto >= 1.2.0
| -rw-r--r-- | Xext/bigreq.c | 2 | ||||
| -rw-r--r-- | Xext/xcmisc.c | 2 | ||||
| -rw-r--r-- | Xext/xf86bigfont.c | 3 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/Xext/bigreq.c b/Xext/bigreq.c index e50376c6e..e666a592a 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -36,7 +36,7 @@ from The Open Group. #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include <X11/extensions/bigreqstr.h> +#include <X11/extensions/bigreqproto.h> #include "opaque.h" #include "modinit.h" diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index aed2e4eb4..f644cb458 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -37,7 +37,7 @@ from The Open Group. #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include <X11/extensions/xcmiscstr.h> +#include <X11/extensions/xcmiscproto.h> #include "modinit.h" #if HAVE_STDINT_H diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 9e0b5ea73..aeea23313 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -72,8 +72,7 @@ #include "dixfontstr.h" #include "extnsionst.h" -#define _XF86BIGFONT_SERVER_ -#include <X11/extensions/xf86bigfstr.h> +#include <X11/extensions/xf86bigfproto.h> static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ diff --git a/configure.ac b/configure.ac index c5c069db0..097e7806d 100644 --- a/configure.ac +++ b/configure.ac @@ -708,7 +708,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' dnl Core modules for most extensions, et al. -REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]" +REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas @@ -990,7 +990,7 @@ fi 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 xf86bigfontproto" + REQUIRED_MODULES="$REQUIRED_MODULES [xf86bigfontproto >= 1.2.0]" fi AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes]) |