diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-05-02 16:06:19 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-05-02 16:06:19 +0000 |
| commit | e5206966df456dbb9cad97809d6e10f2bca13b2e (patch) | |
| tree | e5901142468340f9effa3253d1e936a194a0a029 | |
| parent | 8194d145769a87bed07b8ace89eb8b793d14bddd (diff) | |
more minor fixes related to last few commits
| -rw-r--r-- | config/readline.m4 | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/config/readline.m4 b/config/readline.m4 index 4ebe6bce3..5535a45f4 100644 --- a/config/readline.m4 +++ b/config/readline.m4 @@ -20,6 +20,7 @@ else [if test "$with_readline" != check; then AC_MSG_FAILURE([cannot find libreadline!]) fi], -lncurses) + if [ -z "$READLINE_LDFLAGS" ]; then with_readline=no; else with_readline=yes; fi fi ])# CVC4_CHECK_FOR_READLINE diff --git a/configure.ac b/configure.ac index 9082fb6ff..ff150844f 100644 --- a/configure.ac +++ b/configure.ac @@ -903,14 +903,16 @@ Replay : $enable_replay Assertions : $enable_assertions Tracing : $enable_tracing Muzzle : $enable_muzzle + +Unit tests : $support_unit_tests gcov support : $enable_coverage gprof support: $enable_profiling -Unit tests : $support_unit_tests +Readline : $with_readline +TLS support : $CVC4_TLS Static libs : $enable_static Shared libs : $enable_shared Static binary: $enable_static_binary -TLS support : $CVC4_TLS MP library : $mplibrary diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 42f6592ea..3b05765fd 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -133,7 +133,7 @@ $(WHITE_TESTS:%=%.lo): %_white.lo: @abs_builddir@/%_white.cpp @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@ $< $(WHITE_TESTS): %_white: %_white.lo $(AM_LIBADD_WHITE) - $(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_WHITE) $(AM_LDFLAGS_WHITE) $< + $(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_WHITE) $(AM_LDFLAGS) $(AM_LDFLAGS_WHITE) $< $(BLACK_TESTS:%=%.lo): %_black.lo: @abs_builddir@/%_black.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -MT $@ -MD -MP -MF $(DEPDIR)/$(@:%.lo=%).Tpo -c -o $@ $< @@ -144,7 +144,7 @@ $(BLACK_TESTS:%=%.lo): %_black.lo: @abs_builddir@/%_black.cpp @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@ $< $(BLACK_TESTS): %_black: %_black.lo $(AM_LIBADD_BLACK) - $(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_BLACK) $(AM_LDFLAGS_BLACK) $< + $(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_BLACK) $(AM_LDFLAGS) $(AM_LDFLAGS_BLACK) $< $(PUBLIC_TESTS:%=%.lo): %_public.lo: @abs_builddir@/%_public.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -MT $@ -MD -MP -MF $(DEPDIR)/$(@:%.lo=%).Tpo -c -o $@ $< @@ -155,7 +155,7 @@ $(PUBLIC_TESTS:%=%.lo): %_public.lo: @abs_builddir@/%_public.cpp @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@ $< $(PUBLIC_TESTS): %_public: %_public.lo $(AM_LIBADD_PUBLIC) - $(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_PUBLIC) $(AM_LDFLAGS_PUBLIC) $< + $(AM_V_CXXLD)$(unit_LINK) $(AM_LIBADD_PUBLIC) $(AM_LDFLAGS) $(AM_LDFLAGS_PUBLIC) $< else |