X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fautoconf%2Flustre-lnet.m4;h=42ced437c5b5c4a3635728bd3017626444162abb;hb=25929ea0d2955afc6fb1150e57fd8e527ffc6b4f;hp=314e935c8027363f5ca3fdd625246c927c58404d;hpb=0f753ead66cb0bd924ccb656f1a742a0db46038d;p=fs%2Flustre-release.git

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 314e935..42ced43 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1,93 +1,3 @@
-#
-# LN_CONFIG_MAX_PAYLOAD
-#
-# configure maximum payload
-#
-AC_DEFUN([LN_CONFIG_MAX_PAYLOAD], [
-AC_MSG_CHECKING([for non-default maximum LNET payload])
-AC_ARG_WITH([max-payload-mb],
-	AC_HELP_STRING([--with-max-payload-mb=MBytes],
-		[set maximum lnet payload in MBytes]),
-	[
-		AC_MSG_RESULT([$with_max_payload_mb])
-		CONFIG_LNET_MAX_PAYLOAD_MB=$with_max_payload_mb
-		CONFIG_LNET_MAX_PAYLOAD="(($with_max_payload_mb)<<20)"
-	], [
-		AC_MSG_RESULT([no])
-		CONFIG_LNET_MAX_PAYLOAD="LNET_MTU"
-	])
-AC_DEFINE_UNQUOTED(CONFIG_LNET_MAX_PAYLOAD, $CONFIG_LNET_MAX_PAYLOAD,
-	[Max LNET payload])
-]) # LN_CONFIG_MAX_PAYLOAD
-
-#
-# LN_CHECK_GCC_VERSION
-#
-# Check compiler version
-#
-AC_DEFUN([LN_CHECK_GCC_VERSION], [
-AC_MSG_CHECKING([compiler version])
-PTL_CC_VERSION=`$CC --version | awk '/^gcc/{print $ 3}'`
-PTL_MIN_CC_VERSION="3.2.2"
-v2n() {
-	awk -F. '{printf "%d\n", (($ 1)*100+($ 2))*100+($ 3)}'
-}
-if test -z "$PTL_CC_VERSION" -o \
-	$(echo $PTL_CC_VERSION | v2n) -ge $(echo $PTL_MIN_CC_VERSION | v2n); then
-	AC_MSG_RESULT([ok])
-else
-	AC_MSG_RESULT([Buggy compiler found])
-	AC_MSG_ERROR([Need gcc version >= $PTL_MIN_CC_VERSION])
-fi
-]) # LN_CHECK_GCC_VERSION
-
-#
-# LN_FUNC_DEV_GET_BY_NAME_2ARG
-#
-AC_DEFUN([LN_FUNC_DEV_GET_BY_NAME_2ARG], [
-LB_CHECK_COMPILE([if 'dev_get_by_name' has two args],
-dev_get_by_name_2args, [
-	#include <linux/netdevice.h>
-],[
-	dev_get_by_name(NULL, NULL);
-],[
-	AC_DEFINE(HAVE_DEV_GET_BY_NAME_2ARG, 1,
-		[dev_get_by_name has 2 args])
-])
-]) # LN_FUNC_DEV_GET_BY_NAME_2ARG
-
-#
-# LN_CONFIG_AFFINITY
-#
-# check if cpu affinity is available/wanted
-#
-AC_DEFUN([LN_CONFIG_AFFINITY], [
-AC_MSG_CHECKING([whether to enable CPU affinity support])
-AC_ARG_ENABLE([affinity],
-	AC_HELP_STRING([--disable-affinity],
-		[disable process/irq affinity]),
-	[], [enable_affinity="yes"])
-AC_MSG_RESULT([$enable_affinity])
-AS_IF([test "x$enable_affinity" = xyes], [
-	LB_CHECK_COMPILE([if Linux kernel has cpu affinity support],
-	set_cpus_allowed_ptr, [
-		#include <linux/sched.h>
-	],[
-		struct task_struct *t;
-		#if HAVE_CPUMASK_T
-		cpumask_t     m;
-		#else
-		unsigned long m;
-		#endif
-		set_cpus_allowed_ptr(t, &m);
-	],[
-		AC_DEFINE(CPU_AFFINITY, 1,
-			[kernel has cpu affinity support])
-	])
-])
-]) # LN_CONFIG_AFFINITY
-
-#
 # LN_CONFIG_BACKOFF
 #
 # check if tunable tcp backoff is available/wanted
@@ -114,203 +24,83 @@ AS_IF([test "x$enable_backoff" = xyes], [
 ]) # LN_CONFIG_BACKOFF
 
 #
-# LN_CONFIG_USOCKLND
-#
-# configure support for userspace TCP/IP LND
-#
-AC_DEFUN([LN_CONFIG_USOCKLND], [
-AC_MSG_CHECKING([whether to enable usocklnd])
-AC_ARG_ENABLE([usocklnd],
-	AC_HELP_STRING([--disable-usocklnd],
-		[disable usocklnd]),
-	[], [enable_usocklnd="yes"])
-AC_MSG_RESULT([$enable_usocklnd])
-USOCKLND=""
-AS_IF([test "x$enable_usocklnd" = xyes], [
-	AC_MSG_CHECKING([whether to build usocklnd])
-	AS_IF([test "$ENABLE_LIBPTHREAD" = yes], [
-		AC_MSG_RESULT([yes])
-		USOCKLND="usocklnd"
-	], [
-		AC_MSG_RESULT([no (libpthread not present or disabled)])
-	])
-])
-AC_SUBST(USOCKLND)
-]) # LN_CONFIG_USOCKLND
-
-#
 # LN_CONFIG_DLC
 #
-# Configure dlc if enabled
+# Configure dlc
 #
-# if libyaml is set (IE libyaml installed) and enable_dlc = yes then build
-# dlc other wise (IE if libyaml is not set or enable_dlc = no) then don't
-# build dlc.
+# fail to build if libyaml is not installed
 #
 AC_DEFUN([LN_CONFIG_DLC], [
-	AC_CHECK_LIB([yaml],  [yaml_parser_initialize],[
-		LIBYAML="libyaml"],[
-		LIBYAML=""],[-lm])
-	AC_MSG_CHECKING([whether to enable dlc])
-	AC_ARG_ENABLE([dlc],
-		AC_HELP_STRING([--disable-dlc],
-			[disable building dlc]),
-			[], [enable_dlc="yes"])
-	AC_MSG_RESULT([$enable_dlc])
-	USE_DLC=""
-	AS_IF([test "x$enable_dlc" = xyes],
-	      [AS_IF([test "x$LIBYAML" = xlibyaml], [
-			USE_DLC="yes"
-		], [
-			AC_MSG_RESULT([no (libyaml not present)])
-		])
+	AS_IF([test "x$enable_dist" = xno], [
+		AC_CHECK_LIB([yaml], [yaml_parser_initialize],
+			     [LIBYAML="libyaml"],
+			     [AC_MSG_ERROR([YAML development libraries not not installed])],
+			     [-lm])
 	])
-	AC_SUBST(USE_DLC)
 ])
 
 #
-# LN_CONFIG_QUADRICS
-#
-# check if quadrics support is in this kernel
-#
-AC_DEFUN([LN_CONFIG_QUADRICS], [
-AC_MSG_CHECKING([for QsNet sources])
-AC_ARG_WITH([qsnet],
-	AC_HELP_STRING([--with-qsnet=path],
-		[set path to qsnet source (default=$LINUX)]),
-	[QSNET=$with_qsnet], [QSNET=$LINUX])
-AC_MSG_RESULT([$QSNET])
-
-QSWLND=""
-QSWCPPFLAGS=""
-AC_MSG_CHECKING([if quadrics kernel headers are present])
-AS_IF([test -d $QSNET/drivers/net/qsnet], [
-	AC_MSG_RESULT([yes])
-	QSWLND="qswlnd"
-	AC_MSG_CHECKING([for multirail EKC])
-	AS_IF([test -f $QSNET/include/elan/epcomms.h], [
-		AC_MSG_RESULT([supported])
-		QSNET=$(readlink --canonicalize $QSNET)
-		QSWCPPFLAGS="-I$QSNET/include -DMULTIRAIL_EKC=1"
-	], [
-		AC_MSG_RESULT([not supported])
-		AC_MSG_ERROR([Need multirail EKC])
-	])
-
-	AS_IF([test x$QSNET = x$LINUX], [
-		LB_CHECK_CONFIG([QSNET], [], [
-			LB_CHECK_CONFIG([QSNET_MODULE], [], [
-				AC_MSG_WARN([QSNET is not enabled in this kernel; not building qswlnd.])
-				QSWLND=""
-				QSWCPPFLAGS=""
-			])
-		])
-	])
-], [
-	AC_MSG_RESULT([no])
-])
-AC_SUBST(QSWLND)
-AC_SUBST(QSWCPPFLAGS)
-]) # LN_CONFIG_QUADRICS
-
-#
-# LN_CONFIG_MX
-#
-AC_DEFUN([LN_CONFIG_MX], [
-# set default
-MXPATH="/opt/mx"
-AC_MSG_CHECKING([whether to enable Myrinet MX support])
-AC_ARG_WITH([mx],
-	AC_HELP_STRING([--with-mx=path],
-		[build mxlnd against path]),
-	[
-		case $with_mx in
-		yes) ENABLEMX=2 ;;
-		no)  ENABLEMX=0 ;;
-		*)   ENABLEMX=3; MXPATH=$with_mx ;;
-		esac
-	],[
-		ENABLEMX=1
-	])
-AS_IF([test $ENABLEMX -eq 0], [
-	AC_MSG_RESULT([disabled])
-], [test ! \( -f ${MXPATH}/include/myriexpress.h -a \
-	      -f ${MXPATH}/include/mx_kernel_api.h -a \
-	      -f ${MXPATH}/include/mx_pin.h \)], [
-	AC_MSG_RESULT([no])
-	case $ENABLEMX in
-	1) ;;
-	2) AC_MSG_ERROR([Myrinet MX kernel headers not present]) ;;
-	3) AC_MSG_ERROR([bad --with-mx path]) ;;
-	*) AC_MSG_ERROR([internal error]) ;;
-	esac
-], [
-	AC_MSG_RESULT([check])
-	MXPATH=$(readlink --canonicalize $MXPATH)
-	MXCPPFLAGS="-I$MXPATH/include"
-	MXLIBS="-L$MXPATH/lib"
-	EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-	EXTRA_KCFLAGS="$EXTRA_KCFLAGS $MXCPPFLAGS"
-	LB_CHECK_COMPILE([if have Myrinet MX support],
-	myrinet_mx_support, [
-		#define MX_KERNEL 1
-		#include <mx_extensions.h>
-		#include <myriexpress.h>
-	],[
-		mx_endpoint_t   end;
-		mx_status_t     status;
-		mx_request_t    request;
-		int             result;
-		mx_init();
-		mx_open_endpoint(MX_ANY_NIC, MX_ANY_ENDPOINT, 0, NULL, 0, &end);
-		mx_register_unexp_handler(end, (mx_unexp_handler_t) NULL, NULL);
-		mx_wait_any(end, MX_INFINITE, 0LL, 0LL, &status, &result);
-		mx_iconnect(end, 0LL, 0, 0, 0, NULL, &request);
-		return 0;
-	],[
-		MXLND="mxlnd"
-	],[
-		case $ENABLEMX in
-		1) ;;
-		2) AC_MSG_ERROR([can't compile with Myrinet MX kernel headers]) ;;
-		3) AC_MSG_ERROR([can't compile with Myrinet MX headers under $MXPATH]) ;;
-		*) AC_MSG_ERROR([internal error]) ;;
-		esac
-		MXCPPFLAGS=""
-		MXLIBS=""
-		MXLND=""
-	])
-	EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-])
-AC_SUBST(MXCPPFLAGS)
-AC_SUBST(MXLIBS)
-AC_SUBST(MXLND)
-]) # LN_CONFIG_MX
-
-#
 # LN_CONFIG_O2IB
 #
+# If current OFED installed (assume with "ofed_info") and devel
+# headers are not found, error because we assume OFED infiniband
+# driver needs to be used and we must configure/build with it.
+# Current OFED headers detection mechanism allow for non-standard
+# prefix but relies on "ofed_info" command and on "%prefix/openib"
+# link (both are ok for 1.5.x and 3.x versions), and should work
+# for both source and DKMS builds.
+#
 AC_DEFUN([LN_CONFIG_O2IB], [
 AC_MSG_CHECKING([whether to use Compat RDMA])
 AC_ARG_WITH([o2ib],
-	AC_HELP_STRING([--with-o2ib=path],
+	AC_HELP_STRING([--with-o2ib=[yes|no|<path>]],
 		[build o2iblnd against path]),
-	[
-		case $with_o2ib in
-		yes)    O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
-			ENABLEO2IB=2
-			;;
-		no)     ENABLEO2IB=0
-			;;
-		*)      O2IBPATHS=$with_o2ib
-			ENABLEO2IB=3
-			;;
-		esac
-	],[
-		O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
-		ENABLEO2IB=1
-	])
-AS_IF([test $ENABLEO2IB -eq 0], [
+	[], [with_o2ib="yes"])
+
+case $with_o2ib in
+	yes)    AS_IF([which ofed_info 2>/dev/null], [
+			AS_IF([test x$uses_dpkg = xyes], [
+				OFED_INFO="ofed_info | awk '{print \[$]2}'"
+				LSPKG="dpkg --listfiles"
+			], [
+				OFED_INFO="ofed_info"
+				LSPKG="rpm -ql"
+			])
+			O2IBPATHS=$(eval $OFED_INFO | egrep -w 'mlnx-ofed-kernel-dkms|mlnx-ofa_kernel-devel|compat-rdma-devel|kernel-ib-devel|ofa_kernel-devel' | xargs $LSPKG | grep '\(/openib\|/ofa_kernel/default\|/ofa_kernel\)$' | head -n1)
+			AS_IF([test -z "$O2IBPATHS"], [
+				AC_MSG_ERROR([
+You seem to have an OFED installed but have not installed it's devel package.
+If you still want to build Lustre for your OFED I/B stack, you need to install its devel headers RPM.
+Instead, if you want to build Lustre for your kernel's built-in I/B stack rather than your installed OFED stack, either remove the OFED package(s) or use --with-o2ib=no.
+					     ])
+			])
+			AS_IF([test $(echo $O2IBPATHS | wc -w) -ge 2], [
+				AC_MSG_ERROR([
+It appears that you have multiple OFED versions installed.
+If you still want to build Lustre for your OFED I/B stack, you need to install a single version with its devel headers RPM.
+Instead, if you want to build Lustre for your kernel's built-in I/B stack rather than your installed OFED stack, either remove the OFED package(s) or use --with-o2ib=no.
+					     ])
+			])
+			if test -e $O2IBPATHS/${LINUXRELEASE}; then
+			    O2IBPATHS=$O2IBPATHS/${LINUXRELEASE}
+			elif test -e $O2IBPATHS/default; then
+			    O2IBPATHS=$O2IBPATHS/default
+			fi
+			OFED="yes"
+		], [
+			O2IBPATHS="$LINUX $LINUX/drivers/infiniband"
+		])
+		ENABLEO2IB="yes"
+		;;
+	no)     ENABLEO2IB="no"
+		;;
+	*)      O2IBPATHS=$with_o2ib
+		ENABLEO2IB="withpath"
+		OFED="yes"
+		;;
+esac
+
+AS_IF([test $ENABLEO2IB = "no"], [
 	AC_MSG_RESULT([no])
 ], [
 	o2ib_found=false
@@ -319,16 +109,6 @@ AS_IF([test $ENABLEO2IB -eq 0], [
 			   -f ${O2IBPATH}/include/rdma/ib_cm.h -a \
 			   -f ${O2IBPATH}/include/rdma/ib_verbs.h -a \
 			   -f ${O2IBPATH}/include/rdma/ib_fmr_pool.h \)], [
-			AS_IF([test \( -d ${O2IBPATH}/kernel_patches -a \
-				   -f ${O2IBPATH}/Makefile \)], [
-				AC_MSG_RESULT([no])
-				AC_MSG_ERROR([
-
-you appear to be trying to use the OFED distribution's source
-directory (${O2IBPATH}) rather than the "development/headers"
-directory which is likely in ${O2IBPATH%-*}
-])
-			])
 			o2ib_found=true
 			break
 		])
@@ -336,17 +116,21 @@ directory which is likely in ${O2IBPATH%-*}
 	if ! $o2ib_found; then
 		AC_MSG_RESULT([no])
 		case $ENABLEO2IB in
-			1) ;;
-			2) AC_MSG_ERROR([kernel OpenIB gen2 headers not present]) ;;
-			3) AC_MSG_ERROR([bad --with-o2ib path]) ;;
+			"yes") AC_MSG_ERROR([no OFED nor kernel OpenIB gen2 headers present]) ;;
+			"withpath") AC_MSG_ERROR([bad --with-o2ib path]) ;;
 			*) AC_MSG_ERROR([internal error]) ;;
 		esac
 	else
+		COMPAT_AUTOCONF=""
 		compatrdma_found=false
 		if test -f ${O2IBPATH}/include/linux/compat-2.6.h; then
 			AC_MSG_RESULT([yes])
 			compatrdma_found=true
 			AC_DEFINE(HAVE_COMPAT_RDMA, 1, [compat rdma found])
+			EXTRA_OFED_CONFIG="$EXTRA_OFED_CONFIG -include ${O2IBPATH}/include/linux/compat-2.6.h"
+			if test -f "$O2IBPATH/include/linux/compat_autoconf.h"; then
+				COMPAT_AUTOCONF="$O2IBPATH/include/linux/compat_autoconf.h"
+			fi
 		else
 			AC_MSG_RESULT([no])
 		fi
@@ -356,19 +140,21 @@ directory which is likely in ${O2IBPATH%-*}
 			elif test -f "$O2IBPATH/ofed_patch.mk"; then
 				. "$O2IBPATH/ofed_patch.mk"
 			fi
-		else
+		elif test -z "$COMPAT_AUTOCONF"; then
+			# Depreciated checks
 			if test "x$RHEL_KERNEL" = xyes; then
-				case "$RHEL_KERNEL_VERSION" in
-					2.6.32-358*)
-						EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4" ;;
-					2.6.32-431*)
-						EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4 -DCONFIG_COMPAT_RHEL_6_5" ;;
-				esac
+				RHEL_MAJOR=$(awk '/ RHEL_MAJOR / { print [$]3 }' $LINUX_OBJ/include/$VERSION_HDIR/version.h)
+				I=$(awk '/ RHEL_MINOR / { print [$]3 }' $LINUX_OBJ/include/$VERSION_HDIR/version.h)
+				while test "$I" -ge 0; do
+					EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_${RHEL_MAJOR}_$I"
+					I=$(($I-1))
+				done
 			elif test "x$SUSE_KERNEL" = xyes; then
 				SP=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
 				EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_SLES_11_$SP"
 			fi
 		fi
+
 		AC_MSG_CHECKING([whether to use any OFED backport headers])
 		if test -n "$BACKPORT_INCLUDES"; then
 			AC_MSG_RESULT([yes])
@@ -380,15 +166,22 @@ directory which is likely in ${O2IBPATH%-*}
 
 		O2IBLND=""
 		O2IBPATH=$(readlink --canonicalize $O2IBPATH)
-		EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include"
+		EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -I$O2IBPATH/include -I$O2IBPATH/include/uapi"
+		EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE"
 		LB_CHECK_COMPILE([whether to enable OpenIB gen2 support],
 		openib_gen2_support, [
-			#include <linux/version.h>
-			#include <linux/pci.h>
-			#include <linux/gfp.h>
 			#ifdef HAVE_COMPAT_RDMA
+			#undef PACKAGE_NAME
+			#undef PACKAGE_TARNAME
+			#undef PACKAGE_VERSION
+			#undef PACKAGE_STRING
+			#undef PACKAGE_BUGREPORT
+			#undef PACKAGE_URL
 			#include <linux/compat-2.6.h>
 			#endif
+			#include <linux/version.h>
+			#include <linux/pci.h>
+			#include <linux/gfp.h>
 			#include <rdma/rdma_cm.h>
 			#include <rdma/ib_cm.h>
 			#include <rdma/ib_verbs.h>
@@ -405,48 +198,70 @@ directory which is likely in ${O2IBPATH%-*}
 			O2IBLND="o2iblnd"
 		],[
 			case $ENABLEO2IB in
-			1) ;;
-			2) AC_MSG_ERROR([can't compile with kernel OpenIB gen2 headers]) ;;
-			3) AC_MSG_ERROR([can't compile with OpenIB gen2 headers under $O2IBPATH]) ;;
+			"yes") AC_MSG_ERROR([can't compile with OpenIB gen2 headers]) ;;
+			"withpath") AC_MSG_ERROR([can't compile with OpenIB gen2 headers under $O2IBPATH]) ;;
 			*) AC_MSG_ERROR([internal error]) ;;
 			esac
 		])
 		# we know at this point that the found OFED source is good
 		O2IB_SYMVER=""
-		if test $ENABLEO2IB -eq 3 ; then
-			# OFED default rpm not handle sles10 Modules.symvers name
-			for name in Module.symvers Modules.symvers; do
-				if test -f $O2IBPATH/$name; then
-					O2IB_SYMVER=$name;
-					break;
-				fi
-			done
+		if test $ENABLEO2IB = "withpath" -o "x$OFED" = "xyes" ; then
+			if test -f $O2IBPATH/Module.symvers; then
+				O2IB_SYMVER=$O2IBPATH/Module.symvers;
+				break;
+			fi
 			if test -n "$O2IB_SYMVER"; then
-				AC_MSG_NOTICE([adding $O2IBPATH/$O2IB_SYMVER to $PWD/$SYMVERFILE])
-				# strip out the existing symbols versions first
-				if test -f $PWD/$SYMVERFILE; then
-				egrep -v $(echo $(awk '{ print $2 }' $O2IBPATH/$O2IB_SYMVER) | tr ' ' '|') $PWD/$SYMVERFILE > $PWD/$SYMVERFILE.old
-				else
-					touch $PWD/$SYMVERFILE.old
-				fi
-				cat $PWD/$SYMVERFILE.old $O2IBPATH/$O2IB_SYMVER > $PWD/$SYMVERFILE
-				rm $PWD/$SYMVERFILE.old
+				AC_MSG_NOTICE([adding $O2IB_SYMVER to Symbol Path])
+				EXTRA_SYMBOLS="$EXTRA_SYMBOLS $O2IB_SYMVER"
+				AC_SUBST(EXTRA_SYMBOLS)
 			else
-				AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
+				AC_MSG_ERROR([an external source tree was, either specified or detected, for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
 			fi
 		fi
 
-		LN_CONFIG_OFED_SPEC
+		LB_CHECK_COMPILE([if Linux kernel has kthread_worker],
+		linux_kthread_worker, [
+			#ifdef HAVE_COMPAT_RDMA
+			#undef PACKAGE_NAME
+			#undef PACKAGE_TARNAME
+			#undef PACKAGE_VERSION
+			#undef PACKAGE_STRING
+			#undef PACKAGE_BUGREPORT
+			#undef PACKAGE_URL
+			#include <linux/compat-2.6.h>
+			#endif
+			#include <linux/kthread.h>
+		],[
+			struct kthread_work *kth_wrk = NULL;
+			flush_kthread_work(kth_wrk);
+		],[
+			AC_DEFINE(HAVE_KTHREAD_WORK, 1, [kthread_worker found])
+			if test -z "$COMPAT_AUTOCONF"; then
+				EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_IS_KTHREAD"
+			fi
+		])
+		EXTRA_CHECK_INCLUDE=""
 	fi
 ])
+AC_SUBST(EXTRA_OFED_CONFIG)
 AC_SUBST(EXTRA_OFED_INCLUDE)
 AC_SUBST(O2IBLND)
+AC_SUBST(O2IBPATH)
+AC_SUBST(ENABLEO2IB)
 
-# In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument
-AS_IF([test $ENABLEO2IB -ne 0], [
+AS_IF([test $ENABLEO2IB != "no"], [
+	EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE"
+
+	# In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument
 	LB_CHECK_COMPILE([if 'rdma_create_id' wants four args],
 	rdma_create_id_4args, [
 		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
 		#include <linux/compat-2.6.h>
 		#endif
 		#include <rdma/rdma_cm.h>
@@ -456,37 +271,258 @@ AS_IF([test $ENABLEO2IB -ne 0], [
 		AC_DEFINE(HAVE_RDMA_CREATE_ID_4ARG, 1,
 			[rdma_create_id wants 4 args])
 	])
-])
-]) # LN_CONFIG_O2IB
 
-#
-# LN_CONFIG_RALND
-#
-# check whether to use the RapidArray lnd
-#
-AC_DEFUN([LN_CONFIG_RALND], [
-RALND=""
-RACPPFLAGS="-I${LINUX}/drivers/xd1/include"
-EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS $RACPPFLAGS"
-LB_CHECK_COMPILE([if 'RapidArray' kernel headers are present],
-RapkGetDeviceByIndex, [
-	#include <linux/types.h>
-	#include <rapl.h>
-],[
-	RAP_RETURN rc;
-	RAP_PVOID  dev_handle;
-	rc = RapkGetDeviceByIndex(0, NULL, &dev_handle);
-	return rc == RAP_SUCCESS ? 0 : 1;
-],[
-	RALND="ralnd"
-],[
-	RACPPFLAGS=""
-])
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-AC_SUBST(RACPPFLAGS)
-AC_SUBST(RALND)
-]) # LN_CONFIG_RALND
+	# 4.4 added network namespace parameter for rdma_create_id()
+	LB_CHECK_COMPILE([if 'rdma_create_id' wants five args],
+	rdma_create_id_5args, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/rdma_cm.h>
+	],[
+		rdma_create_id(NULL, NULL, NULL, 0, 0);
+	],[
+		AC_DEFINE(HAVE_RDMA_CREATE_ID_5ARG, 1,
+			[rdma_create_id wants 5 args])
+	])
+
+	# 4.2 introduced struct ib_cq_init_attr which is used
+	# by ib_create_cq(). Note some OFED stacks only keep
+	# their headers in sync with latest kernels but not
+	# the functionality which means for infiniband testing
+	# we need to always test functionality testings.
+	LB_CHECK_COMPILE([if 'struct ib_cq_init_attr' is used],
+	ib_cq_init_attr, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		struct ib_cq_init_attr cq_attr;
+
+		ib_create_cq(NULL, NULL, NULL, NULL, &cq_attr);
+	],[
+		AC_DEFINE(HAVE_IB_CQ_INIT_ATTR, 1,
+			[struct ib_cq_init_attr is used by ib_create_cq])
+	])
+
+	# 4.3 removed ib_alloc_fast_reg_mr()
+	LB_CHECK_COMPILE([if 'ib_alloc_fast_reg_mr' exists],
+	ib_alloc_fast_reg_mr, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		ib_alloc_fast_reg_mr(NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_ALLOC_FAST_REG_MR, 1,
+			[ib_alloc_fast_reg_mr is defined])
+	])
+
+	# 4.9 must stop using ib_get_dma_mr and the global MR
+	# We then have to use FMR/Fastreg for all RDMA.
+	LB_CHECK_COMPILE([if 'ib_get_dma_mr' exists],
+	ib_get_dma_mr, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		ib_get_dma_mr(NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_GET_DMA_MR, 1,
+			[ib_get_dma_mr is defined])
+	])
+
+	# In v4.4 Linux kernel,
+	# commit e622f2f4ad2142d2a613a57fb85f8cf737935ef5
+	# split up struct ib_send_wr so that all non-trivial verbs
+	# use their own structure which embedds struct ib_send_wr.
+	LB_CHECK_COMPILE([if 'struct ib_rdma_wr' is defined],
+	ib_rdma_wr, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		struct ib_rdma_wr *wr __attribute__ ((unused));
+
+		wr = rdma_wr(NULL);
+	],[
+		AC_DEFINE(HAVE_IB_RDMA_WR, 1,
+			[struct ib_rdma_wr is defined])
+	])
+
+	# new fast registration API introduced in 4.4
+	LB_CHECK_COMPILE([if 4arg 'ib_map_mr_sg' exists],
+	ib_map_mr_sg_4args, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		ib_map_mr_sg(NULL, NULL, 0, 0);
+	],[
+		AC_DEFINE(HAVE_IB_MAP_MR_SG, 1,
+			[ib_map_mr_sg exists])
+	])
+
+	# ib_map_mr_sg changes from 4 to 5 args (adding sg_offset_p)
+	# in kernel 4.7 (and RHEL 7.3)
+	LB_CHECK_COMPILE([if 5arg 'ib_map_mr_sg' exists],
+	ib_map_mr_sg_5args, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		ib_map_mr_sg(NULL, NULL, 0, NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_MAP_MR_SG, 1,
+			[ib_map_mr_sg exists])
+		AC_DEFINE(HAVE_IB_MAP_MR_SG_5ARGS, 1,
+			[ib_map_mr_sg has 5 arguments])
+	])
+
+	# ib_query_device() removed in 4.5
+	LB_CHECK_COMPILE([if 'struct ib_device' has member 'attrs'],
+	ib_device.attrs, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		struct ib_device dev;
+		struct ib_device_attr dev_attr = {};
+		dev.attrs = dev_attr;
+	],[
+		AC_DEFINE(HAVE_IB_DEVICE_ATTRS, 1,
+			[struct ib_device.attrs is defined])
+	])
+
+	# A flags argument was added to ib_alloc_pd() in Linux 4.9,
+	# commit ed082d36a7b2c27d1cda55fdfb28af18040c4a89
+	LB_CHECK_COMPILE([if 2arg 'ib_alloc_pd' exists],
+	ib_alloc_pd, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		ib_alloc_pd(NULL, 0);
+	],[
+		AC_DEFINE(HAVE_IB_ALLOC_PD_2ARGS, 1,
+			[ib_alloc_pd has 2 arguments])
+	])
+
+	LB_CHECK_COMPILE([if function 'ib_inc_rkey' is defined],
+	ib_inc_rkey, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		(void)ib_inc_rkey(0);
+	],[
+		AC_DEFINE(HAVE_IB_INC_RKEY, 1,
+			  [function ib_inc_rkey exist])
+	])
+
+	# In MOFED 4.6, the second and third parameters for
+	# ib_post_send() and ib_post_recv() are declared with
+	# 'const'.
+	tmp_flags="$EXTRA_KCFLAGS"
+	EXTRA_KCFLAGS="-Werror"
+	LB_CHECK_COMPILE([if 'ib_post_send() and ib_post_recv()' have const parameters],
+	ib_post_send_recv_const, [
+		#ifdef HAVE_COMPAT_RDMA
+		#undef PACKAGE_NAME
+		#undef PACKAGE_TARNAME
+		#undef PACKAGE_VERSION
+		#undef PACKAGE_STRING
+		#undef PACKAGE_BUGREPORT
+		#undef PACKAGE_URL
+		#include <linux/compat-2.6.h>
+		#endif
+		#include <rdma/ib_verbs.h>
+	],[
+		ib_post_send(NULL, (const struct ib_send_wr *)NULL,
+			     (const struct ib_send_wr **)NULL);
+	],[
+		AC_DEFINE(HAVE_IB_POST_SEND_RECV_CONST, 1,
+			[ib_post_send and ib_post_recv have const parameters])
+	])
+	EXTRA_KCFLAGS="$tmp_flags"
+
+	# 5.0
+	LN_IB_DEVICE_OPS_EXISTS
+	# 5.1
+	LN_IB_SG_DMA_ADDRESS_EXISTS
+
+	EXTRA_CHECK_INCLUDE=""
+]) # ENABLEO2IB != "no"
+]) # LN_CONFIG_O2IB
 
 #
 # LN_CONFIG_GNILND
