Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: [OMPI devel] Fixlet for config/ompi_contrib.m4
From: Ralf Wildenhues (Ralf.Wildenhues_at_[hidden])
Date: 2008-02-11 15:14:43


Hello,

please apply this patch, to make future contrib integration just a tad
bit easier. I verified that the generated configure script is
identical, minus whitespace and comments.

Cheers,
Ralf

2008-02-11 Ralf Wildenhues <Ralf.Wildenhues_at_[hidden]>

        * config/ompi_contrib.m4 (OMPI_CONTRIB): Unify listings of
        contrib software packages.

Index: config/ompi_contrib.m4
===================================================================
--- config/ompi_contrib.m4 (Revision 17419)
+++ config/ompi_contrib.m4 (Arbeitskopie)
@@ -67,20 +67,13 @@
     # 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)