ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

fix to the lustre configure logic.

Просмотр исходного кода 
This commit was SVN r26057.
Этот коммит содержится в:
Edgar Gabriel 2012-02-27 14:37:26 +00:00
родитель 7c9c3ede61
Коммит 025c14a19a
1 изменённых файлов: 11 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
ompi/config/ompi_check_lustre.m4
Просмотреть файл

@ -11,7 +11,7 @@
# Copyright (c) 2004-2006 The Regents of the University of California. # Copyright (c) 2004-2006 The Regents of the University of California.
# All rights reserved. # All rights reserved.
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2008-2011 University of Houston. All rights reserved. # Copyright (c) 2008-2012 University of Houston. All rights reserved.
# $COPYRIGHT$ # $COPYRIGHT$
# #
# Additional copyrights may follow # Additional copyrights may follow
@ -55,15 +55,15 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
temp_with_lustre="$with_lustre" temp_with_lustre="$with_lustre"
AS_IF([test -z "$with_lustre"], AS_IF([test -z "$with_lustre"],
[with_lustre="/usr/local"]) [with_lustre="/usr/"])
temp_with_lustre_libs="$with_lustre_libs" temp_with_lustre_libs="$with_lustre_libs"
AS_IF([test -z "$with_lustre_libs"], AS_IF([test -z "$with_lustre_libs"],
[with_lustre_libs="lustre lustreapi"]) [with_lustre_libs="lustre lustreapi"])
# Add correct -I and -L flags # Add correct -I and -L flags
AS_IF([test -d "$with_lustre/include"], AS_IF([test -d "$with_lustre/include/lustre/"],
[check_lustre_CPPFLAGS="-I$with_lustre/include" [check_lustre_CPPFLAGS="-I$with_lustre/include/lustre/"
$1_CPPFLAGS="$check_lustre_CPPFLAGS" $1_CPPFLAGS="$check_lustre_CPPFLAGS"
$1_CPPFLAGS="$check_lustre_CPPFLAGS" $1_CPPFLAGS="$check_lustre_CPPFLAGS"
CFLAGS="$CFLAGS $check_lustre_CPPFLAGS" CFLAGS="$CFLAGS $check_lustre_CPPFLAGS"
@ -73,8 +73,8 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
[ompi_check_lustre_happy="no"]) [ompi_check_lustre_happy="no"])
AS_IF([test "$ompi_check_lustre_happy" = "yes"], AS_IF([test "$ompi_check_lustre_happy" = "yes"],
[AS_IF([test -d "$with_lustre/lib"], [AS_IF([test -d "$with_lustre/lib64"],
[check_lustre_LDFLAGS="-L$with_lustre/lib" [check_lustre_LDFLAGS="-L$with_lustre/lib64"
$1_LDFLAGS="$check_lustre_LDFLAGS" $1_LDFLAGS="$check_lustre_LDFLAGS"
LDFLAGS="$LDFLAGS $check_lustre_LDFLAGS" LDFLAGS="$LDFLAGS $check_lustre_LDFLAGS"
WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $check_lustre_LDFLAGS"], WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $check_lustre_LDFLAGS"],
@ -93,10 +93,12 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $check_lustre_LIBS" WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $check_lustre_LIBS"
# check for lustre # check for lustre
AC_CHECK_HEADERS([lustre.h], AC_CHECK_HEADERS([liblustreapi.h],
[AC_MSG_CHECKING([if possible to link LUSTRE]) [AC_MSG_CHECKING([if possible to link LUSTRE])
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <lustre.h>], AC_LINK_IFELSE([AC_LANG_PROGRAM(
[int i;])], [[#include <stdio.h>
#include <liblustreapi.h>]],
[[llapi_file_create(NULL,0,-1,0, 0);]])],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
ompi_check_lustre_happy="yes"], ompi_check_lustre_happy="yes"],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])