diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/configure.in | 6 | ||||
| -rw-r--r-- | cpp/type/map.hpp | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am index e244763..61a616a 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -30,7 +30,7 @@ unpack.lo: msgpack/type/tuple.hpp zone.lo: msgpack/type/tuple.hpp msgpack/type/tuple.hpp: msgpack/type/tuple.hpp.erb - erb $< > $@ + $(ERB) $< > $@ MOSTLYCLEANFILES = msgpack/type/tuple.hpp diff --git a/cpp/configure.in b/cpp/configure.in index a60a489..2c3e5d0 100644 --- a/cpp/configure.in +++ b/cpp/configure.in @@ -9,7 +9,11 @@ fi AC_PROG_CXX AC_PROG_LIBTOOL -AC_CHECK_PROG(ERB, erb, erb, [$PATH]) + +AC_CHECK_PROG(ERB, erb, erb) +if test "x$ERB" = x; then + AC_MSG_ERROR([cannot find erb. Ruby is needed to build.]) +fi AC_CHECK_LIB(stdc++, main) diff --git a/cpp/type/map.hpp b/cpp/type/map.hpp index 3b544df..c79f31c 100644 --- a/cpp/type/map.hpp +++ b/cpp/type/map.hpp @@ -21,6 +21,7 @@ #include "msgpack/object.hpp" #include <map> #include <vector> +#include <algorithm> namespace msgpack { |