Skip to content

Commit 7260d9c

Browse files
committed
netloc: look for archSub when checking scotch
Signed-off-by: Cyril Bordage <[email protected]>
1 parent 229eddc commit 7260d9c

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

config/netloc.m4

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
22
dnl
33
dnl Copyright © 2014 Cisco Systems, Inc. All rights reserved.
44
dnl
5-
dnl Copyright © 2014-2016 Inria. All rights reserved.
5+
dnl Copyright © 2014-2017 Inria. All rights reserved.
66
dnl See COPYING in top-level directory.
77

88
# Main hwloc m4 macro, to be invoked by the user
@@ -87,18 +87,21 @@ AC_DEFUN([NETLOC_CHECK_PLATFORM], [
8787
AS_IF([test "$hwloc_windows" = "yes"],
8888
[$1=no netloc_missing_reason=" (Windows platform)"])
8989
AC_MSG_RESULT([$$1$netloc_missing_reason])
90+
91+
AC_CHECK_LIB(scotch, SCOTCH_archSub,
92+
[scotch_found_headers=yes;
93+
AC_DEFINE([NETLOC_SCOTCH], [1],
94+
[Define to 1 if scotch is netlocscotch is enabled])
95+
], [], -lscotcherr)
96+
AC_CHECK_HEADERS([mpi.h],
97+
[mpi_found_headers=yes; break;])
98+
99+
AC_CHECK_PROG([xz],[xz],[yes],[no])
90100
])dnl
91101

92102
AC_DEFUN([NETLOC_DO_AM_CONDITIONALS], [
93103
AM_CONDITIONAL([BUILD_NETLOC], [test "$netloc_happy" = "yes"])
94-
95-
AC_CHECK_HEADERS([scotch.h],
96-
[scotch_found_headers=yes; break;])
97104
AM_CONDITIONAL([BUILD_NETLOCSCOTCH], [test "x$scotch_found_headers" = "xyes"])
98-
AC_CHECK_HEADERS([mpi.h],
99-
[mpi_found_headers=yes; break;])
100105
AM_CONDITIONAL([BUILD_MPITOOLS], [test "x$mpi_found_headers" = "xyes"])
101-
102-
AC_CHECK_PROG([xz],[xz],[yes],[no])
103106
AM_CONDITIONAL([FOUND_XZ], [test "x$xz" = xyes])
104107
])dnl

0 commit comments

Comments
 (0)