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:16:01 -0700 |
| commit | 07630d897ef37cad8b79d073d9edc891d5a7bddd (patch) | |
| tree | 6896c096696e83451cdc620c4a47872c6648d6c1 /configure.ac | |
| parent | ca82d4bddf235c9b68d51d68636bab40eafb9889 (diff) | |
Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index cad85a91d..f9c8408a5 100644 --- a/configure.ac +++ b/configure.ac @@ -628,7 +628,14 @@ 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] 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-1 >= 0.9.5]" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas |