From 88b52c971b43248e6ceacf1c8140a06427d0418d Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 5 Mar 2010 08:26:37 +0000 Subject: * public/private code untangled (smt/smt_engine.h no longer #includes expr/node.h). This removes the warnings we had during compilation, and heads off a number of potential linking errors due to improper inlining of private (library-only) stuff in client (out-of-library) code. * "configure" now takes some options as part of a "bare-option" build type (e.g., "./configure debug-coverage" or "./configure production-muzzle"). * split cdo.h, cdlist.h, cdmap.h, and cdset.h from context.h * split cdlist_black unit test from context_black * implement CDMap<>. * give ExprManagers ownership of the context (and have SmtEngine share that one) * fix main driver to properly report file-not-found * fix MemoryMappedInputBuffer class to report reasons for "errno"-returned system errors * src/expr/attribute.h: context-dependent attribute kinds now supported * test/unit/expr/node_white.h: context-dependent attribute tests * src/prop/cnf_conversion.h and associated parts of src/util/options.h and src/main/getopt.cpp: obsolete command-line option, removed. * src/util/Assert.h: assertions are now somewhat more useful (in debug builds, anyway) during stack unwinding. * test/unit/theory/theory_black.h: test context-dependent behavior of registerTerm() attribute for theories * src/expr/node_builder.h: formatting, fixes for arithmetic convenience node builders, check memory allocations * test/unit/expr/node_builder_black.h: add tessts for addition, subtraction, unary minus, and multiplication convenience node builders * src/expr/attribute.h: more comments * (various) code formatting, comment cleanup, added throws specifier to some destructors * contrib/code-checker: prototype perl script to test (some) code policy * contrib/indent-settings: command line for GNU indent to indent using CVC4 style (sort of; this is a work in progress) * COPYING: legal stuff * DESIGN_QUESTIONS: obsolete, removed --- config/cvc4.m4 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/cvc4.m4 b/config/cvc4.m4 index 1cde462b5..8106f1383 100644 --- a/config/cvc4.m4 +++ b/config/cvc4.m4 @@ -18,10 +18,25 @@ for ac_option do case $ac_option in -*|*=*) ;; - production|debug|default|competition) - ac_cvc4_build_profile_set=yes - AC_MSG_NOTICE([CVC4: building profile $ac_option]) - ac_option="--with-build=$ac_option" ;; + production|production-*|debug|debug-*|default|default-*|competition|competition-*) + ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\?'` + ac_cvc4_build_profile_set=yes + AC_MSG_NOTICE([CVC4: building profile $ac_option_build]) + for x in optimized assertions tracing muzzle coverage profiling; do + if expr "$ac_option" : '.*-no'$x'-\|.*-no'$x'$' >/dev/null; then + eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-$x\""' + fi + if expr "$ac_option" : '.*-'$x'-\|.*-'$x'$' >/dev/null; then + eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-$x\""' + fi + done + if expr "$ac_option" : '.*-nodebugsymbols-\|.*-nodebugsymbols$' >/dev/null; then + eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-debug-symbols\""' + fi + if expr "$ac_option" : '.*-debugsymbols-\|.*-debugsymbols$' >/dev/null; then + eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-debug-symbols\""' + fi + ac_option="--with-build=$ac_option_build" esac eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"$ac_option\""' done -- cgit v1.2.3