diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-10-01 21:35:31 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-10-01 21:35:31 +0000 |
| commit | 96d1c3daff7efdd2d853864fb820bc7cf413624e (patch) | |
| tree | b995c98a2be18182d6cb52e81de5bf712b475f06 /config | |
| parent | d0b49d588033ab8140bdf297c9cdf73b1088fe68 (diff) | |
replacement implementation for clock_gettime() on mac os x, build portability (resolving mac os x issues), code cleanup, fix compiler warnings
Diffstat (limited to 'config')
| -rw-r--r-- | config/cvc4.m4 | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/config/cvc4.m4 b/config/cvc4.m4 index ea7d77223..718cdadd3 100644 --- a/config/cvc4.m4 +++ b/config/cvc4.m4 @@ -19,34 +19,35 @@ do case $ac_option in -*|*=*) ;; production|production-*|debug|debug-*|default|default-*|competition|competition-*) - ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\?'` + # regexp `\?' not supported on Mac OS X + ac_option_build=`expr "$ac_option" : '\([[^-]]*\)-\{0,1\}'` ac_cvc4_build_profile_set=yes AC_MSG_NOTICE([CVC4: building profile $ac_option_build]) for x in optimized statistics assertions tracing muzzle coverage profiling; do - if expr "$ac_option" : '.*-no'$x'-\|.*-no'$x'$' >/dev/null; then + if expr "$ac_option" : '.*-no'$x'-\{0,1\}$' >/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 + if expr "$ac_option" : '.*-'$x'-\{0,1\}$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-$x\""' fi done - if expr "$ac_option" : '.*-nostaticbinary-\|.*-nostaticbinary$' >/dev/null; then + if expr "$ac_option" : '.*-nostaticbinary-\{0,1\}$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--disable-static-binary\""' fi - if expr "$ac_option" : '.*-staticbinary-\|.*-staticbinary$' >/dev/null; then + if expr "$ac_option" : '.*-staticbinary-\{0,1\}$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-static-binary\""' fi - if expr "$ac_option" : '.*-nodebugsymbols-\|.*-nodebugsymbols$' >/dev/null; then + if expr "$ac_option" : '.*-nodebugsymbols-\{0,1\}$' >/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 + if expr "$ac_option" : '.*-debugsymbols-\{0,1\}$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--enable-debug-symbols\""' fi for x in cln gmp; do - if expr "$ac_option" : '.*-no'$x'-\|.*-no'$x'$' >/dev/null; then + if expr "$ac_option" : '.*-no'$x'-\{0,1\}$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--without-$x\""' fi - if expr "$ac_option" : '.*-'$x'-\|.*-'$x'$' >/dev/null; then + if expr "$ac_option" : '.*-'$x'-\{0,1\}$' >/dev/null; then eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"--with-$x\""' fi done |