Makefile: Updates to eliminates warnings, add test for boost system lib.

diff --git a/Makefile.am b/Makefile.am
index b938f916d54fd88bc96fd7829f44e411effc4e7b..3f4231438ad6fe7fcc035e54c72cb6fb85b6e4b5 100644 (file)
--- 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 d5e9ebfc7fe9dad5da351372077476117fab092e..9779722816281262c81113afcb46834163ae6290 100644 (file)
--- 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 4f97c6fff4894499d6a254a7d4685ef158069dd6..8622e0a5935137a13a0be168176c1b0b7c3013b4 100644 (file)
--- 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 1b91237461e39ff61b630f3e019adfeeeb783ae6..b44954a596ed359a2e5f3cce14616e76106a492e 100644 (file)
--- 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])