diff options
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | xlators/storage/bd_map/src/bd_map.h | 6 |
2 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6b10365d908..06c1ff6936d 100644 --- a/configure.ac +++ b/configure.ac @@ -282,9 +282,18 @@ AC_ARG_ENABLE([bd-xlator], if test "x$enable_bd_xlator" != "xno"; then AC_CHECK_LIB([lvm2app], - [lvm_init], + [lvm_init,lvm_lv_from_name], [HAVE_BD_LIB="yes"], [HAVE_BD_LIB="no"]) + + if test "x$HAVE_BD_LIB" = "xyes"; then + # lvm_lv_from_name() has been made public with lvm2-2.02.79 + AC_CHECK_DECLS( + [lvm_lv_from_name], + [NEED_LVM_LV_FROM_NAME_DECL="no"], + [NEED_LVM_LV_FROM_NAME_DECL="yes"], + [[#include <lvm2app.h>]]) + fi fi if test "x$enable_bd_xlator" = "xyes" -a "x$HAVE_BD_LIB" = "xno"; then @@ -297,6 +306,10 @@ if test "x${enable_bd_xlator}" != "xno" -a "x${HAVE_BD_LIB}" = "xyes"; then BUILD_BD_XLATOR=yes AC_DEFINE(HAVE_BD_XLATOR, 1, [define if lvm2app library found and bd xlator enabled]) + if test "x$NEED_LVM_LV_FROM_NAME_DECL" = "xyes"; then + AC_DEFINE(NEED_LVM_LV_FROM_NAME_DECL, 1, [defined if lvm_lv_from_name() + was not found in the lvm2app.h header, but can be linked]) + fi fi AM_CONDITIONAL([ENABLE_BD_XLATOR], [test x$BUILD_BD_XLATOR = xyes]) diff --git a/xlators/storage/bd_map/src/bd_map.h b/xlators/storage/bd_map/src/bd_map.h index 1a0f4248ed4..fa10e97a947 100644 --- a/xlators/storage/bd_map/src/bd_map.h +++ b/xlators/storage/bd_map/src/bd_map.h @@ -30,6 +30,12 @@ #define BACKEND_VG "vg" +/* lvm2-2.02.79 added this in lvm2app.h, but it is available for linking in + * older versions already */ +#if NEED_LVM_LV_FROM_NAME_DECL +lv_t lvm_lv_from_name(vg_t vg, const char *name); +#endif + enum gf_bd_mem_types_ { gf_bd_fd = gf_common_mt_end + 1, gf_bd_private, |