build: Remove rdma/ibverbs

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>

INSTALL

@@ -45,48 +45,12 @@ balance:~/corosync# make install
 We have strived very hard to avoid dependencies as much as possible, but there
 are two required libraries: LibQB and NSS.
 
-Optional dependencies are support for Infiniband RDMA, DBUS, SNMP and libstatgrab.
+Optional dependencies are support for DBUS, SNMP and libstatgrab.
 
 The nss packages required to build corosync can usually be found by
 installing the "nss-devel" and "nspr-devel" packages (names may vary, please use
 distribution's package manager). Also don't forget to install pkgconfig.
 
------------------------------------------
-* Building with Infiniband RDMA support *
------------------------------------------
-Infiniband RDMA build support is disabled by default.  To enable rdma during
-building:
-balance:~/corosync% ./configure --enable-rdma
-
-Infiniband rdma support requires the libibverbs and librdmacm packages (and
-their -devel counterparts).  Corosync requires the use of pkgconfig in these
-packages.  The Corosync maintainers have sent patches for this feature upstream
-to the Infiniband maintainers.
-
-If your version of these packages don't have pkgconfig support, you will see an
-error during configure such as:
-
-checking for ibverbs... configure: error: Package requirements (ibverbs) were not met:
-
-No package 'ibverbs' found
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables ibverbs_CFLAGS
-and ibverbs_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-** Follow the directions:
-balance:~/corosync/trunk% export ibverbs_CFLAGS=-I/usr/include/infiniband
-balance:~/corosync/trunk% export ibverbs_LIBS=-libverbs
-balance:~/corosync/trunk% export rdmacm_CFLAGS=-I/usr/include/rdma
-balance:~/corosync/trunk% export rdmacm_LIBS=-lrdmacm
-balance:~/corosync/trunk% ./configure --enable-rdma
-
-Hopefully pkgconfig support is added in your distribution's version of
-libibverbs and librdmacm soon if you run into this problem.
-
 -----------------------------------------
 * Building with SNMP/DBUS support *
 -----------------------------------------

corosync.spec.in

@@ -10,7 +10,6 @@
 %bcond_with monitoring
 %bcond_with snmp
 %bcond_with dbus
-%bcond_with rdma
 %bcond_with systemd
 %bcond_with upstart
 %bcond_with xmlconf
@@ -50,9 +49,6 @@ BuildRequires: autoconf automake libtool
 %if %{with monitoring}
 BuildRequires: libstatgrab-devel
 %endif
-%if %{with rdma}
-BuildRequires: libibverbs-devel librdmacm-devel
-%endif
 %if %{with snmp}
 BuildRequires: net-snmp-devel
 %endif
@@ -83,12 +79,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ./autogen.sh
 %endif
 
-%if %{with rdma}
-export ibverbs_CFLAGS=-I/usr/include/infiniband \
-export ibverbs_LIBS=-libverbs \
-export rdmacm_CFLAGS=-I/usr/include/rdma \
-export rdmacm_LIBS=-lrdmacm \
-%endif
 %{configure} \
 %if %{with testagents}
 	--enable-testagents \
@@ -105,9 +95,6 @@ export rdmacm_LIBS=-lrdmacm \
 %if %{with dbus}
 	--enable-dbus \
 %endif
-%if %{with rdma}
-	--enable-rdma \
-%endif
 %if %{with systemd}
 	--enable-systemd \
 %endif

exec/Makefile.am

@@ -45,10 +45,9 @@ TOTEM_SRC		= totemip.c totemnet.c totemudp.c \
 
 lib_LTLIBRARIES		= libtotem_pg.la
 libtotem_pg_la_SOURCES	= $(TOTEM_SRC)
-libtotem_pg_la_CFLAGS	= $(nss_CFLAGS) $(rdmacm_CFLAGS) $(ibverbs_CFLAGS)
+libtotem_pg_la_CFLAGS	= $(nss_CFLAGS)
 libtotem_pg_la_LDFLAGS	= -version-number $(subst .,:,$(SONAME))
-libtotem_pg_la_LIBADD	= -lpthread $(LIBQB_LIBS) $(nss_LIBS) \
-			  $(rdmacm_LIBS) $(ibverbs_LIBS) -lknet
+libtotem_pg_la_LIBADD	= -lpthread $(LIBQB_LIBS) $(nss_LIBS) -lknet
 
 sbin_PROGRAMS		= corosync
 

exec/totemnet.c

@@ -37,9 +37,6 @@
 
 #include <assert.h>
 
-#ifdef HAVE_RDMA
-#include <totemiba.h>
-#endif
 #include <totemudp.h>
 #include <totemudpu.h>
 #include <totemknet.h>