diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-31 18:11:46 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-31 18:11:46 -0700 |
| commit | 22e5bd377cddcd9790f33609b7872151bb566f75 (patch) | |
| tree | 5462db96a2c7179ed9837d87d1d304ff093dd911 | |
| parent | 28bb411360603942ac5fcd083da43b8cdb7bb028 (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 | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 1e807d820..15114d9f2 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -37,7 +37,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 1ee173bd6..c4b1f4da7 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -39,7 +39,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 dabbdd6e0..066abf7ae 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 593d85047..8bb9531c2 100644 --- a/configure.ac +++ b/configure.ac @@ -672,7 +672,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.1] [renderproto >= 0.9.3] [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.5] [kbproto >= 1.0.3]" +REQUIRED_MODULES="[randrproto >= 1.2.99.1] [renderproto >= 0.9.3] [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.5] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.13.2]" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas |