Skip to content

Commit fe92744

Browse files
authored
Merge pull request #7884 from jsquyres/pr/die-enable-install-libpmix-die-die-die
v4.0.x: pmix3x: Remove --enable-install-libpmix option
2 parents 61a7637 + 447b140 commit fe92744

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

opal/mca/pmix/pmix3x/configure.m4

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# All rights reserved.
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
15-
# Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved.
15+
# Copyright (c) 2010-2020 Cisco Systems, Inc. All rights reserved
1616
# Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2015-2016 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
@@ -37,10 +37,6 @@ AC_DEFUN([MCA_opal_pmix_pmix3x_CONFIG],[
3737
opal_pmix_pmix3x_save_LDFLAGS=$LDFLAGS
3838
opal_pmix_pmix3x_save_LIBS=$LIBS
3939

40-
AC_ARG_ENABLE([install-libpmix],
41-
[AC_HELP_STRING([--enable-install-libpmix],
42-
[Enable a native PMIx library and headers in the OMPI install location (default: disabled)])])
43-
4440
AC_ARG_ENABLE([pmix-timing],
4541
[AC_HELP_STRING([--enable-pmix-timing],
4642
[Enable PMIx timing measurements (default: disabled)])])
@@ -54,16 +50,12 @@ AC_DEFUN([MCA_opal_pmix_pmix3x_CONFIG],[
5450
fi
5551

5652
opal_pmix_pmix3x_args="$opal_pmix_pmix3x_timing_flag --without-tests-examples --disable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility --enable-embedded-libevent --with-libevent-header=\\\"opal/mca/event/$opal_event_base_include\\\" --enable-embedded-hwloc --with-hwloc-header=\\\"$opal_hwloc_base_include\\\""
53+
opal_pmix_pmix3x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX3X_ --enable-embedded-mode $opal_pmix_pmix3x_args"
5754
AS_IF([test "$enable_debug" = "yes"],
5855
[opal_pmix_pmix3x_args="--enable-debug $opal_pmix_pmix3x_args"
5956
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
6057
[opal_pmix_pmix3x_args="--disable-debug $opal_pmix_pmix3x_args"
6158
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
62-
AC_MSG_CHECKING([if want to install standalone libpmix])
63-
AS_IF([test "$enable_install_libpmix" = "yes"],
64-
[AC_MSG_RESULT([yes])],
65-
[AC_MSG_RESULT([no])
66-
opal_pmix_pmix3x_args="--with-pmix-symbol-rename=OPAL_MCA_PMIX3X_ --enable-embedded-mode $opal_pmix_pmix3x_args"])
6759
AS_IF([test "$with_devel_headers" = "yes"],
6860
[opal_pmix_pmix3x_args="--with-devel-headers $opal_pmix_pmix3x_args"])
6961
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"

0 commit comments

Comments
 (0)