Attachment #21100 for ticket #12396

Lines 19-24 AC_DEFUN([X_AC_PMIX], Link Here

(-)a/auxdir/x_ac_pmix.m4 (-2 / +35 lines)
19	_x_ac_pmix_v2_found="0"	19	_x_ac_pmix_v2_found="0"
20	_x_ac_pmix_v3_found="0"	20	_x_ac_pmix_v3_found="0"
21	_x_ac_pmix_v4_found="0"	21	_x_ac_pmix_v4_found="0"
		22	_x_ac_pmix_v5_found="0"
22		23
23	AC_ARG_WITH(	24	AC_ARG_WITH(
24	[pmix],	25	[pmix],
Lines 60-65 AC_DEFUN([X_AC_PMIX], Link Here
60		61
61	_x_ac_pmix_version="0"	62	_x_ac_pmix_version="0"
62	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([	63	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
		64	#include <pmix_version.h>
		65	#if (PMIX_VERSION_MAJOR != 5L)
		66	#error "not version 5"
		67	#endif
		68	], [ ] )],
		69	[ _x_ac_pmix_version="5" ],
		70	[ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
63	#include <pmix_version.h>	71	#include <pmix_version.h>
64	#if (PMIX_VERSION_MAJOR != 4L)	72	#if (PMIX_VERSION_MAJOR != 4L)
65	#error "not version 4"	73	#error "not version 4"
Lines 83-88 AC_DEFUN([X_AC_PMIX], Link Here
83	[ _x_ac_pmix_version="1" ] )	91	[ _x_ac_pmix_version="1" ] )
84	])	92	])
85	])	93	])
		94	])
86		95
87	CPPFLAGS="$_x_ac_pmix_cppflags_save"	96	CPPFLAGS="$_x_ac_pmix_cppflags_save"
88	LIBS="$_x_ac_pmix_libs_save"	97	LIBS="$_x_ac_pmix_libs_save"
Lines 161-166 AC_DEFUN([X_AC_PMIX], Link Here
161	# symlink of lib.	170	# symlink of lib.
162	break	171	break
163	fi	172	fi
		173
		174	if [test "$_x_ac_pmix_version" = "5"]; then
		175	if [test "$_x_ac_pmix_v5_found" = "1" ]; then
		176	m4_define([err_pmix_v5],[error processing $x_ac_cv_pmix_libdir: PMIx v5.x])
		177	AC_MSG_ERROR(err_pmix_v5 err_pmix)
		178	fi
		179	_x_ac_pmix_v5_found="1"
		180	PMIX_V5_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
		181	if test "$ac_with_rpath" = "yes"; then
		182	PMIX_V5_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
		183	else
		184	PMIX_V5_CPPFLAGS=$PMIX_V5_CPPFLAGS" -DPMIXP_V5_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\""
		185	fi
		186	# We don't want to search the other lib after we found it in
		187	# one place or we might report a false duplicate if lib64 is a
		188	# symlink of lib.
		189	break
		190	fi
		191
164	done	192	done
165	done	193	done
166	])	194	])
Lines 175-183 AC_DEFUN([X_AC_PMIX], Link Here
175	AC_SUBST(PMIX_V3_LDFLAGS)	203	AC_SUBST(PMIX_V3_LDFLAGS)
176	AC_SUBST(PMIX_V4_CPPFLAGS)	204	AC_SUBST(PMIX_V4_CPPFLAGS)
177	AC_SUBST(PMIX_V4_LDFLAGS)	205	AC_SUBST(PMIX_V4_LDFLAGS)
		206	AC_SUBST(PMIX_V5_CPPFLAGS)
		207	AC_SUBST(PMIX_V5_LDFLAGS)
178		208
179	if test $_x_ac_pmix_v1_found = 0 && test $_x_ac_pmix_v2_found = 0 &&	209	if test $_x_ac_pmix_v1_found = 0 && test $_x_ac_pmix_v2_found = 0 &&
180	test $_x_ac_pmix_v3_found = 0 && test $_x_ac_pmix_v4_found = 0; then	210	test $_x_ac_pmix_v3_found = 0 && test $_x_ac_pmix_v4_found = 0 && test $_x_ac_pmix_v5_found = 0; then
181	if test -z "$with_pmix"; then	211	if test -z "$with_pmix"; then
182	AC_MSG_WARN([unable to locate pmix installation])	212	AC_MSG_WARN([unable to locate pmix installation])
183	else	213	else
Lines 188-196 AC_DEFUN([X_AC_PMIX], Link Here
188		218
189	AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] \|\|	219	AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] \|\|
190	[test $_x_ac_pmix_v2_found = "1"] \|\|	220	[test $_x_ac_pmix_v2_found = "1"] \|\|
191	[test $_x_ac_pmix_v3_found = "1"] )	221	[test $_x_ac_pmix_v3_found = "1"] \|\|
		222	[test $_x_ac_pmix_v4_found = "1"] \|\|
		223	[test $_x_ac_pmix_v5_found = "1"] )
