From 12782ba7003132fe0520583ce063a79bdef953ca Mon Sep 17 00:00:00 2001 From: Matthias Jurenz Date: Tue, 12 Feb 2008 11:48:01 +0000 Subject: [PATCH] Added Ralfs's patch to make future contrib integration easier. Thanks, Ralf! This commit was SVN r17426. --- config/ompi_contrib.m4 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/config/ompi_contrib.m4 b/config/ompi_contrib.m4 index 91e1ea6e31..0cb1f4c641 100644 --- a/config/ompi_contrib.m4 +++ b/config/ompi_contrib.m4 @@ -67,20 +67,13 @@ AC_DEFUN([OMPI_CONTRIB],[ # Cycle through each of the hard-coded software packages and # configure them if not disabled. May someday be expanded to have # autogen find the packages instead of this hard-coded list - # (https://svn.open-mpi.org/trac/ompi/ticket/1162). I couldn't - # figure out a simple/easy way to have the m4 foreach do the m4 - # include *and* all the rest of the stuff, so I settled for having - # two lists: each contribted software package will need to add its - # configure.m4 list here and then add its name to the m4 define - # for contrib_software_list. Cope. -#dnl m4_include(ompi/contrib/libnbc/configure.m4) - m4_include(ompi/contrib/vt/configure.m4) - - m4_define(contrib_software_list, [vt]) -#dnl m4_define(contrib_software_list, [libnbc, vt]) + # (https://svn.open-mpi.org/trac/ompi/ticket/1162). + # m4_define([contrib_software_list], [libnbc, vt]) + m4_define([contrib_software_list], [vt]) m4_foreach(software, [contrib_software_list], - [OMPI_CONTRIB_DIST_SUBDIRS="$OMPI_CONTRIB_DIST_SUBDIRS contrib/software" - _OMPI_CONTRIB_CONFIGURE(software)]) + [m4_include([ompi/contrib/]software[/configure.m4]) + OMPI_CONTRIB_DIST_SUBDIRS="$OMPI_CONTRIB_DIST_SUBDIRS contrib/software" + _OMPI_CONTRIB_CONFIGURE(software)]) # Setup the top-level glue AC_SUBST(OMPI_CONTRIB_SUBDIRS)