Rather than setting up the direct call stuff in ompi_mca (which requires
authorbrbarret
Mon Feb 04 23:26:42 2013 +0000 (3 months ago)
changeset 213718613a1221ba0
parent 21370 7fac70dfe1d2
child 21373 b255479ad026
Rather than setting up the direct call stuff in ompi_mca (which requires
modifying ompi_mca for every interface that is direct called), do it in
the framework's .m4 file.
config/ompi_mca.m4
ompi/mca/mtl/configure.m4
ompi/mca/pml/configure.m4
     1.1 --- a/config/ompi_mca.m4	Mon Feb 04 19:42:57 2013 +0000
     1.2 +++ b/config/ompi_mca.m4	Mon Feb 04 23:26:42 2013 +0000
     1.3 @@ -229,10 +229,6 @@
     1.4                  fi
     1.5                  MCA_CONFIGURE_PROJECT(mca_project)])
     1.6  
     1.7 -    # BWB - fix me...  need to automate this somehow
     1.8 -    MCA_SETUP_DIRECT_CALL(ompi, pml)
     1.9 -    MCA_SETUP_DIRECT_CALL(ompi, mtl)
    1.10 -
    1.11      AC_SUBST(MCA_PROJECT_SUBDIRS)
    1.12  
    1.13      m4_undefine([mca_component_configure_active])
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/ompi/mca/mtl/configure.m4	Mon Feb 04 23:26:42 2013 +0000
     2.3 @@ -0,0 +1,18 @@
     2.4 +# -*- shell-script -*-
     2.5 +#
     2.6 +# Copyright (c) 2013      Sandia National Laboratories.  All rights reserved.
     2.7 +#
     2.8 +# $COPYRIGHT$
     2.9 +# 
    2.10 +# Additional copyrights may follow
    2.11 +# 
    2.12 +# $HEADER$
    2.13 +#
    2.14 +
    2.15 +AC_DEFUN([MCA_ompi_mtl_CONFIG],[
    2.16 +    # configure all the components
    2.17 +    MCA_CONFIGURE_FRAMEWORK($1, $2, 1)
    2.18 +
    2.19 +    # this is a direct callable component, so set that up.
    2.20 +    MCA_SETUP_DIRECT_CALL($1, $2)
    2.21 +])
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/ompi/mca/pml/configure.m4	Mon Feb 04 23:26:42 2013 +0000
     3.3 @@ -0,0 +1,18 @@
     3.4 +# -*- shell-script -*-
     3.5 +#
     3.6 +# Copyright (c) 2013      Sandia National Laboratories.  All rights reserved.
     3.7 +#
     3.8 +# $COPYRIGHT$
     3.9 +# 
    3.10 +# Additional copyrights may follow
    3.11 +# 
    3.12 +# $HEADER$
    3.13 +#
    3.14 +
    3.15 +AC_DEFUN([MCA_ompi_pml_CONFIG],[
    3.16 +    # configure all the components
    3.17 +    MCA_CONFIGURE_FRAMEWORK($1, $2, 1)
    3.18 +
    3.19 +    # this is a direct callable component, so set that up.
    3.20 +    MCA_SETUP_DIRECT_CALL($1, $2)
    3.21 +])