1
1

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 <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2017-02-16 10:54:47 -08:00
родитель b272f87926
Коммит f49118eaab
2 изменённых файлов: 3 добавлений и 5 удалений

Просмотреть файл

@ -1,7 +1,7 @@
dnl -*- shell-script -*- dnl -*- shell-script -*-
dnl dnl
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. 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
dnl $COPYRIGHT$ dnl $COPYRIGHT$
dnl dnl
@ -35,7 +35,6 @@ AC_DEFUN([PMIX_CHECK_COMPILER], [
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "pmix_portable_platform.h"
int main (int argc, char * argv[]) int main (int argc, char * argv[])
{ {
@ -68,7 +67,6 @@ AC_DEFUN([PMIX_CHECK_COMPILER_STRINGIFY], [
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "pmix_portable_platform.h"
int main (int argc, char * argv[]) int main (int argc, char * argv[])
{ {

Просмотреть файл

@ -12,7 +12,7 @@
# All rights reserved. # All rights reserved.
# Copyright (c) 2006 QLogic Corp. All rights reserved. # Copyright (c) 2006 QLogic Corp. All rights reserved.
# Copyright (c) 2009-2016 Cisco Systems, Inc. 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 # Copyright (c) 2015 Research Organization for Information Science
# and Technology (RIST). All rights reserved. # and Technology (RIST). All rights reserved.
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights # 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], PMIX_CHECK_PACKAGE([pmix_check_psm2],
[psm2.h], [psm2.h],
[psm2], [psm2],
[psm_mq_irecv], [psm2_mq_irecv2],
[], [],
[$pmix_check_psm2_dir], [$pmix_check_psm2_dir],
[$pmix_check_psm2_libdir], [$pmix_check_psm2_libdir],