require boost library (but not the threading support---that's only necessary for...

diff --git a/configure.ac b/configure.ac
index bd31b9824edd8d6a37df5935b18ee1ccc595b947..15fb16d3f55b52eb7dfa2d69973779cd4e064df1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -862,25 +862,20 @@ AC_CHECK_HEADERS([getopt.h unistd.h])
 
 AC_CHECK_DECLS([optreset], [], [], [#include <getopt.h>])
 
-# look for boost library, but don't make it a fatal error if not found
-cvc4_has_threads=maybe
+# require boost library
+BOOST_REQUIRE()
+
+# look for boost threading library
 AC_ARG_WITH([portfolio],
     AS_HELP_STRING([--with-portfolio], [build the multithreaded portfolio version of CVC4 (pcvc4)]))
-if test $cvc4_has_threads = maybe; then
-  cvc4_save_LDFLAGS="$LDFLAGS"
-  if test "$enable_static_binary" = yes; then
-    LDFLAGS="-static $LDFLAGS"
-  fi
-  BOOST_REQUIRE([], [cvc4_has_threads=no])
-  if test $cvc4_has_threads = no; then
-    AC_MSG_WARN([disabling multithreaded support])
-  else
-    cvc4_has_threads=yes
-    BOOST_THREADS([], [AC_MSG_WARN([disabling multithreaded support])
-                       cvc4_has_threads=no])
-  fi
-  LDFLAGS="$cvc4_save_LDFLAGS"
-fi
+cvc4_save_LDFLAGS="$LDFLAGS"
+if test "$enable_static_binary" = yes; then
+  LDFLAGS="-static $LDFLAGS"
+fi
+cvc4_has_threads=yes
+BOOST_THREADS([], [AC_MSG_WARN([disabling multithreaded support])
+                   cvc4_has_threads=no])
+LDFLAGS="$cvc4_save_LDFLAGS"
 if test $cvc4_has_threads = no; then
   if test x$with_portfolio = xyes; then
     AC_MSG_ERROR([user gave --with-portfolio but could not build with threads; maybe boost threading library is missing?])