Commit 1a1a05ac authored by Shane Snyder's avatar Shane Snyder
Browse files

rados headers are located w/in rados directory

parent ed62cf78
...@@ -44,7 +44,7 @@ AC_ARG_WITH([rados], ...@@ -44,7 +44,7 @@ AC_ARG_WITH([rados],
[], []) [], [])
if test x"$with_rados" == "xyes" ; then if test x"$with_rados" == "xyes" ; then
# check for RADOS headers and libraries # check for RADOS headers and libraries
AC_CHECK_HEADERS([librados.h rados_types.h], AC_CHECK_HEADERS([rados/librados.h rados/rados_types.h],
[], [],
[AC_MSG_ERROR([RADOS support requested but could not find RADOS headers!])], [AC_MSG_ERROR([RADOS support requested but could not find RADOS headers!])],
[]) [])
...@@ -52,9 +52,10 @@ if test x"$with_rados" == "xyes" ; then ...@@ -52,9 +52,10 @@ if test x"$with_rados" == "xyes" ; then
[], [],
[AC_MSG_ERROR([RADOS support requested but could not link against librados!])]) [AC_MSG_ERROR([RADOS support requested but could not link against librados!])])
# both found, set output to additionally build tests against RADOS
AM_CONDITIONAL(HAVE_RADOS, test x"$with_rados" == "xyes")
fi fi
# both found, set output to additionally build tests against RADOS
AM_CONDITIONAL(HAVE_RADOS, test x"$with_rados" == "xyes")
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <assert.h> #include <assert.h>
#ifdef USE_RADOS #ifdef USE_RADOS
#include <librados.h> #include <rados/librados.h>
#else #else
#include <librados-mobject-store.h> #include <librados-mobject-store.h>
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment