From 3658157b6015cb4864570a438204b1d552d1fc00 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Mon, 8 Oct 2012 10:04:25 -0700 Subject: Makefile: Updates to eliminates warnings, add test for boost system lib. --- Makefile.am | 1 + configure.ac | 4 ++++ src/gtest/Makefile.am | 1 + src/gtest/configure.ac | 1 + 4 files changed, 7 insertions(+) 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/configure.ac b/configure.ac index d5e9ebfc7fe..97797228162 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,9 @@ 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"])) +AC_CHECK_LIB(boost_system-mt, main, [], + AC_MSG_ERROR(["Boost system library not found."])) + AC_LANG([C]) AC_CHECK_MEMBER([struct fiemap_extent.fe_logical], 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]) -- cgit v1.2.1 From 151d9403c5fd04ea54c98e78b13a3e80201a3e9f Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Mon, 8 Oct 2012 18:12:06 -0700 Subject: Makefiles: ignore the m4 macro directory --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 194dd2b6335..6e00ff8297b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,7 @@ src/kvstorebench # temporary directory used by e.g. "make distcheck", e.g. ceph-0.42 /ceph-[0-9]*/ + +# M4 Macro directory +m4/ +src/gtest/m4/ -- cgit v1.2.1 From 7ea734c472b4bd34b87b8ef3352c4df65931f800 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Mon, 8 Oct 2012 19:18:56 -0700 Subject: Makefiles: Missing boost library should not be fatal. --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 97797228162..9bf808990f2 100644 --- a/configure.ac +++ b/configure.ac @@ -361,8 +361,10 @@ 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_MSG_ERROR(["Boost system library not found."])) + AC_MSG_NOTICE(["Boost system library not found."])) AC_LANG([C]) -- cgit v1.2.1 From 071fdc217a2401fb53876a4b5906ebcefec57667 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Mon, 8 Oct 2012 22:56:05 -0700 Subject: Makefile: Improve test for boost system library. --- configure.ac | 3 ++- src/leveldb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9bf808990f2..cc7236824c8 100644 --- a/configure.ac +++ b/configure.ac @@ -364,7 +364,8 @@ AC_CHECK_HEADER([boost/statechart/state.hpp], [], # If we have the boost system library installed, then we may want to link # with it. AC_CHECK_LIB(boost_system-mt, main, [], - AC_MSG_NOTICE(["Boost system library not found."])) + [AC_CHECK_LIB(boost_system, main, [], + AC_MSG_NOTICE(["Boost system library not found."]))]) AC_LANG([C]) diff --git a/src/leveldb b/src/leveldb index f2d406b4213..be23f7880b6 160000 --- a/src/leveldb +++ b/src/leveldb @@ -1 +1 @@ -Subproject commit f2d406b4213a22bfed3acfdb071fbec9ca9205cc +Subproject commit be23f7880b64514de1c727b86f0ccefe5540519e -- cgit v1.2.1 From 0219b66e04cc45f5438a92c9bac31c1e3787e827 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Mon, 8 Oct 2012 23:45:45 -0700 Subject: leveldb: fix-up submodule entry. --- src/leveldb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/leveldb b/src/leveldb index be23f7880b6..f2d406b4213 160000 --- a/src/leveldb +++ b/src/leveldb @@ -1 +1 @@ -Subproject commit be23f7880b64514de1c727b86f0ccefe5540519e +Subproject commit f2d406b4213a22bfed3acfdb071fbec9ca9205cc -- cgit v1.2.1 From 3ecd28913913228aa1e6a77cb050b3fcd5f2a9b5 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Tue, 9 Oct 2012 09:28:22 -0700 Subject: Makefile: update submodule reference for leveldb. --- src/leveldb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/leveldb b/src/leveldb index f2d406b4213..e9d7916ce65 160000 --- a/src/leveldb +++ b/src/leveldb @@ -1 +1 @@ -Subproject commit f2d406b4213a22bfed3acfdb071fbec9ca9205cc +Subproject commit e9d7916ce652bfaed334106f4bf83f4d65f5c66e -- cgit v1.2.1 From 0cc828ba22e4beb872e735a5e8de8d2e519ef68f Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Tue, 9 Oct 2012 12:24:16 -0700 Subject: Makefiles: Update submodule reference to latestes for leveldb. --- src/leveldb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/leveldb b/src/leveldb index e9d7916ce65..ac2f95d3501 160000 --- a/src/leveldb +++ b/src/leveldb @@ -1 +1 @@ -Subproject commit e9d7916ce652bfaed334106f4bf83f4d65f5c66e +Subproject commit ac2f95d3501233fb2a951760d16b77d7efb4dba2 -- cgit v1.2.1 From d28ba52b5f39d71248d53501db55fba087b3003b Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Tue, 9 Oct 2012 13:10:15 -0700 Subject: autogen.sh: Create m4 directory for leveldb submodule. --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 1eb2abc221d..6dc98085f6b 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 m4 && autoreconf -fvi; ) exit -- cgit v1.2.1 From f525534b5f7f95b67630035ed2cd51c81febf224 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Tue, 9 Oct 2012 13:36:43 -0700 Subject: autogen.sh: On some platforms, the m4 is created earlier. --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 6dc98085f6b..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 && mkdir m4 && autoreconf -fvi; ) +( cd src/leveldb && mkdir -p m4 && autoreconf -fvi; ) exit -- cgit v1.2.1 From 4c134a42d9fedfaac5f94a64d84d125d6747705c Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Tue, 9 Oct 2012 15:09:11 -0700 Subject: Makefiles: Add ar-lib to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6e00ff8297b..502f0183260 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,7 @@ 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]*/ -- cgit v1.2.1 From 55115642f18189088b319fc78af74331da8f17b2 Mon Sep 17 00:00:00 2001 From: Gary Lowell Date: Thu, 11 Oct 2012 11:05:10 -0700 Subject: Makefile: Add CRYPTO_C(XX)FLAGS to librdb --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- cgit v1.2.1