From 32341a8cd76e98ed3dae4cbb716c7d659ebf4937 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Fri, 3 Apr 2015 08:52:33 +0200
Subject: [PATCH 2/6] Revert "configure: Fix bad import from upstream"
This reverts commit 30079cde611bc1a6d0429c3d7af8912fc3fa6f4a.
As librados2-devel package is no longer available in RHEV enviroment, we have to remove the series.
---
configure | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index e250607..66bdb06 100755
--- a/configure
+++ b/configure
@@ -1772,24 +1772,41 @@ fi
if test "$rbd" != "no" ; then
cat > $TMPC <<EOF
#include <stdio.h>
-#include <rbd/librbd.h>
+#include <rados/librados.h>
+int main(void) { rados_initialize(0, NULL); return 0; }
+EOF
+ rbd_libs="-lrados -lcrypto"
+ if compile_prog "" "$rbd_libs" ; then
+ librados_too_old=no
+ cat > $TMPC <<EOF
+#include <stdio.h>
+#include <rados/librados.h>
+#ifndef CEPH_OSD_TMAP_SET
+#error missing CEPH_OSD_TMAP_SET
+#endif
int main(void) {
- rados_t cluster;
- rados_create(&cluster, NULL);
+ int (*func)(const rados_pool_t pool, uint64_t *snapid) = rados_selfmanaged_snap_create;
+ rados_initialize(0, NULL);
return 0;
}
EOF
- rbd_libs="-lrbd -lrados"
- if compile_prog "" "$rbd_libs" ; then
- rbd=yes
- libs_tools="$rbd_libs $libs_tools"
- libs_softmmu="$rbd_libs $libs_softmmu"
+ if compile_prog "" "$rbd_libs" ; then
+ rbd=yes
+ libs_tools="$rbd_libs $libs_tools"
+ libs_softmmu="$rbd_libs $libs_softmmu"
+ else
+ rbd=no
+ librados_too_old=yes
+ fi
else
if test "$rbd" = "yes" ; then
- feature_not_found "rados block device" "Install librbd/ceph devel"
+ feature_not_found "rados block device"
fi
rbd=no
fi
+ if test "$librados_too_old" = "yes" ; then
+ echo "-> Your librados version is too old - upgrade needed to have rbd support"
+ fi
fi
##########################################
--
1.8.3.1