LU-15888 build: Debian dkms-debs requires ed and libkeyutils

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

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 0cc50fa..90b7700 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -80,7 +80,7 @@ Instead, if you want to build Lustre for your kernel's built-in I/B stack rather
                                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.
                                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.
+Instead, if you want to build Lustre for your in-kernel I/B stack rather than your installed external OFED stack, either remove the OFED package(s) or use --with-o2ib=no.

                                             ])
                        ])
                        if test -e $O2IBPATHS/${LINUXRELEASE}; then
                                             ])
                        ])
                        if test -e $O2IBPATHS/${LINUXRELEASE}; then


@@ -210,6 +210,9 @@ AS_IF([test $ENABLEO2IB = "no"], [
                        O2IB_SYMVER=$O2IBPATH/Module.symvers
                elif test "x$SUSE_KERNEL" = "xyes"; then
                        O2IB_SYMVER=$(find ${O2IBPATH}* -name Module.symvers)
                        O2IB_SYMVER=$O2IBPATH/Module.symvers
                elif test "x$SUSE_KERNEL" = "xyes"; then
                        O2IB_SYMVER=$(find ${O2IBPATH}* -name Module.symvers)

+               elif test -f $LINUX_OBJ/Module.symvers; then
+                       # Debian symvers is in the arch tree
+                       O2IB_SYMVER=$LINUX_OBJ/Module.symvers

                fi
                if test -n "$O2IB_SYMVER"; then
                        AC_MSG_NOTICE([adding $O2IB_SYMVER to Symbol Path])
                fi
                if test -n "$O2IB_SYMVER"; then
                        AC_MSG_NOTICE([adding $O2IB_SYMVER to Symbol Path])


@@ -619,7 +622,7 @@ AS_IF([test "x$enable_gni" = xyes], [
        ],[
                GNILND="gnilnd"
        ],[
        ],[
                GNILND="gnilnd"
        ],[

-               AC_MSG_ERROR([can't compile gnilnd with given GNICPPFLAGS: $GNICPPFLAGS])
+               AC_MSG_ERROR([cannot compile gnilnd with given GNICPPFLAGS: $GNICPPFLAGS])

        ])
        # at this point, we have gnilnd basic support,
        # now check for extra features
        ])
        # at this point, we have gnilnd basic support,
        # now check for extra features


@@ -959,7 +962,7 @@ LB_CHECK_FILE([$GDS_PATH/nvfs-dma.h],
        ],
        [])
 ],[
        ],
        [])
 ],[

-       AC_MSG_WARN([CUDA or GDS sources don't found. GDS support disabled])
+       AC_MSG_WARN([CUDA or GDS sources not found. GDS support disabled])

 ]
 )
 
 ]
 )