]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rocksdb: update submodule makefile
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 16 Jul 2014 18:33:03 +0000 (11:33 -0700)
committerSage Weil <sage@redhat.com>
Fri, 1 Aug 2014 04:11:24 +0000 (21:11 -0700)
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
configure.ac
src/rocksdb

index b246607d1699ab53000d7cfc03120f630d0ad832..0d7bf5d39f80394f663a8c48904f7974d50b6110 100644 (file)
@@ -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],
index 2b3260d5dd439edcb460f606fc48f226645d8111..151991550c8eea54d58aff3c33d81a0b6295c9b1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2b3260d5dd439edcb460f606fc48f226645d8111
+Subproject commit 151991550c8eea54d58aff3c33d81a0b6295c9b1