diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-01-08 15:32:59 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-01-08 15:32:59 -0500 |
| commit | e6fb65b8a960db1e4a21d7414f3270f03a474384 (patch) | |
| tree | 78c4c7ead119c05fe8f03a808679bac560b47ee0 /config | |
| parent | 9e376ab6c826c951a0c9e1bf3d07a902249b34fd (diff) | |
| parent | 312918e68d4410359b55258dc2b9e9cdfb21f211 (diff) | |
Merge branch '1.3.x'
Conflicts:
COPYING
NEWS
config/cvc4.m4
Diffstat (limited to 'config')
| -rw-r--r-- | config/cvc4.m4 | 34 | ||||
| -rw-r--r-- | config/readline.m4 | 4 |
2 files changed, 33 insertions, 5 deletions
diff --git a/config/cvc4.m4 b/config/cvc4.m4 index 87d984ab4..40e2054e6 100644 --- a/config/cvc4.m4 +++ b/config/cvc4.m4 @@ -13,12 +13,40 @@ dnl _AS_ME_PREPARE AC_DEFUN([CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE], [m4_divert_push([PARSE_ARGS])dnl +CVC4_BSD_LICENSED_CODE_ONLY=1 + +m4_divert_once([HELP_ENABLE], [[ +Licensing and performance options: + --bsd disable all GPL dependences (default) + --enable-gpl permit GPL dependences, if available + --best turn on dependences known to give best performance]])dnl + handle_option() { ac_option="$[]1" case $ac_option in - --bsd) ac_option='CVC4_BSD_LICENSED_CODE_ONLY=1' ;; - -enable-proofs | --enable-proofs) ac_option='--enable-proof' ;; - -*|*=*) ;; + --bsd|--disable-gpl|CVC4_BSD_LICENSED_CODE_ONLY=1) + if test "$CVC4_LICENSE_OPTION" = gpl; then AC_ERROR([cannot give both --bsd and --enable-gpl]); fi + CVC4_LICENSE_OPTION=bsd + ac_option="CVC4_BSD_LICENSED_CODE_ONLY=1" + eval $ac_option + ;; + --enable-gpl|--gpl|CVC4_BSD_LICENSED_CODE_ONLY=0) + if test "$CVC4_LICENSE_OPTION" = bsd; then AC_ERROR([cannot give both --bsd and --enable-gpl]); fi + CVC4_LICENSE_OPTION=gpl + ac_option="CVC4_BSD_LICENSED_CODE_ONLY=0" + eval $ac_option + ;; + --best) + # set the best configuration + handle_option --with-readline + handle_option --with-cln + return + ;; + -enable-proofs|--enable-proofs) + ac_option='--enable-proof' + ;; + -*|*=*) + ;; production|production-*|debug|debug-*|competition|competition-*) # regexp `\?' not supported on Mac OS X ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\{0,1\}'` diff --git a/config/readline.m4 b/config/readline.m4 index c298f3db4..e9ce921fb 100644 --- a/config/readline.m4 +++ b/config/readline.m4 @@ -9,8 +9,8 @@ readline_compentry_func_returns_charp=0 READLINE_LIBS= if test "$with_readline" = no; then AC_MSG_RESULT([no, readline disabled by user]) -elif test "$with_readline" = check -a -n "$CVC4_BSD_LICENSED_CODE_ONLY"; then - AC_MSG_RESULT([no, user requested BSD-compatible dependences only]) +elif test "$with_readline" = check -a "$CVC4_BSD_LICENSED_CODE_ONLY" = 1; then + AC_MSG_RESULT([no, using BSD-compatible dependences only]) with_readline=no else if test "$with_readline" = check; then |