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 997c635..44c7a23 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -468,6 +468,11 @@ else
                           -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
@@ -484,7 +489,8 @@ else
                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>
@@ -529,11 +535,16 @@ 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
@@ -892,38 +903,16 @@ AC_SUBST(RALND)
 ])
 
 
+
 #
-# LN_FUNC_DUMP_TRACE
 #
-# 2.6.23 exports dump_trace() so we can dump_stack() on any task
-# 2.6.24 has stacktrace_ops.address with "reliable" parameter
+# LN_CONFIG_USERSPACE
 #
-AC_DEFUN([LN_FUNC_DUMP_TRACE],
-[LB_CHECK_SYMBOL_EXPORT([dump_trace],
-[kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
-       AC_DEFINE(HAVE_DUMP_TRACE, 1, [dump_trace is exported])
-       AC_MSG_CHECKING([whether print_trace_address has reliable argument])
-       tmp_flags="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="-Werror"
-       LB_LINUX_TRY_COMPILE([
-               struct task_struct;
-               struct pt_regs;
-               void print_addr(void *data, unsigned long addr, int reliable);
-               #include <asm/stacktrace.h>
-       ],[
-               struct stacktrace_ops ops;
-
-               ops.address = print_addr;
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_TRACE_ADDRESS_RELIABLE, 1,
-                         [print_trace_address has reliable argument])
-       ],[
-               AC_MSG_RESULT(no)
-       ],[
-       ])
-EXTRA_KCFLAGS="$tmp_flags"
-])
+# 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],
+[
 ])
 
 #
@@ -945,7 +934,6 @@ LN_CONFIG_O2IB
 LN_CONFIG_RALND
 LN_CONFIG_PTLLND
 LN_CONFIG_MX
-LN_FUNC_DUMP_TRACE
 ])
 
 #
@@ -1145,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
 ])