[PPL-devel] [GIT] ppl/ppl(master): New configure option --with-gmp-prefix supersedes the (now removed)

[Roberto Bagnara]

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

Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date:   Sun Jul 12 21:39:46 2009 +0200

New configure option --with-gmp-prefix supersedes the (now removed)
options --with-libgmp-prefix and --with-libgmpxx-prefix.

---

 NEWS               |    3 +++
 README.configure   |    6 +++---
 TODO               |    2 --
 m4/ac_check_gmp.m4 |    6 +++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index dec828b..adb43c5 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ o  When the PPL has been configured with
    procedure checks that the FPU can indeed be controlled and fails if
    that is not the case.
 
+o  New configure option --with-gmp-prefix supersedes the (now removed)
+   options --with-libgmp-prefix and --with-libgmpxx-prefix.
+
 o  The Java interface has to be explicitly initialized before use by
    calling static method Parma_Polyhedra_Library.initialize_library().
    Initialization makes more explicit the exact point where PPL
diff --git a/README.configure b/README.configure
index 0db173a..5dc7a51 100644
--- a/README.configure
+++ b/README.configure
@@ -99,7 +99,7 @@ is not standard for your compiler and/or for your linker, you will
 have to make sure the configure script of the PPL is invoked with,
 among others, the option
 
-  --with-libgmpxx-prefix=<GMP prefix>
+  --with-gmp-prefix=<GMP prefix>
 
 If you use shared libraries, consult the documentation of your dynamic
 linker/loader (`man ld.so' will do on most Un*x-like systems) to see
@@ -151,7 +151,7 @@ you can configure the PPL with a command like
   CPPFLAGS=-D_GCC_LIMITS_H_ /path/to/ppl-x.y/configure \
     --with-cxx=icpc --with-cc=icc \
     --with-cxxflags=-pch \
-    --with-libgmpxx-prefix=/opt/intel/cce/10.1.018
+    --with-gmp-prefix=/opt/intel/cce/10.1.018
 
 Notice that the `CPPFLAGS=-D_GCC_LIMITS_H_' environment variable
 assignment is required in order to overcome a bug in the Intel C/C++
@@ -170,7 +170,7 @@ Then you can configure the PPL with a command like
   /path/to/ppl/configure --with-cc="como --c" --with-cxx="como -tused" \
     --with-cxxflags="-g++ --remarks --long_long \
     --display_error_number --diag_suppress 340,401,679" \
-    --disable-shared --with-libgmpxx-prefix=/opt/comeau/local
+    --disable-shared --with-gmp-prefix=/opt/comeau/local
 
 Notice the use of the option `--disable-shared' both in the configuration
 of GMP and the configuration of the PPL.  This is due to the fact that
diff --git a/TODO b/TODO
index 47cbef8..a94f7d4 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,6 @@
 Enhancements for PPL 0.11
 =========================
 
-- Consider adding the --with-gmp configure option, removing
-  --with-libgmp-prefix and --with-libgmpxx-prefix.
 - Add the domain of circular linear progressions.
 - Finish the domain of intervals.
 - Make all the *affine*image() methods uniform as far as the
diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4
index c57c448..62ebce7 100644
--- a/m4/ac_check_gmp.m4
+++ b/m4/ac_check_gmp.m4
@@ -42,9 +42,13 @@ AC_ARG_WITH(gmp-build,
     LDFLAGS="$LDFLAGS -L$gmp_build_dir -L$gmp_build_dir/.libs"
     LDFLAGS="$LDFLAGS -L$gmp_build_dir/tune"
   else
-    AC_MSG_ERROR([cannot use --with-gmp-build and --with-libgmp* together])
+    AC_MSG_ERROR([cannot use --with-gmp-build and --with-gmp-prefix together])
   fi)
 
+dnl Both libgmp and libbmpxx come from the gmp package.
+AC_LIB_FROMPACKAGE([gmp], [gmp])
+AC_LIB_FROMPACKAGE([gmpxx], [gmp])
+
 dnl Check how to link with libgmp.
 AC_LIB_LINKFLAGS([gmp])