Added --enable-cache, --enable-doxygen to acprep

3 files changed, 45 insertions, 34 deletions

diff --git a/tools/configure.ac b/tools/configure.ac
index 7762b5ba..e3149a18 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -65,6 +65,16 @@ AC_ARG_ENABLE(doxygen,
 
 AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue)
 
+AC_ARG_ENABLE(cache,
+  [  --enable-cache           Enable use of the --cache option],
+  [case "${enableval}" in
+    yes) cache=true ;;
+    no)  cache=false ;;
+    *) AC_MSG_ERROR(bad value ${enableval} for --enable-cache) ;;
+  esac],[cache=false])
+
+AM_CONDITIONAL(USE_CACHE_OPTION, test x$cache = xtrue)
+
 AC_ARG_ENABLE(python,
   [  --enable-python          Turn on Python support (experimental)],
   [case "${enableval}" in
@@ -315,38 +325,36 @@ else
 fi
 
 # check for boost_serialization
-# AC_CACHE_CHECK(
-#   [if boost_serialization is available],
-#   [boost_serialization_cpplib_avail_cv_],
-#   [boost_serialization_save_libs=$LIBS
-#    LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS"
-#    AC_LANG_PUSH(C++)
-#    AC_LINK_IFELSE(
-#      [AC_LANG_PROGRAM(
-#         [[#include <boost/archive/binary_oarchive.hpp>
-#           #include <iostream>
-#           struct foo {
-#             int a;
-#             template<class Archive>
-#             void serialize(Archive & ar, const unsigned int) {
-#               ar & a;
-#             }
-#           };]],
-#         [[boost::archive::binary_oarchive oa(std::cout);
-#           foo x;
-#           oa << x;]])],
-#      [boost_serialization_cpplib_avail_cv_=true],
-#      [boost_serialization_cpplib_avail_cv_=false])
-#    AC_LANG_POP
-#    LIBS=$boost_serialization_save_libs])
-# 
-# if [test x$boost_serialization_cpplib_avail_cv_ = xtrue ]; then
-#   AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available])
-#   LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS"
-# fi
-# AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue)
-
-AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, false)
+AC_CACHE_CHECK(
+  [if boost_serialization is available],
+  [boost_serialization_cpplib_avail_cv_],
+  [boost_serialization_save_libs=$LIBS
+   LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS"
+   AC_LANG_PUSH(C++)
+   AC_LINK_IFELSE(
+     [AC_LANG_PROGRAM(
+        [[#include <boost/archive/binary_oarchive.hpp>
+          #include <iostream>
+          struct foo {
+            int a;
+            template<class Archive>
+            void serialize(Archive & ar, const unsigned int) {
+              ar & a;
+            }
+          };]],
+        [[boost::archive::binary_oarchive oa(std::cout);
+          foo x;
+          oa << x;]])],
+     [boost_serialization_cpplib_avail_cv_=true],
+     [boost_serialization_cpplib_avail_cv_=false])
+   AC_LANG_POP
+   LIBS=$boost_serialization_save_libs])
+
+if [test x$boost_serialization_cpplib_avail_cv_ = xtrue -a x$cache = xtrue]; then
+  AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available])
+  LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS"
+fi
+AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue -a x$cache = xtrue)
 
 # check for Python
 if [ test x$python = xtrue ]; then
diff --git a/tools/proof b/tools/proof
index 7e345234..daebc68c 100755
--- a/tools/proof
+++ b/tools/proof
@@ -14,7 +14,8 @@ fi
 
 rm -fr ~/Products/ledger*
 
-time ./acprep --universal -j16 --warn proof 2>&1 | \
+time ./acprep --enable-cache --enable-doxygen \
+    --universal -j16 --warn proof 2>&1 | \
     tee ~/Desktop/proof.log
 
 if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then
diff --git a/tools/push b/tools/push
index a9c6bc53..0c1a019a 100755
--- a/tools/push
+++ b/tools/push
@@ -10,6 +10,8 @@ git checkout next
 git rebase master
 git push
 git checkout master
-./acprep --universal -j16 --warn opt upload
+./acprep --enable-cache --universal -j16 --warn opt upload
+./acprep --enable-cache --universal -j16 --warn opt make speedtest | \
+    tee build/last-speed.txt
 mv *.dmg* build
 git checkout next