LU-2675 lnet: remove ulnds

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

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 41b1289..29f9bdd 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -114,29 +114,34 @@ 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)])
+# LN_CONFIG_DLC
+#
+# Configure dlc if enabled
+#
+# 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.
+#
+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)])
+               ])
        ])
+       AC_SUBST(USE_DLC)
 ])
-AC_SUBST(USOCKLND)
-]) # LN_CONFIG_USOCKLND
 
 #
 # LN_CONFIG_QUADRICS
@@ -332,7 +337,7 @@ directory which is likely in ${O2IBPATH%-*}
                                        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_5" ;;
+                                               EXTRA_OFED_INCLUDE="$EXTRA_OFED_INCLUDE -DCONFIG_COMPAT_RHEL_6_4 -DCONFIG_COMPAT_RHEL_6_5" ;;
                                esac
                        elif test "x$SUSE_KERNEL" = xyes; then
                                SP=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
@@ -551,6 +556,27 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LN_CONFIG_TCP_SENDPAGE
 
 #
+# LN_CONFIG_SK_DATA_READY
+#
+# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'.
+#
+AC_DEFUN([LN_CONFIG_SK_DATA_READY], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'sk_data_ready' takes only one argument],
+sk_data_ready, [
+       #include <linux/net.h>
+       #include <net/sock.h>
+],[
+       ((struct sock *)0)->sk_data_ready(NULL);
+],[
+       AC_DEFINE(HAVE_SK_DATA_READY_ONE_ARG, 1,
+               [sk_data_ready uses only one argument])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LN_CONFIG_SK_DATA_READY
+
+#
 # LN_PROG_LINUX
 #
 # LNet linux kernel checks
@@ -569,18 +595,11 @@ LN_CONFIG_GNILND
 LN_CONFIG_MX
 # 2.6.36
 LN_CONFIG_TCP_SENDPAGE
+# 3.15
+LN_CONFIG_SK_DATA_READY
 ]) # LN_PROG_LINUX
 
 #
-# LN_PROG_DARWIN
-#
-# Darwin checks
-#
-AC_DEFUN([LN_PROG_DARWIN], [
-LB_DARWIN_CHECK_FUNCS([get_preemption_level])
-]) # LN_PROG_DARWIN
-
-#
 # LN_PATH_DEFAULTS
 #
 # default paths for installed files
@@ -625,13 +644,10 @@ AC_MSG_RESULT([$enable_readline])
 
 LIBREADLINE=""
 AS_IF([test "x$enable_readline" = xyes], [
-       LIBS_save="$LIBS"
-       LIBS="-lncurses $LIBS"
        AC_CHECK_LIB([readline], [readline], [
-               LIBREADLINE="-lreadline -lncurses"
+               LIBREADLINE="-lreadline"
                AC_DEFINE(HAVE_LIBREADLINE, 1,
                        [readline library is available])])
-       LIBS="$LIBS_save"
 ])
 AC_SUBST(LIBREADLINE)
 
@@ -654,42 +670,8 @@ AS_IF([test "x$enable_libwrap" = xyes], [
 ])
 AC_SUBST(LIBWRAP)
 
-# ----------------------------------------
-# some tests for catamount-like systems
-# ----------------------------------------
-AC_MSG_CHECKING([whether to initialize libsysio])
-AC_ARG_ENABLE([sysio_init],
-       AC_HELP_STRING([--disable-sysio-init],
-               [call sysio init functions when initializing liblustre]),
-       [], [enable_sysio_init="yes"])
-AC_MSG_RESULT([$enable_sysio_init])
-AS_IF([test "x$enable_sysio_init" != xno],
-       [AC_DEFINE([INIT_SYSIO], 1, [call sysio init functions])])
-
-AC_MSG_CHECKING([whether to use /dev/urandom for liblustre])
-AC_ARG_ENABLE([urandom],
-       AC_HELP_STRING([--disable-urandom],
-               [disable use of /dev/urandom for liblustre]),
-       [], [enable_urandom="yes"])
-AC_MSG_RESULT([$enable_urandom])
-AS_IF([test "x$enable_urandom" != xno],
-       [AC_DEFINE([LIBLUSTRE_USE_URANDOM], 1,
-               [use /dev/urandom for random data])])
-
-# -------- check for -lcap support ----
-
-AS_IF([test "x$enable_liblustre" = xyes], [
-       CAP_LIBS=""
-       AC_CHECK_LIB([cap], [cap_get_proc],
-               [
-                       CAP_LIBS="-lcap"
-                       AC_DEFINE([HAVE_LIBCAP], 1, [use libcap])
-               ])
-       AC_SUBST(CAP_LIBS)
-])
-
 LN_CONFIG_MAX_PAYLOAD
-LN_CONFIG_USOCKLND
+LN_CONFIG_DLC
 ]) # LN_CONFIGURE
 
 #
@@ -704,7 +686,7 @@ 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
 
 #
@@ -740,10 +722,7 @@ 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/include/lnet/darwin/Makefile
+lnet/utils/lnetconfig/Makefile
 ])
 ]) # LN_CONFIG_FILES