diff --git a/bin/src-utils/build-setup-debian.sh b/bin/src-utils/build-setup-debian.sh index c52c0b636..531e11ddb 100755 --- a/bin/src-utils/build-setup-debian.sh +++ b/bin/src-utils/build-setup-debian.sh @@ -133,10 +133,10 @@ cd ~; rm -rf libevent-1.4.14b-stable* # Thrift cd /usr/src wget http://apache.mirror.anlx.net/thrift/0.8.0/thrift-0.8.0.tar.gz -tar xzvf thrift-0.7.0.tar.gz +tar xzvf thrift-0.8.0.tar.gz rm -f thrift -ln -s thrift-0.7.0 thrift -cd thrift-0.7.0 +ln -s thrift-0.8.0 thrift +cd thrift-0.8.0 chmod 755 ./configure ./lib/php/src/ext/thrift_protocol/build/shtool ./configure make diff --git a/cmake/FindBerkeleyDB.cmake b/cmake/FindBerkeleyDB.cmake index a90c7f969..49ded84ff 100644 --- a/cmake/FindBerkeleyDB.cmake +++ b/cmake/FindBerkeleyDB.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 Hypertable, Inc. +# Copyright (C) 2007-2013 Hypertable, Inc. # # This file is part of Hypertable. # @@ -34,6 +34,7 @@ find_path(BDB_INCLUDE_DIR db_cxx.h NO_DEFAULT_PATH PATHS /usr/local/include/db48 /opt/local/include/db48 /usr/local/include + /usr/include/db4.8 /usr/include/db4 /usr/include ) diff --git a/cmake/FindCronolog.cmake b/cmake/FindCronolog.cmake index 074b4fcde..0dcc838dc 100644 --- a/cmake/FindCronolog.cmake +++ b/cmake/FindCronolog.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 Hypertable, Inc. +# Copyright (C) 2007-2013 Hypertable, Inc. # # This file is part of Hypertable. # @@ -16,7 +16,7 @@ # along with Hypertable. If not, see # -# - Find Cronolog +# - Find Cronolog # Check if the cronolog binary is installed # # CRONOLOG_DIR - Directory where cronolog is located @@ -24,6 +24,7 @@ find_path(CRONOLOG_DIR cronolog /usr/bin + /usr/sbin /usr/local/bin /usr/local/sbin )