@@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
2
2
dnl
3
3
dnl Copyright © 2014 Cisco Systems, Inc. All rights reserved.
4
4
dnl
5
- dnl Copyright © 2014-2016 Inria. All rights reserved.
5
+ dnl Copyright © 2014-2017 Inria. All rights reserved.
6
6
dnl See COPYING in top-level directory.
7
7
8
8
# Main hwloc m4 macro, to be invoked by the user
@@ -87,18 +87,21 @@ AC_DEFUN([NETLOC_CHECK_PLATFORM], [
87
87
AS_IF ( [ test "$hwloc_windows" = "yes"] ,
88
88
[ $1 =no netloc_missing_reason=" (Windows platform)"] )
89
89
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] )
90
100
] ) dnl
91
101
92
102
AC_DEFUN ( [ NETLOC_DO_AM_CONDITIONALS] , [
93
103
AM_CONDITIONAL([ BUILD_NETLOC] , [ test "$netloc_happy" = "yes"] )
94
-
95
- AC_CHECK_HEADERS ( [ scotch.h] ,
96
- [ scotch_found_headers=yes; break;] )
97
104
AM_CONDITIONAL([ BUILD_NETLOCSCOTCH] , [ test "x$scotch_found_headers" = "xyes"] )
98
- AC_CHECK_HEADERS ( [ mpi.h] ,
99
- [ mpi_found_headers=yes; break;] )
100
105
AM_CONDITIONAL([ BUILD_MPITOOLS] , [ test "x$mpi_found_headers" = "xyes"] )
101
-
102
- AC_CHECK_PROG ( [ xz] ,[ xz] ,[ yes] ,[ no] )
103
106
AM_CONDITIONAL([ FOUND_XZ] , [ test "x$xz" = xyes] )
104
107
] ) dnl
0 commit comments