svn commit: r1549960 - in /zookeeper/trunk: CHANGES.txt src/contrib/zkfuse/README.txt src/contrib/zkfuse/configure.ac

[mi...@apache.org]

Author: michim
Date: Tue Dec 10 20:38:32 2013
New Revision: 1549960

URL: http://svn.apache.org/r1549960
Log:
ZOOKEEPER-1019. zkfuse doesn't list dependency on boost in README (Raul Gutierrez Segales via michim)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/contrib/zkfuse/README.txt
    zookeeper/trunk/src/contrib/zkfuse/configure.ac

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1549960&r1=1549959&r2=1549960&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Dec 10 20:38:32 2013
@@ -488,6 +488,9 @@ BUGFIXES:
   ZOOKEEPER-1459. Standalone ZooKeeperServer is not closing
   the transaction log files on shutdown (Rakesh R via fpj)
 
+  ZOOKEEPER-1019. zkfuse doesn't list dependency on boost in README
+  (Raul Gutierrez Segales via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/contrib/zkfuse/README.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkfuse/README.txt?rev=1549960&r1=1549959&r2=1549960&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkfuse/README.txt (original)
+++ zookeeper/trunk/src/contrib/zkfuse/README.txt Tue Dec 10 20:38:32 2013
@@ -11,6 +11,7 @@ Pre-requisites
   a. fuse
   b. log4cxx
   c. pthread
+  d. boost
 
 Build instructions
 ------------------

Modified: zookeeper/trunk/src/contrib/zkfuse/configure.ac
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkfuse/configure.ac?rev=1549960&r1=1549959&r2=1549960&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkfuse/configure.ac (original)
+++ zookeeper/trunk/src/contrib/zkfuse/configure.ac Tue Dec 10 20:38:32 2013
@@ -23,7 +23,7 @@ AC_PROG_CXX
 
 # Checks for libraries.
 AC_CHECK_LIB([fuse], [main])
-AC_CHECK_LIB([log4cxx], [main])
+AC_CHECK_LIB([log4cxx], [main], [], [AC_MSG_ERROR("We need log4cxx to build zkfuse")])
 AC_CHECK_LIB([thread], [thr_create])
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([rt], [clock_gettime])
@@ -32,7 +32,8 @@ AC_CHECK_LIB([nsl], [gethostbyname])
 AC_CHECK_LIB([ulockmgr], [ulockmgr_op])
 
 ZOOKEEPER_PATH=${BUILD_PATH}/../../c
-AC_CHECK_LIB(zookeeper_mt, main, [ZOOKEEPER_LD="-L${ZOOKEEPER_PATH}/.libs -lzookeeper_mt"],,["-L${ZOOKEEPER_PATH}/.libs"])
+ZOOKEEPER_BUILD_PATH=${BUILD_PATH}/../../../build/c
+AC_CHECK_LIB(zookeeper_mt, main, [ZOOKEEPER_LD="-L${ZOOKEEPER_BUILD_PATH}/.libs -lzookeeper_mt"],,["-L${ZOOKEEPER_BUILD_PATH}/.libs"])
 
 AC_SUBST(ZOOKEEPER_PATH)
 AC_SUBST(ZOOKEEPER_LD)
@@ -41,6 +42,7 @@ AC_SUBST(ZOOKEEPER_LD)
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/utility.hpp boost/weak_ptr.hpp],, AC_MSG_ERROR([boost library headers not found. Please install boost library.]))
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL