LU-6018 conf: replace RHEL_KERNEL_VERSION with RHEL_RELEASE_NO

[fs/lustre-release.git] / lnet / autoconf / lustre-lnet.m4

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 314e935..a3f712c 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -114,31 +114,6 @@ 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
@@ -156,14 +131,16 @@ AC_DEFUN([LN_CONFIG_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], [
+               [AS_IF([test "x$LIBYAML" = xlibyaml], [
                        USE_DLC="yes"
+                       AC_MSG_RESULT([yes])
                ], [
                        AC_MSG_RESULT([no (libyaml not present)])
                ])
+       ], [
+               AC_MSG_RESULT([no])
        ])
        AC_SUBST(USE_DLC)
 ])
@@ -358,10 +335,10 @@ directory which is likely in ${O2IBPATH%-*}
                        fi
                else
                        if test "x$RHEL_KERNEL" = xyes; then
-                               case "$RHEL_KERNEL_VERSION" in
-                                       2.6.32-358*)
+                               case "$RHEL_RELEASE_NO" in
+                                       64)
                                                EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4" ;;
-                                       2.6.32-431*)
+                                       65)
                                                EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4 -DCONFIG_COMPAT_RHEL_6_5" ;;
                                esac
                        elif test "x$SUSE_KERNEL" = xyes; then
@@ -696,7 +673,6 @@ AS_IF([test "x$enable_libwrap" = xyes], [
 AC_SUBST(LIBWRAP)
 
 LN_CONFIG_MAX_PAYLOAD
-LN_CONFIG_USOCKLND
 LN_CONFIG_DLC
 ]) # LN_CONFIGURE
 
@@ -712,7 +688,6 @@ 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")
 ]) # LN_CONDITIONALS
 
@@ -723,14 +698,12 @@ 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/klnds/Makefile
 lnet/klnds/autoMakefile
 lnet/klnds/mxlnd/autoMakefile
@@ -749,9 +722,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
 ])