b=22745 Removed gmlnd from lnet.

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

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index ea5a833..70ce4a7 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -255,106 +255,6 @@ AC_SUBST(QSWCPPFLAGS)
 AC_SUBST(QSWLND)
 ])
 
-#
-# LN_CONFIG_GM
-#
-# check if GM support is available
-#
-AC_DEFUN([LN_CONFIG_GM],[
-AC_MSG_CHECKING([whether to enable GM support])
-AC_ARG_WITH([gm],
-        AC_HELP_STRING([--with-gm=path-to-gm-source-tree],
-                      [build gmlnd against path]),
-       [
-               case $with_gm in
-                no)    ENABLE_GM=0
-                      ;;
-                *)     ENABLE_GM=1
-                       GM_SRC="$with_gm"
-                      ;;
-                esac
-        ],[
-                ENABLE_GM=0
-        ])
-AC_ARG_WITH([gm-install],
-        AC_HELP_STRING([--with-gm-install=path-to-gm-install-tree],
-                      [say where GM has been installed]),
-       [
-               GM_INSTALL=$with_gm_install
-        ],[
-                GM_INSTALL="/opt/gm"
-        ])
-if test $ENABLE_GM -eq 0; then
-        AC_MSG_RESULT([no])
-else
-        AC_MSG_RESULT([yes])
-
-       GMLND="gmlnd"
-        GMCPPFLAGS="-I$GM_SRC/include -I$GM_SRC/drivers -I$GM_SRC/drivers/linux/gm"
-
-       if test -f $GM_INSTALL/lib/libgm.a -o \
-                -f $GM_INSTALL/lib64/libgm.a; then
-               GMLIBS="-L$GM_INSTALL/lib -L$GM_INSTALL/lib64"
-        else
-               AC_MSG_ERROR([Cant find GM libraries under $GM_INSTALL])
-        fi
-
-       EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="$GMCPPFLAGS -DGM_KERNEL $EXTRA_KCFLAGS"
-
-        AC_MSG_CHECKING([that code using GM compiles with given path])
-       LB_LINUX_TRY_COMPILE([
-               #define GM_STRONG_TYPES 1
-               #ifdef VERSION
-               #undef VERSION
-               #endif
-               #include "gm.h"
-               #include "gm_internal.h"
-        ],[
-               struct gm_port *port = NULL;
-               gm_recv_event_t *rxevent = gm_blocking_receive_no_spin(port);
-                return 0;
-        ],[
-               AC_MSG_RESULT([yes])
-        ],[
-               AC_MSG_RESULT([no])
-               AC_MSG_ERROR([Bad --with-gm path])
-        ])
-
-       AC_MSG_CHECKING([that GM has gm_register_memory_ex_phys()])
-       LB_LINUX_TRY_COMPILE([
-               #define GM_STRONG_TYPES 1
-               #ifdef VERSION
-               #undef VERSION
-               #endif
-               #include "gm.h"
-               #include "gm_internal.h"
-       ],[
-               gm_status_t     gmrc;
-               struct gm_port *port = NULL;
-               gm_u64_t        phys = 0;
-               gm_up_t         pvma = 0;
-
-               gmrc = gm_register_memory_ex_phys(port, phys, 100, pvma);
-               return 0;
-       ],[
-               AC_MSG_RESULT([yes])
-       ],[
-               AC_MSG_RESULT([no.
-Please patch the GM sources as follows...
-    cd $GM_SRC
-    patch -p0 < $PWD/lnet/klnds/gmlnd/gm-reg-phys.patch
-...then rebuild and re-install them])
-                AC_MSG_ERROR([Can't build GM without gm_register_memory_ex_phys()])
-        ])
-
-       EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
-fi
-AC_SUBST(GMCPPFLAGS)
-AC_SUBST(GMLIBS)
-AC_SUBST(GMLND)
-])
-
 
 #
 # LN_CONFIG_MX
@@ -949,7 +849,6 @@ AC_DEFUN([LN_PROG_LINUX],
 LN_CONFIG_AFFINITY
 LN_CONFIG_BACKOFF
 LN_CONFIG_QUADRICS
-LN_CONFIG_GM
 LN_CONFIG_OPENIB
 LN_CONFIG_CIB
 LN_CONFIG_VIB
@@ -1098,7 +997,6 @@ LN_CONFIG_USOCKLND
 #
 AC_DEFUN([LN_CONDITIONALS],
 [AM_CONDITIONAL(BUILD_QSWLND, test x$QSWLND = "xqswlnd")
-AM_CONDITIONAL(BUILD_GMLND, test x$GMLND = "xgmlnd")
 AM_CONDITIONAL(BUILD_MXLND, test x$MXLND = "xmxlnd")
 AM_CONDITIONAL(BUILD_O2IBLND, test x$O2IBLND = "xo2iblnd")
 AM_CONDITIONAL(BUILD_OPENIBLND, test x$OPENIBLND = "xopeniblnd")
@@ -1128,10 +1026,8 @@ lnet/include/lnet/Makefile
 lnet/include/lnet/linux/Makefile
 lnet/klnds/Makefile
 lnet/klnds/autoMakefile
-lnet/klnds/gmlnd/Makefile
 lnet/klnds/mxlnd/autoMakefile
 lnet/klnds/mxlnd/Makefile
-lnet/klnds/gmlnd/autoMakefile
 lnet/klnds/openiblnd/Makefile
 lnet/klnds/openiblnd/autoMakefile
 lnet/klnds/o2iblnd/Makefile