Skip to content

Commit 664650e

Browse files
bwbarrettbwbarrett
authored
Merge pull request #5709 from jsquyres/pr/v3.1.x/io-configury-stuff
v3.1.x: io configury stuff
2 parents c6c5bf5 + 7b475e5 commit 664650e

File tree

5 files changed

+77
-39
lines changed

5 files changed

+77
-39
lines changed

‎config/ompi_check_lustre.m4‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2006 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
14-
dnl Copyright (c) 2008-2017 University of Houston. All rights reserved.
14+
dnl Copyright (c) 2008-2018 University of Houston. All rights reserved.
1515
dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
1717
dnl $COPYRIGHT$
@@ -45,23 +45,26 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[
4545
[Build Lustre support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
4646
OPAL_CHECK_WITHDIR([lustre], [$with_lustre], [include/lustre/lustreapi.h])
4747

48-
AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
49-
[ompi_check_lustre_dir="/usr"],
50-
[ompi_check_lustre_dir=$with_lustre])
51-
52-
if test -e "$ompi_check_lustre_dir/lib64" ; then
53-
ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib64"
54-
else
55-
ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib"
56-
fi
57-
58-
# Add correct -I and -L flags
59-
OPAL_CHECK_PACKAGE([$1], [lustre/lustreapi.h], [lustreapi], [llapi_file_create], [],
60-
[$ompi_check_lustre_dir], [$ompi_check_lustre_libdir], [ompi_check_lustre_happy="yes"],
61-
[ompi_check_lustre_happy="no"])
62-
63-
AC_MSG_CHECKING([for required lustre data structures])
64-
cat > conftest.c <<EOF
48+
AS_IF([test "$with_lustre" = "no"],
49+
[ompi_check_lustre_happy="no"],
50+
[AS_IF([test -z "$with_lustre" || test "$with_lustre" = "yes"],
51+
[ompi_check_lustre_dir="/usr"],
52+
[ompi_check_lustre_dir=$with_lustre])
53+
54+
if test -e "$ompi_check_lustre_dir/lib64" ; then
55+
ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib64"
56+
else
57+
ompi_check_lustre_libdir="$ompi_check_lustre_dir/lib"
58+
fi
59+
60+
# Add correct -I and -L flags
61+
OPAL_CHECK_PACKAGE([$1], [lustre/lustreapi.h], [lustreapi], [llapi_file_create],
62+
[], [$ompi_check_lustre_dir], [$ompi_check_lustre_libdir],
63+
[ompi_check_lustre_happy="yes"],
64+
[ompi_check_lustre_happy="no"])
65+
66+
AC_MSG_CHECKING([for required lustre data structures])
67+
cat > conftest.c <<EOF
6568
#include "lustre/lustreapi.h"
6669
void alloc_lum()
6770
{
@@ -82,7 +85,7 @@ OPAL_LOG_COMMAND(
8285
)
8386
rm -f conftest.c conftest.o
8487
AC_MSG_RESULT([$ompi_check_lustre_struct_happy])
85-
88+
])
8689

8790
AS_IF([test "$ompi_check_lustre_happy" = "yes"],
8891
[$2],

‎config/ompi_check_pvfs2.m4‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2006 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
14-
dnl Copyright (c) 2008-2016 University of Houston. All rights reserved.
14+
dnl Copyright (c) 2008-2018 University of Houston. All rights reserved.
1515
dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
1717
dnl $COPYRIGHT$
@@ -42,27 +42,30 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[
4242
[Build Pvfs2 support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
4343
OPAL_CHECK_WITHDIR([pvfs2], [$with_pvfs2], [include/pvfs2.h])
4444

45-
AS_IF([test -z "$with_pvfs2"],
46-
[ompi_check_pvfs2_dir="/usr/local"],
47-
[ompi_check_pvfs2_dir=$with_pvfs2])
45+
AS_IF([test "$with_pvfs2" = "no"],
46+
[ompi_check_pvfs2_happy="no"],
47+
[AS_IF([test -z "$with_pvfs2"],
48+
[ompi_check_pvfs2_dir="/usr/local"],
49+
[ompi_check_pvfs2_dir=$with_pvfs2])
4850

49-
if test -e "$ompi_check_pvfs2_dir/lib64" ; then
50-
ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib64"
51-
else
52-
ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib"
53-
fi
54-
55-
# Add correct -I and -L flags
56-
OPAL_CHECK_PACKAGE([$1], [pvfs2.h], [pvfs2], [PVFS_util_resolve], [],
57-
[$ompi_check_pvfs2_dir], [$ompi_check_pvfs2_libdir], [ompi_check_pvfs2_happy="yes"],
58-
[ompi_check_pvfs2_happy="no"])
51+
if test -e "$ompi_check_pvfs2_dir/lib64" ; then
52+
ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib64"
53+
else
54+
ompi_check_pvfs2_libdir="$ompi_check_pvfs2_dir/lib"
55+
fi
5956

57+
# Add correct -I and -L flags
58+
OPAL_CHECK_PACKAGE([$1], [pvfs2.h], [pvfs2], [PVFS_util_resolve], [],
59+
[$ompi_check_pvfs2_dir], [$ompi_check_pvfs2_libdir],
60+
[ompi_check_pvfs2_happy="yes"],
61+
[ompi_check_pvfs2_happy="no"])
62+
])
6063

6164
AS_IF([test "$ompi_check_pvfs2_happy" = "yes"],
62-
[$2],
63-
[AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"],
64-
[echo PVFS2 support not found])
65-
$3])
66-
67-
])
65+
[$2],
66+
[AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"],
67+
[echo PVFS2 support not found])
68+
$3])
69+
70+
])
6871

