diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-12-08 20:39:12 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-12-08 20:39:12 +0000 |
| commit | 0e1168af7a33263c73e1c51055c8980153d8d3b7 (patch) | |
| tree | 6b4fd96c3a3f4680e77c7fde2b20c5c1abfd896d /configure.ac | |
| parent | a85aa996535fb86009c1869f0daa1c27c980a566 (diff) | |
check in automake/libtool/autoconf-generated files; add better file not found handling
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index f8e789ab8..5c6629ca5 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,10 @@ CVC4_PARSER_LIBRARY_VERSION=0:0:0 # really irritating: AC_CANONICAL_* bash $@ config_cmdline="$@" +# turn off static lib building by default +AC_ENABLE_SHARED +AC_DISABLE_STATIC + AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -246,16 +250,11 @@ AC_LIBTOOL_WIN32_DLL - - # Checks for programs. AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LIBTOOL -#AM_PROG_LEX -#AC_PROG_YACC - # Check for ANTLR runantlr script (defined in config/antlr.m4) AC_PROG_ANTLR @@ -281,7 +280,7 @@ elif test -z "$CXXTEST"; then CXXTEST= fi fi -AC_ARG_VAR(CXXTEST, [path to CxxTest installation]) +AC_ARG_WITH([cxxtest], [AS_HELP_STRING([--with-cxxtest=dir], [path to CxxTest installation])]) AM_CONDITIONAL([HAVE_CXXTESTGEN], [test -n "$CXXTESTGEN"]) AC_ARG_VAR(TEST_CPPFLAGS, [CXXFLAGS to use when testing (default=$CPPFLAGS)]) |