From: Josh Durgin Date: Wed, 16 Jul 2014 18:33:03 +0000 (-0700) Subject: rocksdb: update submodule makefile X-Git-Tag: v0.85~119^2~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb1cd7801e994ce80497eb6b6befd9e5da55e60a;p=ceph.git rocksdb: update submodule makefile Signed-off-by: Josh Durgin --- diff --git a/configure.ac b/configure.ac index b246607d1699..0d7bf5d39f80 100644 --- a/configure.ac +++ b/configure.ac @@ -548,8 +548,8 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"], [AC_CONFIG_SUBDIRS([src/rocksdb])]) AS_IF([test "x$with_librocksdb_static" = "xyes"], [AC_DEFINE([HAVE_LIBROCKSDB], [1], [Defined if you have librocksdb enabled])]) -AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "$with_librocksdb_static" = "yes" ]) -AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "$with_librocksdb_static" = "yes" -o "$with_librocksdb" = "yes" ]) +AM_CONDITIONAL(WITH_SLIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" ]) +AM_CONDITIONAL(WITH_LIBROCKSDB, [ test "x$with_librocksdb_static" = "xyes" -o "x$with_librocksdb" = "xyes" ]) # use system libs3? AC_ARG_WITH([system-libs3], diff --git a/src/rocksdb b/src/rocksdb index 2b3260d5dd43..151991550c8e 160000 --- a/src/rocksdb +++ b/src/rocksdb @@ -1 +1 @@ -Subproject commit 2b3260d5dd439edcb460f606fc48f226645d8111 +Subproject commit 151991550c8eea54d58aff3c33d81a0b6295c9b1