Merge pull request #1143 from rhc54/topic/noompi

Fix "autogen.pl --no-ompi"

configure.ac

@@ -1377,8 +1377,9 @@ AC_CONFIG_FILES([
     test/support/Makefile
     test/threads/Makefile
     test/util/Makefile
-    test/monitoring/Makefile
 ])
+m4_ifdef([project_ompi], [AC_CONFIG_FILES([test/monitoring/Makefile])])
+
 AC_CONFIG_FILES([contrib/dist/mofed/debian/rules],
                 [chmod +x contrib/dist/mofed/debian/rules])
 AC_CONFIG_FILES([contrib/dist/mofed/compile_debian_mlnx_example],

test/Makefile.am

@@ -11,6 +11,8 @@
 #                         All rights reserved.
 # Copyright (c) 2009      Sun Microsystems, Inc. All rights reserved.
 # Copyright (c) 2010      Cisco Systems, Inc. All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -19,5 +21,8 @@
 #
 
 # support needs to be first for dependencies
-SUBDIRS = support asm class threads datatype util monitoring
+SUBDIRS = support asm class threads datatype util
+if PROJECT_OMPI
+SUBDIRS += monitoring
+endif
 DIST_SUBDIRS = event $(SUBDIRS)