From f1af9e5f460e7e04222953d9d958b6d5eb2c56ea Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Thu, 6 May 2010 21:53:42 +0000 Subject: [PATCH] Allow all the versions greater than 0.10 of PPL. 2010-05-05 Sebastian Pop * configure.ac: Allow all the versions greater than 0.10 of PPL. * configure: Regenerated. From-SVN: r159134 --- ChangeLog | 5 +++++ configure | 8 +++----- configure.ac | 6 ++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64b2de3354d..a78216d678d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-05 Sebastian Pop + + * configure.ac: Allow all the versions greater than 0.10 of PPL. + * configure: Regenerated. + 2010-04-27 Roland McGrath H.J. Lu diff --git a/configure b/configure index 90b754e55b0..cfec344880f 100755 --- a/configure +++ b/configure @@ -5801,8 +5801,6 @@ fi # Check for PPL -ppl_major_version=0 -ppl_minor_version=10 ppllibs=" -lppl_c -lppl -lgmpxx" pplinc= @@ -5859,8 +5857,8 @@ fi if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pplinc $gmpinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5 -$as_echo_n "checking for version $ppl_major_version.$ppl_minor_version of PPL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 (or later revision) of PPL" >&5 +$as_echo_n "checking for version 0.10 (or later revision) of PPL... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "ppl_c.h" @@ -5868,7 +5866,7 @@ int main () { - #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 choke me #endif diff --git a/configure.ac b/configure.ac index ba690241e35..f3ef304b9b2 100644 --- a/configure.ac +++ b/configure.ac @@ -1531,8 +1531,6 @@ AC_ARG_WITH(boot-ldflags, AC_SUBST(poststage1_ldflags) # Check for PPL -ppl_major_version=0 -ppl_minor_version=10 ppllibs=" -lppl_c -lppl -lgmpxx" pplinc= @@ -1573,9 +1571,9 @@ ENABLE_PPL_CHECK=yes) if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pplinc $gmpinc" - AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL]) + AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) AC_TRY_COMPILE([#include "ppl_c.h"],[ - #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 choke me #endif ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])