192	AM_CONDITIONAL(HAVE_PMIX_V1, [test $_x_ac_pmix_v1_found = "1"])	224	AM_CONDITIONAL(HAVE_PMIX_V1, [test $_x_ac_pmix_v1_found = "1"])
193	AM_CONDITIONAL(HAVE_PMIX_V2, [test $_x_ac_pmix_v2_found = "1"])	225	AM_CONDITIONAL(HAVE_PMIX_V2, [test $_x_ac_pmix_v2_found = "1"])
194	AM_CONDITIONAL(HAVE_PMIX_V3, [test $_x_ac_pmix_v3_found = "1"])	226	AM_CONDITIONAL(HAVE_PMIX_V3, [test $_x_ac_pmix_v3_found = "1"])
195	AM_CONDITIONAL(HAVE_PMIX_V4, [test $_x_ac_pmix_v4_found = "1"])	227	AM_CONDITIONAL(HAVE_PMIX_V4, [test $_x_ac_pmix_v4_found = "1"])
		228	AM_CONDITIONAL(HAVE_PMIX_V5, [test $_x_ac_pmix_v5_found = "1"])
196	])	229	])





endif

if HAVE_PMIX_V5

pkglib_v5dir=$(pkglibdir)
pkglib_v5_LTLIBRARIES = mpi_pmix_v5.la
mpi_pmix_v5_la_SOURCES = $(pmix_src) pmixp_client_v2.c
mpi_pmix_v5_la_LIBADD = $(pmix_libadd)
mpi_pmix_v5_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V5_LDFLAGS)
mpi_pmix_v5_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V5_CPPFLAGS) -DHAVE_PMIX_VER=5

endif


if HAVE_PMIX_V5
mpi_pmix_so := mpi_pmix_v5.so
else

if HAVE_PMIX_V4
mpi_pmix_so := mpi_pmix_v4.so
else

mpi_pmix_so := mpi_pmix_v1.so
endif

endif
endif
endif
endif

Return to ticket 12396

Lines 74-79 mpi_pmix_v4_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V4_CPPFLAGS) -DHAVE_PMIX_VER=4 Link Here

(-)a/src/plugins/mpi/pmix/Makefile.am (+17 lines)
74		74
75	endif	75	endif
76		76
		77	if HAVE_PMIX_V5
		78
		79	pkglib_v5dir=$(pkglibdir)
		80	pkglib_v5_LTLIBRARIES = mpi_pmix_v5.la
		81	mpi_pmix_v5_la_SOURCES = $(pmix_src) pmixp_client_v2.c
		82	mpi_pmix_v5_la_LIBADD = $(pmix_libadd)
		83	mpi_pmix_v5_la_LDFLAGS = $(pmix_ldflags) $(PMIX_V5_LDFLAGS)
		84	mpi_pmix_v5_la_CPPFLAGS = $(AM_CPPFLAGS) $(PMIX_V5_CPPFLAGS) -DHAVE_PMIX_VER=5
		85
		86	endif
		87
		88
		89	if HAVE_PMIX_V5
		90	mpi_pmix_so := mpi_pmix_v5.so
		91	else
		92
77	if HAVE_PMIX_V4	93	if HAVE_PMIX_V4
78	mpi_pmix_so := mpi_pmix_v4.so	94	mpi_pmix_so := mpi_pmix_v4.so
79	else	95	else
Lines 90-95 if HAVE_PMIX_V1 Link Here
90	mpi_pmix_so := mpi_pmix_v1.so	106	mpi_pmix_so := mpi_pmix_v1.so
91	endif	107	endif
92		108
		109	endif
93	endif	110	endif
94	endif	111	endif
95	endif	112	endif