diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-18 11:47:50 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-18 11:47:50 -0500 |
| commit | b605831878a2be688379f593ce39d37a3d7e18a3 (patch) | |
| tree | a5f77e254ba4eb67d49c8be518bdb632671ca97e /configure.ac | |
| parent | afde8f8570dce4431c28ba6e8cbd69361d656374 (diff) | |
Fix configure handling for CLN (should fix win32 nightly builds)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 48ba71670..a9177fbc5 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ m4_define(_CVC4_RELEASE_STRING, _CVC4_MAJOR[.]_CVC4_MINOR[]m4_if(_CVC4_RELEASE,[ dnl Preprocess CL args. Defined in config/cvc4.m4 CVC4_AC_INIT -AC_PREREQ(2.61) -AC_INIT([cvc4], _CVC4_RELEASE_STRING) +AC_PREREQ([2.61]) +AC_INIT([cvc4], _CVC4_RELEASE_STRING, [cvc-bugs@cs.nyu.edu]) AC_CONFIG_SRCDIR([src/include/cvc4_public.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) @@ -297,9 +297,20 @@ if test $cvc4_use_cln != 0; then # PKG_CHECK_MODULES([CLN], ...). That's why things are so convoluted here, # we have to have PKG_CHECK_MODULES _exactly_ once in configure.ac ! PKG_CHECK_MODULES([CLN], [cln >= 1.2.2], - [cvc4_use_cln=1 - AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cln/cln.h>]], [[cln::cl_F pi = "3.1415926";]])]) + [AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <cln/cln.h>]], [[cln::cl_F pi = "3.1415926";]])], [ + cvc4_use_cln=1 + ], [ + if test $cvc4_use_cln = 1; then + # fail + AC_MSG_ERROR([CLN installation missing, too old, or not functional for this architecture]) + else + # fall back to GMP + AC_MSG_NOTICE([CLN installation missing, too old, or not functional for this architecture, will use gmp instead]) + cvc4_use_cln=0 + cvc4_use_gmp=1 + fi + ]) AC_LANG_POP([C++]) ], [if test $cvc4_use_cln = 1; then @@ -308,6 +319,8 @@ if test $cvc4_use_cln != 0; then else # fall back to GMP AC_MSG_NOTICE([CLN not installed (or too old) or pkgconfig missing, will use gmp]) + cvc4_use_cln=0 + cvc4_use_gmp=1 fi ] ) |