]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
configure: do not link leveldb with everything
authorDan Mick <dan.mick@inktank.com>
Fri, 18 Jul 2014 04:44:06 +0000 (21:44 -0700)
committerSage Weil <sage@redhat.com>
Fri, 18 Jul 2014 17:30:30 +0000 (10:30 -0700)
Detect leveldb, but do not let autoconf blindly link it with everything on the
planet.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Sighed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 06a8f7b99c5533f397b34f448138220384df60ac)

configure.ac

index 87c9d54a2bc8cb2b52ff52be186789a4f1328b5c..3846812983ee6ab0b8f5dfbf21833928a863c1c1 100644 (file)
@@ -490,9 +490,9 @@ AC_ARG_WITH([ocf],
 AM_CONDITIONAL(WITH_OCF, [ test "$with_ocf" = "yes" ])
 
 # check is snappy-devel is installed, needed by leveldb
-AC_CHECK_LIB([snappy], [snappy_compress], [], [AC_MSG_FAILURE([libsnappy not found])])
+AC_CHECK_LIB([snappy], [snappy_compress], [true], [AC_MSG_FAILURE([libsnappy not found])])
 # use system leveldb
-AC_CHECK_LIB([leveldb], [leveldb_open], [], [AC_MSG_FAILURE([libleveldb not found])], [-lsnappy -lpthread])
+AC_CHECK_LIB([leveldb], [leveldb_open], [true], [AC_MSG_FAILURE([libleveldb not found])], [-lsnappy -lpthread])
 # see if we can use bloom filters with leveldb
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADER([leveldb/filter_policy.h], [AC_DEFINE([HAVE_LEVELDB_FILTER_POLICY], [1], [Defined if LevelDB supports bloom filters ])])