Merge remote-tracking branch 'gh/wip-fedora18' into next

8 files changed, 18 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 194dd2b6335..502f0183260 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,11 @@ src/ocf/ceph
 src/ocf/rbd
 src/omapbench
 src/kvstorebench
+ar-lib
 
 # temporary directory used by e.g. "make distcheck", e.g. ceph-0.42
 /ceph-[0-9]*/
+
+# M4 Macro directory
+m4/
+src/gtest/m4/
diff --git a/Makefile.am b/Makefile.am
index b938f916d54..3f4231438ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = gnu
+ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec
 # the "." here makes sure check-local builds gtest before it is used
 SUBDIRS = . src man
diff --git a/autogen.sh b/autogen.sh
index 1eb2abc221d..08e435b40c1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,5 +19,5 @@ autoconf
 autoheader
 automake -a --add-missing -Wall
 ( cd src/gtest && autoreconf -fvi; )
-( cd src/leveldb && autoreconf -fvi; )
+( cd src/leveldb && mkdir -p m4 && autoreconf -fvi; )
 exit
diff --git a/configure.ac b/configure.ac
index d5e9ebfc7fe..cc7236824c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_PREREQ(2.59)
 # VERSION define is not used by the code.  It gets a version string
 # from 'git describe'; see src/ceph_ver.[ch]
 AC_INIT([ceph], [0.52], [ceph-devel@vger.kernel.org])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_SUBDIRS([src/gtest])
 AC_CONFIG_SUBDIRS([src/leveldb])
@@ -360,6 +361,12 @@ AC_CHECK_HEADER([boost/random/discrete_distribution.hpp],
 AC_CHECK_HEADER([boost/statechart/state.hpp], [],
     AC_MSG_FAILURE(["Can't find boost statechart headers; need 1.34 or later"]))
 
+# If we have the boost system library installed, then we may want to link
+# with it.
+AC_CHECK_LIB(boost_system-mt, main, [],
+    [AC_CHECK_LIB(boost_system, main, [],
+        AC_MSG_NOTICE(["Boost system library not found."]))])
+
 AC_LANG([C])
 
 AC_CHECK_MEMBER([struct fiemap_extent.fe_logical],
diff --git a/src/Makefile.am b/src/Makefile.am
index 9ad7ca0665f..d75bb9d52f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -375,8 +375,8 @@ librbd_la_SOURCES = \
 	cls/lock/cls_lock_client.cc \
 	cls/lock/cls_lock_types.cc \
 	cls/lock/cls_lock_ops.cc
-librbd_la_CFLAGS = ${AM_CFLAGS}
-librbd_la_CXXFLAGS = ${AM_CXXFLAGS}
+librbd_la_CFLAGS = ${AM_CFLAGS} ${CRYPTO_CFLAGS}
+librbd_la_CXXFLAGS = ${AM_CXXFLAGS} ${CRYPTO_CXXFLAGS}
 librbd_la_LIBADD = librados.la
 librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 \
 	-export-symbols-regex '^rbd_.*' $(PTHREAD_LIBS) $(EXTRALIBS) 
diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
index 4f97c6fff48..8622e0a5935 100644
--- a/src/gtest/Makefile.am
+++ b/src/gtest/Makefile.am
@@ -1,5 +1,6 @@
 # Automake file
 
+ACLOCAL_AMFLAGS = -I m4
 AM_LDFLAGS = -lpthread
 
 # Nonstandard package files for distribution
diff --git a/src/gtest/configure.ac b/src/gtest/configure.ac
index 1b91237461e..b44954a596e 100644
--- a/src/gtest/configure.ac
+++ b/src/gtest/configure.ac
@@ -11,6 +11,7 @@ AC_INIT([Google C++ Testing Framework],
 
 # Provide various options to initialize the Autoconf and configure processes.
 AC_PREREQ([2.59])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([./COPYING])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([build-aux/config.h])
diff --git a/src/leveldb b/src/leveldb
-Subproject f2d406b4213a22bfed3acfdb071fbec9ca9205c
+Subproject ac2f95d3501233fb2a951760d16b77d7efb4dba