From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Jul 2014 00:03:06 +0000 (-0700)
Subject: configure: enable static rocksdb if check and c++11
X-Git-Tag: v0.85~119^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8fcbb65901164f6259d0b127780d2daab7159430;p=ceph.git

configure: enable static rocksdb if check and c++11

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

diff --git a/configure.ac b/configure.ac
index 368afd1e0d9d..6dec9be14eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -529,6 +529,11 @@ AS_IF([test "x$with_kinetic" = "xyes"],
             [AC_DEFINE([HAVE_KINETIC], [1], [Defined if you have kinetic enabled])])
 AM_CONDITIONAL(WITH_KINETIC, [ test "$with_kinetic" = "yes" ])
 
+# check for c++11 (but do not enable it)
+old_cxxflags="$CXXFLAGS"
+AX_CXX_COMPILE_STDCXX_11([], [optional])
+CXXFLAGS="$old_cxxflags"
+
 # use rocksdb
 AC_ARG_WITH([librocksdb],
             [AS_HELP_STRING([--with-librocksdb], [build rocksdb support])],
@@ -544,8 +549,8 @@ AC_ARG_WITH([librocksdb-static],
             [AS_HELP_STRING([--with-librocksdb-static], [build rocksdb support])],
             [],
             [with_librocksdb_static=no])
-AS_IF([test "x$with_librocksdb_static" = "xyes"],
-            [AX_CXX_COMPILE_STDCXX_11])
+AS_IF([test "x$with_librocksdb_static" = "xcheck" -a "x$HAVE_CXX11" = "x1" ],
+            [with_librocksdb_static="yes"])
 AS_IF([test "x$with_librocksdb_static" = "xyes"],
             [AC_CONFIG_SUBDIRS([src/rocksdb])])
 AS_IF([test "x$with_librocksdb_static" = "xyes"],