diff options
| author | Eric Anholt <eric@anholt.net> | 2007-08-31 15:16:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-08-31 15:58:16 -0700 |
| commit | 1a125b521434da7ba3a41b6398c7f094867908e0 (patch) | |
| tree | 665db7ba92011e7d5df40c96efdd6e1fd189d419 | |
| parent | f499c2ea0a90a69713daef8f9497463229384964 (diff) | |
Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
(cherry picked from commit 07630d897ef37cad8b79d073d9edc891d5a7bddd)
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | render/picturestr.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ad6ae4bfa..da90ede68 100644 --- a/configure.ac +++ b/configure.ac @@ -628,7 +628,13 @@ PKG_CHECK_MODULES(PIXMAN, $PIXMAN) AC_SUBST(PIXMAN_CFLAGS) dnl Core modules for most extensions, et al. -REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]" +# Require updated renderproto for ABI sanity if we're 64-bit. +if test "$ac_cv_sizeof_unsigned_long" = 8; then + RENDERPROTO="[renderproto >= 0.9.3]" +else + RENDERPROTO="renderproto" +fi +REQUIRED_MODULES="[randrproto >= 1.2] $RENDERPROTO [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau fontenc $PIXMAN" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas diff --git a/render/picturestr.h b/render/picturestr.h index 01572ec48..aabce842e 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -24,8 +24,8 @@ #ifndef _PICTURESTR_H_ #define _PICTURESTR_H_ -#include "glyphstr.h" #include "scrnintstr.h" +#include "glyphstr.h" #include "resource.h" typedef struct _DirectFormat { |