‎ompi/mca/fs/lustre/configure.m4‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ AC_DEFUN([MCA_ompi_fs_lustre_CONFIG],[
3434
[$1],
3535
[$2])
3636

37+
OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[Lustre]],[$1],[$fs_lustre_happy])
38+
3739
# substitute in the things needed to build lustre
3840
AC_SUBST([fs_lustre_CPPFLAGS])
3941
AC_SUBST([fs_lustre_LDFLAGS])

‎ompi/mca/fs/pvfs2/configure.m4‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ AC_DEFUN([MCA_ompi_fs_pvfs2_CONFIG],[
3030
[fs_pvfs2_happy="yes"],
3131
[fs_pvfs2_happy="no"])
3232

33+
OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[PVFS2/OrangeFS]],[$1],[$fs_pvfs2_happy])
3334
AS_IF([test "$fs_pvfs2_happy" = "yes"],
3435
[$1],
3536
[$2])

‎ompi/mca/fs/ufs/configure.m4‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
4+
# University Research and Technology
5+
# Corporation. All rights reserved.
6+
# Copyright (c) 2004-2005 The University of Tennessee and The University
7+
# of Tennessee Research Foundation. All rights
8+
# reserved.
9+
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
10+
# University of Stuttgart. All rights reserved.
11+
# Copyright (c) 2004-2012 The Regents of the University of California.
12+
# All rights reserved.
13+
# Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2008-2018 University of Houston. All rights reserved.
15+
# $COPYRIGHT$
16+
#
17+
# Additional copyrights may follow
18+
#
19+
# $HEADER$
20+
#
21+
22+
# MCA_fbtl_posix_CONFIG(action-if-can-compile,
23+
# [action-if-cant-compile])
24+
# ------------------------------------------------
25+
AC_DEFUN([MCA_ompi_fs_ufs_CONFIG],[
26+
AC_CONFIG_FILES([ompi/mca/fs/ufs/Makefile])
27+
28+
OPAL_SUMMARY_ADD([[OMPIO File Systems]],[[Generic Unix FS]],[$1],[yes])
29+
])dnl

0 commit comments

Comments
 (0)