Skip to content

Commit

Permalink
Makefile: Updates to eliminates warnings, add test for boost system lib.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gary Lowell committed Oct 15, 2012
1 parent aed3612 commit 3658157
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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], [[email protected]])
AC_CONFIG_MACRO_DIR([m4])

AC_CONFIG_SUBDIRS([src/gtest])
AC_CONFIG_SUBDIRS([src/leveldb])
Expand Down Expand Up @@ -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],
Expand Down
1 change: 1 addition & 0 deletions src/gtest/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Automake file

ACLOCAL_AMFLAGS = -I m4
AM_LDFLAGS = -lpthread

# Nonstandard package files for distribution
Expand Down
1 change: 1 addition & 0 deletions src/gtest/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down

0 comments on commit 3658157

Please sign in to comment.