Skip to content

Commit

Permalink
Merge pull request ceph#8637 from roidayan/xio-remove_rdma_and_ibverb…
Browse files Browse the repository at this point in the history
…s_from_configure

confiugre.ac: remove rdma and ibverbs dependency from xio
  • Loading branch information
cbodley committed May 3, 2016
2 parents 251104f + bc060bc commit 75a9e43
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -724,16 +724,14 @@ AM_CONDITIONAL(ENABLE_XIO, [test "x$enable_xio" = "xyes"])
if test "x$enable_xio" = x"yes"; then
AC_CHECK_HEADER([libxio.h], [], AC_MSG_ERROR([Cannot find header 'libxio.h'.]))
AC_CHECK_LIB([xio], [xio_init], [], AC_MSG_FAILURE([Accelio libxio not found]))
AC_CHECK_LIB([ibverbs], [ibv_query_device], [], AC_MSG_FAILURE([libibverbs not found]))
AC_CHECK_LIB([rdmacm], [rdma_connect], [], AC_MSG_FAILURE([librdmacm not found]))

# Also require boost-regex, used in address_helper
AC_CHECK_LIB(boost_regex, main, [],
AC_MSG_FAILURE(["Boost regex library not found."]))

AC_DEFINE([HAVE_XIO], [1], [Accelio conditional compilation])

XIO_LIBS="-lxio -libverbs -lrdmacm"
XIO_LIBS="-lxio"
AC_SUBST(XIO_LIBS)
fi

Expand Down

0 comments on commit 75a9e43

Please sign in to comment.