diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-17 12:40:50 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-17 17:12:57 -0500 |
| commit | 464bbe3b057bde32b9e0e1aa1f989818dba585db (patch) | |
| tree | ed9557aaa18b744bcc1766668d42534ff3f6d402 /config | |
| parent | 6b0e8bdbe37c3a04ba43fb379270df4726502a63 (diff) | |
some config changes: new --bsd option, readline gives warning, default build is now production.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cvc4.m4 | 3 | ||||
| -rw-r--r-- | config/readline.m4 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/cvc4.m4 b/config/cvc4.m4 index aefce193a..4b8b2e342 100644 --- a/config/cvc4.m4 +++ b/config/cvc4.m4 @@ -16,8 +16,9 @@ AC_DEFUN([CVC4_REWRITE_ARGS_FOR_BUILD_PROFILE], handle_option() { ac_option="$[]1" case $ac_option in + --bsd) ac_option='CVC4_BSD_LICENSED_CODE_ONLY=1' ;; -*|*=*) ;; - production|production-*|debug|debug-*|default|default-*|competition|competition-*) + production|production-*|debug|debug-*|competition|competition-*) # regexp `\?' not supported on Mac OS X ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\{0,1\}'` ac_cvc4_build_profile_set=yes diff --git a/config/readline.m4 b/config/readline.m4 index 44be9ff41..c298f3db4 100644 --- a/config/readline.m4 +++ b/config/readline.m4 @@ -9,6 +9,9 @@ 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]) + with_readline=no else if test "$with_readline" = check; then AC_MSG_RESULT([no preference by user, will auto-detect]) |