more minor fixes related to last few commits

diff --git a/config/readline.m4 b/config/readline.m4
index 4ebe6bce33c68035b6c446ff0e163689db78e0c9..5535a45f4520ecf2fcdfba6aa658235db5894d7f 100644 (file)
--- 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 9082fb6ff720dd487c37c4257ea7745f9b7472f9..ff150844ff591271494dcc7c2699c56a0e4e8195 100644 (file)
--- 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 42f6592ea94ef8448653466b6bf1efbcb895de24..3b05765fd71b717b0a1229089c42b7d8b732be7d 100644 (file)
--- 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