From f49118eaab2cd7040a26ea405644aadbf7c190e5 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 16 Feb 2017 10:54:47 -0800 Subject: [PATCH] Fix some pmix configuration code Remove stale file reference that caused a check to always fail. Update psm2 function check to new libs Signed-off-by: Ralph Castain --- .../pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 | 4 +--- opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 index b0a347e27b..78343b9126 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 @@ -1,7 +1,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. -dnl Copyright (c) 2013 Intel, Inc. All rights reserved +dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. dnl dnl $COPYRIGHT$ dnl @@ -35,7 +35,6 @@ AC_DEFUN([PMIX_CHECK_COMPILER], [ AC_TRY_RUN([ #include #include -#include "pmix_portable_platform.h" int main (int argc, char * argv[]) { @@ -68,7 +67,6 @@ AC_DEFUN([PMIX_CHECK_COMPILER_STRINGIFY], [ AC_TRY_RUN([ #include #include -#include "pmix_portable_platform.h" int main (int argc, char * argv[]) { diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 index d1304e98fc..b2c291fae4 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2006 QLogic Corp. All rights reserved. # Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2016 Intel Corporation. All rights reserved. +# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2016 Los Alamos National Security, LLC. All rights @@ -53,7 +53,7 @@ AC_DEFUN([PMIX_CHECK_PSM2],[ PMIX_CHECK_PACKAGE([pmix_check_psm2], [psm2.h], [psm2], - [psm_mq_irecv], + [psm2_mq_irecv2], [], [$pmix_check_psm2_dir], [$pmix_check_psm2_libdir],