1
1

Fix "autogen.pl --no-ompi", which was broken due to inclusion of a conditional in the test/monitoring Makefile.am that is only defined if OMPI is built.

Per suggestion from @bosilca, comment out generation of the shared library

Use the patch from Gilles instead
Этот коммит содержится в:
Ralph Castain 2015-11-21 14:33:07 -08:00
родитель d8c85738ab
Коммит e33515c87c
2 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -1379,8 +1379,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],

Просмотреть файл

@ -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)