Module: ppl/ppl Branch: master Commit: 9c19bc2b318a35016e0189f9552c98910be37f53 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9c19bc2b318a3...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sat Jan 9 16:32:08 2010 +0100

Added support for GMP 5.0.

---

configure.ac | 2 +- m4/ac_check_gmp.m4 | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac index 400030b..0c9a321 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script.

# Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre9], [ppl-devel@cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre10], [ppl-devel@cs.unipr.it], [ppl])

# Minimum Autoconf version required. AC_PREREQ(2.61) diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index 60cecdc..15acb18 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -71,6 +71,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #GMP version 4.1.3 or higher is required #endif

+#ifndef BITS_PER_MP_LIMB +#define BITS_PER_MP_LIMB GMP_LIMB_BITS +#endif + int main() { std::string header_version; @@ -97,11 +101,11 @@ main() { return 1; }

- if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS - || GMP_LIMB_BITS != mp_bits_per_limb) { + if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB + || BITS_PER_MP_LIMB != mp_bits_per_limb) { std::cerr << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" - << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" + << "header gives " << BITS_PER_MP_LIMB << ";\n" << "library gives " << mp_bits_per_limb << ".\n" << "This probably means you are on a bi-arch system and\n" << "you are compiling with the wrong header or linking with\n"