diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-13 15:04:53 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-13 15:04:53 -0400 |
| commit | 0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582 (patch) | |
| tree | 985c50c080c077fa931ed9bf01c3895cbb851eda /tools | |
| parent | 40f553228f5a28034c6635fdcb4c86af28a385ed (diff) | |
| parent | cf0147fcd04fc7ec4b3849350430e47169581e64 (diff) | |
| download | fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.tar.gz fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.tar.bz2 fork-ledger-0c699e4d57fe91fa04c4c2f23f9c2f2a6a5da582.zip | |
Merge branch 'next'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 8 | ||||
| -rw-r--r-- | tools/configure.ac | 61 | ||||
| -rwxr-xr-x | tools/push | 5 |
3 files changed, 37 insertions, 37 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index c38f529c..fa83c1ca 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -28,7 +28,6 @@ libledger_util_la_CPPFLAGS = $(lib_cppflags) libledger_util_la_LDFLAGS = -release $(VERSION) libledger_math_la_SOURCES = \ - src/value.cc \ src/balance.cc \ src/quotes.cc \ src/pool.cc \ @@ -45,11 +44,11 @@ libledger_expr_la_SOURCES = \ src/query.cc \ src/predicate.cc \ src/scope.cc \ - src/interactive.cc \ src/expr.cc \ src/op.cc \ src/parser.cc \ - src/token.cc + src/token.cc \ + src/value.cc libledger_expr_la_CPPFLAGS = $(lib_cppflags) libledger_expr_la_LDFLAGS = -release $(VERSION) @@ -107,15 +106,14 @@ pkginclude_HEADERS = \ src/pool.h \ src/quotes.h \ src/balance.h \ - src/value.h \ \ + src/value.h \ src/token.h \ src/parser.h \ src/op.h \ src/exprbase.h \ src/expr.h \ src/scope.h \ - src/interactive.h \ src/predicate.h \ src/query.h \ src/format.h \ diff --git a/tools/configure.ac b/tools/configure.ac index e3149a18..69874101 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -325,36 +325,37 @@ 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 -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) +#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) +AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, false) # check for Python if [ test x$python = xtrue ]; then @@ -11,7 +11,8 @@ git rebase master git push git checkout master ./acprep --enable-cache --universal -j16 --warn opt upload -./acprep --enable-cache --universal -j16 --warn opt make speedtest | \ - tee build/last-speed.txt +cp -p ~/Products/ledger/opt/ledger ~/bin +./acprep --enable-cache --universal -j16 --warn opt make speedtest 2>&1 \ + | tee build/last-speed.txt mv *.dmg* build git checkout next |