diff options
| author | frsyuki <frsyuki@5a5092ae-2292-43ba-b2d5-dcab9c1a2731> | 2009-02-15 09:09:59 +0000 |
|---|---|---|
| committer | frsyuki <frsyuki@5a5092ae-2292-43ba-b2d5-dcab9c1a2731> | 2009-02-15 09:09:59 +0000 |
| commit | 40ca91e10110ed7de761a04a96119d14adb41fff (patch) | |
| tree | 110f93b7789a3c0f7b0622b67d8a0f027d96a6fb | |
| parent | ccdb39ac60f256db36a9a82b3792182f3b339d13 (diff) | |
| download | msgpack-python-40ca91e10110ed7de761a04a96119d14adb41fff.tar.gz | |
lang/c/msgpack: ./configure requires erb
git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@77 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | cpp/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/configure.in | 6 | ||||
| -rw-r--r-- | cpp/type/map.hpp | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 33acfa6..474d6e2 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,6 @@ AM_INIT_AUTOMAKE(msgpack, 0.1.0) AC_CONFIG_HEADER(config.h) AC_PROG_LIBTOOL -#AC_CHECK_PROG(RUBY, ruby, ruby, [$PATH]) AC_CONFIG_SUBDIRS([c cpp]) AC_OUTPUT([Makefile]) 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 { |