This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via ae4a3653ada2c41f92dde2d9c73f9e8ab467e7dc (commit) via 22769cdb936b0e4b6fe9af5f6e0f67bbdf469de5 (commit) from 771e558011e970d9336932806dd27cc735e7e6c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/ae4a3653ada2c41f92dde2d9c73f9e8ab4... commit ae4a3653ada2c41f92dde2d9c73f9e8ab467e7dc Author: Ken Raffenetti <[email protected]> Date: Fri Aug 28 15:26:08 2015 -0700 MPL: fix embedded/standalone options 1. Add a configure flag to enable embedding. The flag is used by both MPICH and Hydra when no MPL library is supplied by the user. 2. Fix Makefile.am so an MPL library is installed when embedding is disabled. Signed-off-by: Halim Amer <[email protected]> diff --git a/configure.ac b/configure.ac index f5da513..d7ebe34 100644 --- a/configure.ac +++ b/configure.ac @@ -1170,7 +1170,7 @@ mpllib="" AC_SUBST([mpllib]) if test "$with_mpl_prefix" = "embedded" ; then # no need for libtool versioning when embedding MPL - mpl_subdir_args="--disable-versioning" + mpl_subdir_args="--disable-versioning --enable-embedded" PAC_CONFIG_SUBDIR_ARGS([src/mpl],[$mpl_subdir_args],[],[AC_MSG_ERROR(MPL configure failed)]) PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) diff --git a/src/mpl/Makefile.am b/src/mpl/Makefile.am index 34a7221..50a18f1 100644 --- a/src/mpl/Makefile.am +++ b/src/mpl/Makefile.am @@ -7,7 +7,6 @@ ACLOCAL_AMFLAGS = -I confdb AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -noinst_LTLIBRARIES = lib@[email protected] lib@MPLLIBNAME@_la_SOURCES = \ src/mplstr.c \ src/mpltrmem.c \ @@ -38,8 +37,10 @@ mpl_headers = \ if MPL_EMBEDDED_MODE noinst_HEADERS = $(mpl_headers) +noinst_LTLIBRARIES = lib@[email protected] else !MPL_EMBEDDED_MODE include_HEADERS = $(mpl_headers) +lib_LTLIBRARIES = lib@[email protected] endif !MPL_EMBEDDED_MODE # -------------------------------------------------------------------------- diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index 662e528..d4cdb0d 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -52,9 +52,11 @@ AC_C_INLINE PAC_C_MACRO_VA_ARGS -# TODO: could add a --enable-embedded or similar to also control this -AC_ARG_VAR([FROM_MPICH],[set to "yes" if building MPL inside of MPICH]) -AM_CONDITIONAL([MPL_EMBEDDED_MODE],[test "x${FROM_MPICH}" = "xyes"]) +AC_ARG_ENABLE(embedded, + AC_HELP_STRING([--enable-embedded], [Build MPL in embedded mode (default is no)]), + [embedded=yes], + [embedded=no]) +AM_CONDITIONAL([MPL_EMBEDDED_MODE],[test "x${embedded}" = "xyes"]) # support gcov test coverage information PAC_ENABLE_COVERAGE diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 505a170..360e086 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -160,7 +160,7 @@ if test "$with_mpl_prefix" = "embedded" ; then mpl_srcdir="mpl" mpl_dist_srcdir="mpl" mpl_lib="mpl/lib${MPLLIBNAME}.la" - mpl_subdir_args="--disable-versioning" + mpl_subdir_args="--disable-versioning --enable-embedded" PAC_CONFIG_SUBDIR_ARGS([mpl],[$mpl_subdir_args],[],[AC_MSG_ERROR(MPL configure failed)]) mpl_includedir='-I$(top_builddir)/mpl/include -I$(top_srcdir)/mpl/include' else http://git.mpich.org/mpich.git/commitdiff/22769cdb936b0e4b6fe9af5f6e0f67bbdf... commit 22769cdb936b0e4b6fe9af5f6e0f67bbdf469de5 Author: Ken Raffenetti <[email protected]> Date: Thu Dec 10 16:21:39 2015 -0600 pm/hydra: expand MPL options The inclusion of MPL in Hydra was hacky and did not work for user- supplied MPL libraries. This commit adds similar MPL options from the top-level MPICH configure.ac to Hydra. When building from MPICH, Hydra will build and link its own MPL convenience library. Signed-off-by: Halim Amer <[email protected]> diff --git a/src/pm/hydra/Makefile.am b/src/pm/hydra/Makefile.am index 5a0b91b..88c161c 100644 --- a/src/pm/hydra/Makefile.am +++ b/src/pm/hydra/Makefile.am @@ -6,8 +6,9 @@ external_subdirs = @mpl_srcdir@ external_dist_subdirs = @mpl_dist_srcdir@ -external_ldflags = -L$(top_builddir)/@mpl_srcdir@ -external_libs = -lmpl @WRAPPER_LIBS@ +external_includes = @mpl_includedir@ +external_ldflags = @mpl_libdir@ +external_libs = @mpl_lib@ @WRAPPER_LIBS@ bin_PROGRAMS = noinst_HEADERS = @@ -17,8 +18,7 @@ SUFFIXES = doc1_src_txt = ACLOCAL_AMFLAGS = -I confdb -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/@mpl_srcdir@/include \ - -I$(top_builddir)/@mpl_srcdir@/include +AM_CPPFLAGS = -I$(top_srcdir)/include $(external_includes) noinst_HEADERS += include/hydra.h include/hydra_server.h diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index d994d4b..505a170 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -132,22 +132,46 @@ PAC_POP_ALL_FLAGS AC_DEFINE_UNQUOTED(HYDRA_CONFIGURE_ARGS_CLEAN,"`echo $ac_configure_args`",[Configure arguments]) -# Dirty hack -- If we are compiling within MPICH, use the MPL in the -# src/mpl directory. If not, use the one we checked out separately for -# Hydra. -if test "$FROM_MPICH" = "yes" ; then - mpl_srcdir="../../mpl" - mpl_dist_srcdir= -else - mpl_srcdir="mpl" - mpl_dist_srcdir="mpl" - PAC_CONFIG_SUBDIR(mpl,,AC_ERROR(MPL configure failed)) -fi -AC_SUBST(mpl_srcdir) +# MPL +AC_ARG_VAR([MPLLIBNAME],[can be used to override the name of the MPL library (default: "mpl")]) +MPLLIBNAME=${MPLLIBNAME:-"mpl"} +export MPLLIBNAME +AC_SUBST(MPLLIBNAME) +AC_ARG_WITH([mpl-prefix], + [AS_HELP_STRING([[--with-mpl-prefix[=DIR]]], + [use the MPL library installed in DIR. Pass + "embedded" to force usage of the MPL source + distributed with Hydra.])], + [],dnl action-if-given + [with_mpl_prefix=embedded]) dnl action-if-not-given +mpl_srcdir="" +AC_SUBST([mpl_srcdir]) # Controls whether we recurse into the MPL dir when running "dist" rules like # "make distclean". Technically we are cheating whenever DIST_SUBDIRS is not a # superset of SUBDIRS, but we don't want to double-distclean and similar. AC_SUBST(mpl_dist_srcdir) +mpl_includedir="" +AC_SUBST([mpl_includedir]) +mpl_libdir="" +AC_SUBST([mpl_libdir]) +mpl_lib="" +AC_SUBST([mpl_lib]) +if test "$with_mpl_prefix" = "embedded" ; then + mpl_srcdir="mpl" + mpl_dist_srcdir="mpl" + mpl_lib="mpl/lib${MPLLIBNAME}.la" + mpl_subdir_args="--disable-versioning" + PAC_CONFIG_SUBDIR_ARGS([mpl],[$mpl_subdir_args],[],[AC_MSG_ERROR(MPL configure failed)]) + mpl_includedir='-I$(top_builddir)/mpl/include -I$(top_srcdir)/mpl/include' +else + # The user specified an already-installed MPL; just sanity check, don't + # subconfigure it + AS_IF([test -s "${with_mpl_prefix}/include/mplconfig.h"], + [:],[AC_MSG_ERROR([the MPL installation in "${with_mpl_prefix}" appears broken])]) + mpl_includedir="-I${with_mpl_prefix}/include" + mpl_libdir="-L${with_mpl_prefix}/lib" + mpl_lib="-l${MPLLIBNAME}" +fi # Documentation AC_PATH_PROG([DOXYGEN],[doxygen],,$PATH) ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- src/mpl/Makefile.am | 3 +- src/mpl/configure.ac | 8 ++++-- src/pm/hydra/Makefile.am | 8 +++--- src/pm/hydra/configure.ac | 48 +++++++++++++++++++++++++++++++++----------- 5 files changed, 48 insertions(+), 21 deletions(-) hooks/post-receive -- MPICH primary repository