@@ -541,49 +577,38 @@ AS_IF([test "x$enable_gni" = xyes], [
 		return rrc;
 	],[
 		GNICPPFLAGS="$GNICPPFLAGS -DGNILND_USE_RCA=1"
-		GNILNDRCA="gnilndrca"
 	])
 	EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
 ])
 AC_SUBST(GNICPPFLAGS)
-AC_SUBST(GNILNDRCA)
 AC_SUBST(GNILND)
 ]) # LN_CONFIG_GNILND
 
+# LN_CONFIG_SOCK_CREATE_KERN
 #
-# LN_CONFIG_USERSPACE
-#
-# This is defined but empty because it is called from
-# build/autconf/lustre-build.m4 which is shared by all branches.
-#
-AC_DEFUN([LN_CONFIG_USERSPACE], [
-]) # LN_CONFIG_USERSPACE
-
-#
-# LN_CONFIG_TCP_SENDPAGE
+# 4.x sock_create_kern() added a first parameter as 'struct net *'
+# instead of int.
 #
-# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'.
-#
-AC_DEFUN([LN_CONFIG_TCP_SENDPAGE], [
+AC_DEFUN([LN_CONFIG_SOCK_CREATE_KERN], [
 tmp_flags="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if 'tcp_sendpage' first parameter is socket],
-tcp_sendpage_socket, [
+LB_CHECK_COMPILE([if 'sock_create_kern' first parameter is net],
+sock_create_kern_net, [
 	#include <linux/net.h>
-	#include <net/tcp.h>
+	#include <net/net_namespace.h>
 ],[
-	tcp_sendpage((struct socket*)0, NULL, 0, 0, 0);
+	sock_create_kern((struct net*)0, 0, 0, 0, NULL);
 ],[
-	AC_DEFINE(HAVE_TCP_SENDPAGE_USE_SOCKET, 1,
-		[tcp_sendpage use socket as first parameter])
+	AC_DEFINE(HAVE_SOCK_CREATE_KERN_USE_NET, 1,
+		[sock_create_kern use net as first parameter])
 ])
 EXTRA_KCFLAGS="$tmp_flags"
-]) # LN_CONFIG_TCP_SENDPAGE
+]) # LN_CONFIG_SOCK_CREATE_KERN
 
 #
 # LN_CONFIG_SK_DATA_READY
 #
-# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'.
+# 3.15 for struct sock the *sk_data_ready() field only takes one argument now
 #
 AC_DEFUN([LN_CONFIG_SK_DATA_READY], [
 tmp_flags="$EXTRA_KCFLAGS"
@@ -602,6 +627,128 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LN_CONFIG_SK_DATA_READY
 
 #
+# LN_EXPORT_KMAP_TO_PAGE
+#
+# 3.10 Export kmap_to_page
+#
+AC_DEFUN([LN_EXPORT_KMAP_TO_PAGE], [
+LB_CHECK_EXPORT([kmap_to_page], [mm/highmem.c],
+	[AC_DEFINE(HAVE_KMAP_TO_PAGE, 1,
+		[kmap_to_page is exported by the kernel])])
+]) # LN_EXPORT_KMAP_TO_PAG
+
+#
+# LN_CONFIG_SOCK_ACCEPT
+#
+# 4.11 commit cdfbabfb2f0ce983fdaa42f20e5f7842178fc01e added a flag
+# to handle a possible lockdep condition kernel socket accept.
+#
+AC_DEFUN([LN_CONFIG_SOCK_ACCEPT], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'struct sock' accept function requires a bool argument],
+kern_sock_flag, [
+	#include <linux/net.h>
+],[
+	((struct socket *)0)->ops->accept(NULL, NULL, O_NONBLOCK, false);
+],[
+	AC_DEFINE(HAVE_KERN_SOCK_ACCEPT_FLAG_ARG, 1,
+		['struct sock' accept function requires bool argument])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_CONFIG_SOCK_ACCEPT
+
+#
+# LN_HAVE_ORACLE_OFED_EXTENSIONS
+#
+# Oracle UEK 5
+#
+AC_DEFUN([LN_HAVE_ORACLE_OFED_EXTENSIONS], [
+LB_CHECK_COMPILE([if Oracle OFED Extensions are enabled],
+oracle_ofed_ext, [
+	#include <rdma/ib_fmr_pool.h>
+],[
+	struct ib_fmr_pool_param param = {
+		.relaxed           = 0
+	};
+	(void)param;
+],[
+	AC_DEFINE(HAVE_ORACLE_OFED_EXTENSIONS, 1,
+		[if Oracle OFED Extensions are enabled])
+])
+]) # LN_HAVE_ORACLE_OFED_EXTENSIONS
+
+#
+# LN_CONFIG_SOCK_GETNAME
+#
+# 4.17 commit 9b2c45d479d0fb8647c9e83359df69162b5fbe5f getname()
+# does not take the length *int argument and returns the length
+#
+AC_DEFUN([LN_CONFIG_SOCK_GETNAME], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'getname' has two args],
+kern_sock_getname_2args, [
+	#include <linux/net.h>
+],[
+	kernel_getsockname(NULL, NULL);
+],[
+	AC_DEFINE(HAVE_KERN_SOCK_GETNAME_2ARGS, 1,
+		['getname' has two args])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_CONFIG_SOCK_GETNAME
+
+#
+# LN_IB_DEVICE_OPS_EXISTS
+#
+# kernel 5.0 commit 521ed0d92ab0db3edd17a5f4716b7f698f4fce61
+# RDMA/core: Introduce ib_device_ops
+# ... introduces the ib_device_ops structure that defines all the
+# InfiniBand device operations in one place ...
+#
+AC_DEFUN([LN_IB_DEVICE_OPS_EXISTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if struct ib_device_ops is defined],
+ib_device_ops_test, [
+	#include <rdma/ib_verbs.h>
+],[
+	int x = offsetof(struct ib_device_ops, unmap_fmr);
+	x = x;
+	(void)x;
+],[
+	AC_DEFINE(HAVE_IB_DEVICE_OPS, 1,
+		[if struct ib_device_ops is defined])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_IB_DEVICE_OPS_EXISTS
+
+#
+# LN_IB_SG_DMA_ADDRESS_EXISTS
+#
+# kernel 5.1 commit a163afc88556e099271a7b423295bc5176fcecce
+# IB/core: Remove ib_sg_dma_address() and ib_sg_dma_len()
+# ... when dma_ops existed (3.6) ib_sg_dma_address() was not trivial ...
+#
+AC_DEFUN([LN_IB_SG_DMA_ADDRESS_EXISTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if ib_sg_dma_address wrapper exists],
+ib_sg_dma_address_test, [
+	#include <rdma/ib_verbs.h>
+],[
+	u64 x = ib_sg_dma_address(NULL, NULL);
+	x = x;
+	(void)x;
+],[
+	AC_DEFINE(HAVE_IB_SG_DMA_ADDRESS, 1,
+		[if ib_sg_dma_address wrapper exists])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_IB_SG_DMA_ADDRESS_EXISTS
+
+#
 # LN_PROG_LINUX
 #
 # LNet linux kernel checks
@@ -610,18 +757,21 @@ AC_DEFUN([LN_PROG_LINUX], [
 AC_MSG_NOTICE([LNet kernel checks
 ==============================================================================])
 
-LN_FUNC_DEV_GET_BY_NAME_2ARG
-LN_CONFIG_AFFINITY
 LN_CONFIG_BACKOFF
-LN_CONFIG_QUADRICS
 LN_CONFIG_O2IB
-LN_CONFIG_RALND
 LN_CONFIG_GNILND
-LN_CONFIG_MX
-# 2.6.36
-LN_CONFIG_TCP_SENDPAGE
+# 3.10
+LN_EXPORT_KMAP_TO_PAGE
 # 3.15
 LN_CONFIG_SK_DATA_READY
+# 4.x
+LN_CONFIG_SOCK_CREATE_KERN
+# 4.11
+LN_CONFIG_SOCK_ACCEPT
+# 4.14
+LN_HAVE_ORACLE_OFED_EXTENSIONS
+# 4.17
+LN_CONFIG_SOCK_GETNAME
 ]) # LN_PROG_LINUX
 
 #
@@ -642,78 +792,40 @@ AC_MSG_NOTICE([LNet core checks
 ==============================================================================])
 
 # lnet/utils/portals.c
-AC_CHECK_HEADERS([netdb.h netinet/tcp.h asm/types.h endian.h sys/ioctl.h])
-AC_CHECK_FUNCS([gethostbyname socket connect])
-
-# lnet/utils/debug.c
-AC_CHECK_HEADERS([linux/version.h])
+AC_CHECK_HEADERS([netdb.h])
+AC_CHECK_FUNCS([gethostbyname])
 
 # lnet/utils/wirecheck.c
 AC_CHECK_FUNCS([strnlen])
 
 # --------  Check for required packages  --------------
 
-#
-# LC_CONFIG_READLINE
-#
-# Build with readline
-#
-AC_MSG_CHECKING([whether to enable readline support])
-AC_ARG_ENABLE(readline,
-	AC_HELP_STRING([--disable-readline],
-		[disable readline support]),
-	[], [enable_readline="yes"])
-AC_MSG_RESULT([$enable_readline])
-
-# -------- check for readline if enabled ----
-
-LIBREADLINE=""
-AS_IF([test "x$enable_readline" = xyes], [
-	AC_CHECK_LIB([readline], [readline], [
-		LIBREADLINE="-lreadline"
-		AC_DEFINE(HAVE_LIBREADLINE, 1,
-			[readline library is available])])
-])
-AC_SUBST(LIBREADLINE)
-
-# -------- enable acceptor libwrap (TCP wrappers) support? -------
-
-AC_MSG_CHECKING([if libwrap support is requested])
-AC_ARG_ENABLE([libwrap],
-	AC_HELP_STRING([--enable-libwrap], [use TCP wrappers]),
-	[case "${enableval}" in
-		yes) enable_libwrap="yes" ;;
-		no)  enable_libwrap="no" ;;
-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-libwrap) ;;
-	esac], [enable_libwrap="no"])
-AC_MSG_RESULT([$enable_libwrap])
-LIBWRAP=""
-AS_IF([test "x$enable_libwrap" = xyes], [
-	LIBWRAP="-lwrap"
-	AC_DEFINE(HAVE_LIBWRAP, 1,
-		[libwrap support is requested])
+AC_MSG_CHECKING([whether to enable 'efence' debugging support])
+AC_ARG_ENABLE(efence,
+	AC_HELP_STRING([--enable-efence],
+		[use efence library]),
+	[], [enable_efence="no"])
+AC_MSG_RESULT([$enable_efence])
+
+LIBEFENCE=""
+AS_IF([test "$enable_efence" = yes], [
+	LIBEFENCE="-lefence"
+	AC_DEFINE(HAVE_LIBEFENCE, 1,
+		[libefence support is requested])
 ])
-AC_SUBST(LIBWRAP)
+AC_SUBST(LIBEFENCE)
 
-LN_CONFIG_MAX_PAYLOAD
-LN_CONFIG_USOCKLND
 LN_CONFIG_DLC
 ]) # LN_CONFIGURE
 
 #
 # LN_CONDITIONALS
 #
-# AM_CONDITOINAL defines for lnet
+# AM_CONDITIONAL defines for lnet
 #
 AC_DEFUN([LN_CONDITIONALS], [
-AM_CONDITIONAL(BUILD_QSWLND,     test x$QSWLND = "xqswlnd")
-AM_CONDITIONAL(BUILD_MXLND,      test x$MXLND = "xmxlnd")
 AM_CONDITIONAL(BUILD_O2IBLND,    test x$O2IBLND = "xo2iblnd")
-AM_CONDITIONAL(BUILD_RALND,      test x$RALND = "xralnd")
-AM_CONDITIONAL(BUILD_GNILND,     test x$GNILND = "xgnilnd")
-AM_CONDITIONAL(BUILD_GNILND_RCA, test x$GNILNDRCA = "xgnilndrca")
-AM_CONDITIONAL(BUILD_USOCKLND,   test x$USOCKLND = "xusocklnd")
-AM_CONDITIONAL(BUILD_DLC,        test x$USE_DLC = "xyes")
+AM_CONDITIONAL(BUILD_GNILND,     test x$GNILND  = "xgnilnd")
 ]) # LN_CONDITIONALS
 
 #
@@ -723,24 +835,17 @@ AM_CONDITIONAL(BUILD_DLC,        test x$USE_DLC = "xyes")
 #
 AC_DEFUN([LN_CONFIG_FILES], [
 AC_CONFIG_FILES([
-lnet/Kernelenv
 lnet/Makefile
 lnet/autoMakefile
 lnet/autoconf/Makefile
 lnet/doc/Makefile
 lnet/include/Makefile
 lnet/include/lnet/Makefile
-lnet/include/lnet/linux/Makefile
+lnet/include/uapi/linux/lnet/Makefile
 lnet/klnds/Makefile
 lnet/klnds/autoMakefile
-lnet/klnds/mxlnd/autoMakefile
-lnet/klnds/mxlnd/Makefile
 lnet/klnds/o2iblnd/Makefile
 lnet/klnds/o2iblnd/autoMakefile
-lnet/klnds/qswlnd/Makefile
-lnet/klnds/qswlnd/autoMakefile
-lnet/klnds/ralnd/Makefile
-lnet/klnds/ralnd/autoMakefile
 lnet/klnds/gnilnd/Makefile
 lnet/klnds/gnilnd/autoMakefile
 lnet/klnds/socklnd/Makefile
@@ -749,9 +854,6 @@ lnet/lnet/Makefile
 lnet/lnet/autoMakefile
 lnet/selftest/Makefile
 lnet/selftest/autoMakefile
-lnet/ulnds/Makefile
-lnet/ulnds/autoMakefile
-lnet/ulnds/socklnd/Makefile
 lnet/utils/Makefile
 lnet/utils/lnetconfig/Makefile
 ])