Branch b1_4

Allow tests to optionally be built with cray portals.
b=7117
r=bogl

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index a21f108..2b3ffe9 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -263,10 +263,14 @@ AC_DEFUN([LB_CONFIG_TESTS],
 AC_ARG_ENABLE([tests],
        AC_HELP_STRING([--disable-tests],
                        [disable building of Lustre tests]),
-       [],[enable_tests='yes'])
-if test x$cray_portals = xyes ; then
-       enable_tests='no'
-fi
+       [],
+       [
+               if test x$cray_portals = xyes ; then
+                       enable_tests='no'
+               else
+                       enable_tests='yes'
+               fi
+       ])
 AC_MSG_RESULT([$enable_tests])
 ])