diff options
| author | Gary Lowell <glowell@inktank.com> | 2012-10-08 10:04:25 -0700 |
|---|---|---|
| committer | Gary Lowell <glowell@inktank.com> | 2012-10-15 14:14:34 -0700 |
| commit | 3658157b6015cb4864570a438204b1d552d1fc00 (patch) | |
| tree | c4b637663865f493180527644d1dc4e2da6fa9d2 | |
| parent | aed3612f875a3aeb6463011cb630adc7c936adbd (diff) | |
| download | ceph-3658157b6015cb4864570a438204b1d552d1fc00.tar.gz | |
Makefile: Updates to eliminates warnings, add test for boost system lib.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/gtest/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gtest/configure.ac | 1 |
4 files changed, 7 insertions, 0 deletions
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]) |