diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-12-04 21:03:50 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-12-04 21:03:50 +0000 |
| commit | 49c66a500e7252c58e8967d3d9d38d53a95a5318 (patch) | |
| tree | 31d5fc7f54ef4fb403d7d4b32bb7e54dde1b86e4 /configure.ac | |
| parent | a11573cc35202e579c46cd6da478e89321840482 (diff) | |
more build system work
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 068eea929..c7f461128 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ elif test -e src/include/cvc4.h; then AC_MSG_RESULT([builds/$target/$build_type]) rm -f config.log config.status confdefs.h mkdir -p "builds/$target/$build_type" - test -e builds/Makefile || cp Makefile.builds builds/Makefile + test -e builds/Makefile || ln -sf ../Makefile.builds builds/Makefile echo "CURRENT_BUILD = $target/$build_type" > builds/current echo echo cd "builds/$target/$build_type" @@ -242,14 +242,23 @@ 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 +AC_ARG_ENABLE(antlr, AS_HELP_STRING([--enable-antlr],[use Dejan's ANTLR parsers])) +AC_MSG_CHECKING([whether you want to use the ANTLR parsers]) +if test -z "${enable_antlr+set}"; then + enable_antlr=no +fi +AC_MSG_RESULT([$enable_antlr]) +AM_CONDITIONAL(USE_ANTLR, test "$enable_antlr" = yes) +if test "$enable_antlr" = yes; then + AC_PROG_ANTLR + AC_DEFINE(ANTLR_PARSERS, [], [whether we're using ANTLR parsers]) +fi AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, []) if test -z "$DOXYGEN"; then @@ -291,7 +300,7 @@ fi # Checks for libraries. AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/])]) -# Chcek for antlr C++ runtime (defined in config/antlr.m4) +# Check for antlr C++ runtime (defined in config/antlr.m4) AC_LIB_ANTLR @@ -375,6 +384,8 @@ CPPFLAGS : $CPPFLAGS CXXFLAGS : $CXXFLAGS LDFLAGS : $LDFLAGS +Using ANTLR parsers: $enable_antlr + Now just type make, followed by make check or make install, as you like. You can use 'make <build_profile>' to reconfig/build a different profile. |