b=21666 prevent use of OFED source dir instead of headers

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

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index a80dbbc..44c7a23 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -463,17 +463,20 @@ if test $ENABLEO2IB -eq 0; then
        AC_MSG_RESULT([disabled])
 else
        o2ib_found=false
-
        for O2IBPATH in $O2IBPATHS; do
                if test \( -f ${O2IBPATH}/include/rdma/rdma_cm.h -a \
                           -f ${O2IBPATH}/include/rdma/ib_cm.h -a \
                           -f ${O2IBPATH}/include/rdma/ib_verbs.h -a \
                           -f ${O2IBPATH}/include/rdma/ib_fmr_pool.h \); then
+                       if test \( -d ${O2IBPATH}/kernel_patches -a \
+                                  -f ${O2IBPATH}/Makefile \); then
+                               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%-*}])
+                       fi
                        o2ib_found=true
                        break
                fi
        done
-
        if ! $o2ib_found; then
                AC_MSG_RESULT([no])
                case $ENABLEO2IB in
@@ -483,41 +486,11 @@ else
                        *) AC_MSG_ERROR([internal error]);;
                esac
        else
-               # figure out whether the kernel has an infiniband stack
-               # configured
-               LB_LINUX_CONFIG_IM([INFINIBAND],[
-                       CONFIG_INFINIBAND_MODULE_defined=true
-               ],[
-                       CONFIG_INFINIBAND_MODULE_defined=false
-               ])
-               # at this point we know that the user either explicitly
-               # requested o2ib support or didn't explicitly disable it so
-               # make sure the kernel's CONFIG_INFINIBAND variable is set
-               # appropriately.
-               #
-               # possible error conditions are:
-               # 1) --with-o2ib[=yes] (implies in kernel since no path was
-               #    given) and kernel not configured for IB
-               # 2) --with-o2ib=/path and kernel is configured for IB
-               #
-               if test "$O2IBPATH" = "$LINUX" -o "$O2IBPATH" = "$LINUX/drivers/infiniband"; then
-                       # infiniband stack is in the kernel
-                       if test $ENABLEO2IB -eq 1 -o $ENABLEO2IB -eq 2 && ! $CONFIG_INFINIBAND_MODULE_defined; then
-                               # case #1
-                               AC_MSG_ERROR([Kernel supplied OFED drivers are being requested however the kernel is NOT configured to build OFED modules.  Please specify --with-o2ib=<path_to_ofed> or rebuild the kernel with Infiniband enabled.])
-                       fi
-               else
-                       # had to be a specified path with --with-o2ib=/path
-                       if $CONFIG_INFINIBAND_MODULE_defined; then
-                               # case #2
-                               AC_MSG_ERROR([External OFED source has been specified but the kernel is configured to build OFED modules as well.  Remove --with-o2ib from the configuration or rebuild the kernel without Infiniband.])
-                       fi
-               fi
-               if $o2ib_found; then
                O2IBCPPFLAGS="-I$O2IBPATH/include"
                EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
                EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS"
-               EXTRA_LNET_INCLUDE="$O2IBCPPFLAGS $EXTRA_LNET_INCLUDE"
+               EXTRA_LNET_INCLUDE="$EXTRA_LNET_INCLUDE $O2IBCPPFLAGS"
+
                LB_LINUX_TRY_COMPILE([
                        #include <linux/version.h>
                        #include <linux/pci.h>
@@ -562,55 +535,24 @@ else
                                        break;
                                fi
                        done
-                       if test -n $O2IB_SYMVER ; then
+                       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
                        else
                                AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
                        fi
                fi
 
-                LB_LINUX_TRY_COMPILE([
-                       #include <linux/version.h>
-                       #include <linux/pci.h>
-                       #if !HAVE_GFP_T
-                       typedef int gfp_t;
-                       #endif
-                       #include <rdma/ib_verbs.h>
-                ],[
-                        ib_dma_map_single(NULL, NULL, 0, 0);
-                        return 0;
-                ],[
-                        AC_MSG_RESULT(yes)
-                        AC_DEFINE(HAVE_OFED_IB_DMA_MAP, 1,
-                                  [ib_dma_map_single defined])
-                ],[
-                        AC_MSG_RESULT(NO)
-                ])
-
-                LB_LINUX_TRY_COMPILE([
-                       #include <linux/version.h>
-                       #include <linux/pci.h>
-                       #if !HAVE_GFP_T
-                       typedef int gfp_t;
-                       #endif
-                       #include <rdma/ib_verbs.h>
-                ],[
-                        ib_create_cq(NULL, NULL, NULL, NULL, 0, 0);
-                        return 0;
-                ],[
-                        AC_MSG_RESULT(yes)
-                        AC_DEFINE(HAVE_OFED_IB_COMP_VECTOR, 1,
-                                  [has completion vector])
-                ],[
-                        AC_MSG_RESULT(NO)
-                ])
-
+               LN_CONFIG_OFED_SPEC
                EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
        fi
-       fi
 fi
 
 AC_SUBST(EXTRA_LNET_INCLUDE)
@@ -963,6 +905,17 @@ AC_SUBST(RALND)
 
 
 #
+#
+# 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_PROG_LINUX
 #
 # LNet linux kernel checks
@@ -1180,12 +1133,6 @@ lnet/ulnds/autoMakefile
 lnet/ulnds/socklnd/Makefile
 lnet/ulnds/ptllnd/Makefile
 lnet/utils/Makefile
-])
-case $lb_target_os in
-       darwin)
-               AC_CONFIG_FILES([
 lnet/include/lnet/darwin/Makefile
 ])
-               ;;
-esac
 ])