configure: --with-system-leveldb

Default to bundled leveldb.  Optionally check.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/configure.ac b/configure.ac
index 001edea87fad7c198c20e623278b3ef4822f382c..06045c6d1f4665883ab6afad7555b2087a6ce6d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -297,6 +297,17 @@ AC_ARG_WITH([ocf],
             [with_ocf=no])
 AM_CONDITIONAL(WITH_OCF, [ test "$with_ocf" = "yes" ])
 
+# use system leveldb?
+AC_ARG_WITH([system-leveldb],
+       [AS_HELP_STRING([--with-system-leveldb], [use system leveldb])],
+       ,
+       [with_system_leveldb=no])
+AS_IF([test "x$with_system_leveldb" = xyes],
+           [AC_CHECK_LIB([leveldb], [leveldb_open], [], [AC_MSG_FAILURE([libleveldb not found])], [-lsnappy -lpthread])])
+AS_IF([test "x$with_system_leveldb" = xcheck],
+           [AC_CHECK_LIB([leveldb], [leveldb_open], [with_system_leveldb=yes], [], [-lsnappy -lpthread])])
+AM_CONDITIONAL(WITH_SYSTEM_LEVELDB, [ test "$with_system_leveldb" = "yes" ])
+
 # use libaio?
 AC_ARG_WITH([libaio],
             [AS_HELP_STRING([--without-libaio], [disable libaio use by journal])],

diff --git a/src/Makefile.am b/src/Makefile.am
index f2075da4c1844de401673cf908127acbed9df99d..62d5e3b661e9e295f6a1cae94a85bd55b9a11365 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = gnu
-SUBDIRS = ocf leveldb
+SUBDIRS = ocf
 DIST_SUBDIRS = gtest ocf leveldb
 CLEANFILES =
 bin_PROGRAMS =
@@ -43,13 +43,21 @@ bin_PROGRAMS += ceph-mon
 # osd
 ceph_osd_SOURCES = ceph_osd.cc objclass/class_debug.cc \
               objclass/class_api.cc
-ceph_osd_LDADD = libosd.la libos.la leveldb/libleveldb.a $(LIBGLOBAL_LDA)
+ceph_osd_LDADD = libosd.la libos.la $(LIBGLOBAL_LDA)
+ceph_osd_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+bin_PROGRAMS += ceph-osd
+
+if WITH_SYSTEM_LEVELDB
+ceph_osd_LDADD += -lleveldb -lsnappy
+else
+ceph_osd_LDADD += leveldb/libleveldb.a
+ceph_osd_CXXFLAGS += -I$(top_srcdir)/src/leveldb/include
+SUBDIRS += leveldb
+endif
+
 if LINUX
 ceph_osd_LDADD += -ldl
 endif
-bin_PROGRAMS += ceph-osd
-ceph_osd_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} \
-       -I$(top_srcdir)/src/leveldb/include
 
 # mds
 ceph_mds_SOURCES = ceph_mds.cc