17
17
#
18
18
# Priority
19
19
#
20
- AC_DEFUN([MCA_opal_hwloc_hwloc1113_PRIORITY ], [90])
20
+ AC_DEFUN([MCA_opal_hwloc_hwloc1116_PRIORITY ], [90])
21
21
22
22
#
23
23
# Force this component to compile in static-only mode
24
24
#
25
- AC_DEFUN([MCA_opal_hwloc_hwloc1113_COMPILE_MODE ], [
25
+ AC_DEFUN([MCA_opal_hwloc_hwloc1116_COMPILE_MODE ], [
26
26
AC_MSG_CHECKING([for MCA component $2 :$3 compile mode])
27
27
$4 = " static"
28
28
AC_MSG_RESULT([$$ 4])
29
29
])
30
30
31
31
# Include hwloc m4 files
32
- m4_include(opal/mca/hwloc/hwloc1113 /hwloc/config/hwloc.m4)
33
- m4_include(opal/mca/hwloc/hwloc1113 /hwloc/config/hwloc_pkg.m4)
34
- m4_include(opal/mca/hwloc/hwloc1113 /hwloc/config/hwloc_check_attributes.m4)
35
- m4_include(opal/mca/hwloc/hwloc1113 /hwloc/config/hwloc_check_visibility.m4)
36
- m4_include(opal/mca/hwloc/hwloc1113 /hwloc/config/hwloc_check_vendor.m4)
37
- m4_include(opal/mca/hwloc/hwloc1113 /hwloc/config/hwloc_components.m4)
38
-
39
- # MCA_hwloc_hwloc1113_POST_CONFIG ()
32
+ m4_include(opal/mca/hwloc/hwloc1116 /hwloc/config/hwloc.m4)
33
+ m4_include(opal/mca/hwloc/hwloc1116 /hwloc/config/hwloc_pkg.m4)
34
+ m4_include(opal/mca/hwloc/hwloc1116 /hwloc/config/hwloc_check_attributes.m4)
35
+ m4_include(opal/mca/hwloc/hwloc1116 /hwloc/config/hwloc_check_visibility.m4)
36
+ m4_include(opal/mca/hwloc/hwloc1116 /hwloc/config/hwloc_check_vendor.m4)
37
+ m4_include(opal/mca/hwloc/hwloc1116 /hwloc/config/hwloc_components.m4)
38
+
39
+ # MCA_hwloc_hwloc1116_POST_CONFIG ()
40
40
# ---------------------------------
41
- AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG ],[
42
- OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1113_basedir ])
41
+ AC_DEFUN([MCA_opal_hwloc_hwloc1116_POST_CONFIG ],[
42
+ OPAL_VAR_SCOPE_PUSH([opal_hwloc_hwloc1116_basedir ])
43
43
44
44
# If we won, then do all the rest of the setup
45
- AS_IF([test " $1 " = " 1" && test " $opal_hwloc_hwloc1113_support " = " yes" ],
45
+ AS_IF([test " $1 " = " 1" && test " $opal_hwloc_hwloc1116_support " = " yes" ],
46
46
[
47
47
# Set this variable so that the framework m4 knows what
48
48
# file to include in opal/mca/hwloc/hwloc-internal.h
49
- opal_hwloc_hwloc1113_basedir = opal/mca/hwloc/hwloc1113
50
- opal_hwloc_base_include= " $opal_hwloc_hwloc1113_basedir /hwloc1113 .h"
49
+ opal_hwloc_hwloc1116_basedir = opal/mca/hwloc/hwloc1116
50
+ opal_hwloc_base_include= " $opal_hwloc_hwloc1116_basedir /hwloc1116 .h"
51
51
52
52
# Add some stuff to CPPFLAGS so that the rest of the source
53
53
# tree can be built
54
- file= $opal_hwloc_hwloc1113_basedir /hwloc
54
+ file= $opal_hwloc_hwloc1116_basedir /hwloc
55
55
CPPFLAGS= " -I$OPAL_TOP_SRCDIR /$file /include $CPPFLAGS "
56
56
AS_IF([test " $OPAL_TOP_BUILDDIR " != " $OPAL_TOP_SRCDIR " ],
57
57
[CPPFLAGS= " -I$OPAL_TOP_BUILDDIR /$file /include $CPPFLAGS " ])
@@ -64,39 +64,39 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_POST_CONFIG],[
64
64
])dnl
65
65
66
66
67
- # MCA_hwloc_hwloc1113_CONFIG ([action-if-found], [action-if-not-found])
67
+ # MCA_hwloc_hwloc1116_CONFIG ([action-if-found], [action-if-not-found])
68
68
# --------------------------------------------------------------------
69
- AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG ],[
69
+ AC_DEFUN([MCA_opal_hwloc_hwloc1116_CONFIG ],[
70
70
# Hwloc needs to know if we have Verbs support
71
71
AC_REQUIRE([OPAL_CHECK_VERBS_DIR])
72
72
73
- AC_CONFIG_FILES([opal/mca/hwloc/hwloc1113 /Makefile])
73
+ AC_CONFIG_FILES([opal/mca/hwloc/hwloc1116 /Makefile])
74
74
75
- OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1113_save_CPPFLAGS opal_hwloc_hwloc1113_save_LDFLAGS opal_hwloc_hwloc1113_save_LIBS opal_hwloc_hwloc1113_save_cairo opal_hwloc_hwloc1113_save_xml opal_hwloc_hwloc1113_basedir opal_hwloc_hwloc1113_file opal_hwloc_hwloc1113_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
75
+ OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc1116_save_CPPFLAGS opal_hwloc_hwloc1116_save_LDFLAGS opal_hwloc_hwloc1116_save_LIBS opal_hwloc_hwloc1116_save_cairo opal_hwloc_hwloc1116_save_xml opal_hwloc_hwloc1116_basedir opal_hwloc_hwloc1116_file opal_hwloc_hwloc1116_save_cflags CPPFLAGS_save LIBS_save opal_hwloc_external])
76
76
77
77
# default to this component not providing support
78
- opal_hwloc_hwloc1113_basedir = opal/mca/hwloc/hwloc1113
79
- opal_hwloc_hwloc1113_support = no
78
+ opal_hwloc_hwloc1116_basedir = opal/mca/hwloc/hwloc1116
79
+ opal_hwloc_hwloc1116_support = no
80
80
81
81
AS_IF([test " $with_hwloc " = " internal" || test -z " $with_hwloc " || test " $with_hwloc " = " yes" ],
82
82
[opal_hwloc_external= " no" ],
83
83
[opal_hwloc_external= " yes" ])
84
84
85
- opal_hwloc_hwloc1113_save_CPPFLAGS = $CPPFLAGS
86
- opal_hwloc_hwloc1113_save_LDFLAGS = $LDFLAGS
87
- opal_hwloc_hwloc1113_save_LIBS = $LIBS
85
+ opal_hwloc_hwloc1116_save_CPPFLAGS = $CPPFLAGS
86
+ opal_hwloc_hwloc1116_save_LDFLAGS = $LDFLAGS
87
+ opal_hwloc_hwloc1116_save_LIBS = $LIBS
88
88
89
89
# Run the hwloc configuration - if no external hwloc, then set the prefixi
90
90
# to minimize the chance that someone will use the internal symbols
91
91
AS_IF([test " $opal_hwloc_external " = " no" ],
92
- [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1113_ ])])
92
+ [HWLOC_SET_SYMBOL_PREFIX([opal_hwloc1116_ ])])
93
93
94
94
# save XML or graphical options
95
- opal_hwloc_hwloc1113_save_cairo = $enable_cairo
96
- opal_hwloc_hwloc1113_save_xml = $enable_xml
97
- opal_hwloc_hwloc1113_save_static = $enable_static
98
- opal_hwloc_hwloc1113_save_shared = $enable_shared
99
- opal_hwloc_hwloc1113_save_plugins = $enable_plugins
95
+ opal_hwloc_hwloc1116_save_cairo = $enable_cairo
96
+ opal_hwloc_hwloc1116_save_xml = $enable_xml
97
+ opal_hwloc_hwloc1116_save_static = $enable_static
98
+ opal_hwloc_hwloc1116_save_shared = $enable_shared
99
+ opal_hwloc_hwloc1116_save_plugins = $enable_plugins
100
100
101
101
# never enable hwloc's graphical option
102
102
enable_cairo= no
@@ -113,19 +113,19 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
113
113
114
114
# hwloc checks for compiler visibility, and its needs to do
115
115
# this without "picky" flags.
116
- opal_hwloc_hwloc1113_save_cflags = $CFLAGS
116
+ opal_hwloc_hwloc1116_save_cflags = $CFLAGS
117
117
CFLAGS= $OPAL_CFLAGS_BEFORE_PICKY
118
- HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1113 /hwloc],
118
+ HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc1116 /hwloc],
119
119
[AC_MSG_CHECKING([whether hwloc configure succeeded])
120
120
AC_MSG_RESULT([yes])
121
- HWLOC_VERSION= " internal v` $srcdir /$opal_hwloc_hwloc1113_basedir /hwloc/config/hwloc_get_version.sh $srcdir /$opal_hwloc_hwloc1113_basedir /hwloc/VERSION` "
121
+ HWLOC_VERSION= " internal v` $srcdir /$opal_hwloc_hwloc1116_basedir /hwloc/config/hwloc_get_version.sh $srcdir /$opal_hwloc_hwloc1116_basedir /hwloc/VERSION` "
122
122
123
123
# Build flags for our Makefile.am
124
- opal_hwloc_hwloc1113_LDFLAGS = ' $(HWLOC_EMBEDDED_LDFLAGS)'
125
- opal_hwloc_hwloc1113_LIBS = ' $(OPAL_TOP_BUILDDIR)/' " $opal_hwloc_hwloc1113_basedir " ' /hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
126
- opal_hwloc_hwloc1113_support = yes
124
+ opal_hwloc_hwloc1116_LDFLAGS = ' $(HWLOC_EMBEDDED_LDFLAGS)'
125
+ opal_hwloc_hwloc1116_LIBS = ' $(OPAL_TOP_BUILDDIR)/' " $opal_hwloc_hwloc1116_basedir " ' /hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
126
+ opal_hwloc_hwloc1116_support = yes
127
127
128
- AC_DEFINE_UNQUOTED([HWLOC_HWLOC1113_HWLOC_VERSION ],
128
+ AC_DEFINE_UNQUOTED([HWLOC_HWLOC1116_HWLOC_VERSION ],
129
129
[" $HWLOC_VERSION " ],
130
130
[Version of hwloc])
131
131
@@ -138,35 +138,35 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
138
138
],
139
139
[AC_MSG_CHECKING([whether hwloc configure succeeded])
140
140
AC_MSG_RESULT([no])
141
- opal_hwloc_hwloc1113_support = no])
142
- CFLAGS= $opal_hwloc_hwloc1113_save_cflags
141
+ opal_hwloc_hwloc1116_support = no])
142
+ CFLAGS= $opal_hwloc_hwloc1116_save_cflags
143
143
144
144
# Restore some env variables, if necessary
145
- AS_IF([test -n " $opal_hwloc_hwloc1113_save_cairo " ],
146
- [enable_cairo= $opal_hwloc_hwloc1113_save_cairo ])
147
- AS_IF([test -n " $opal_hwloc_hwloc1113_save_xml " ],
148
- [enable_xml= $opal_hwloc_hwloc1113_save_xml ])
149
- AS_IF([test -n " $opal_hwloc_hwloc1113_save_static " ],
150
- [enable_static= $opal_hwloc_hwloc1113_save_static ])
151
- AS_IF([test -n " $opal_hwloc_hwloc1113_save_shared " ],
152
- [enable_shared= $opal_hwloc_hwloc1113_save_shared ])
153
- AS_IF([test -n " $opal_hwloc_hwloc1113_save_plugins " ],
154
- [enable_plugins= $opal_hwloc_hwloc1113_save_shared ])
155
-
156
- CPPFLAGS= $opal_hwloc_hwloc1113_save_CPPFLAGS
157
- LDFLAGS= $opal_hwloc_hwloc1113_save_LDFLAGS
158
- LIBS= $opal_hwloc_hwloc1113_save_LIBS
159
-
160
- AC_SUBST([opal_hwloc_hwloc1113_CFLAGS ])
161
- AC_SUBST([opal_hwloc_hwloc1113_CPPFLAGS ])
162
- AC_SUBST([opal_hwloc_hwloc1113_LDFLAGS ])
163
- AC_SUBST([opal_hwloc_hwloc1113_LIBS ])
145
+ AS_IF([test -n " $opal_hwloc_hwloc1116_save_cairo " ],
146
+ [enable_cairo= $opal_hwloc_hwloc1116_save_cairo ])
147
+ AS_IF([test -n " $opal_hwloc_hwloc1116_save_xml " ],
148
+ [enable_xml= $opal_hwloc_hwloc1116_save_xml ])
149
+ AS_IF([test -n " $opal_hwloc_hwloc1116_save_static " ],
150
+ [enable_static= $opal_hwloc_hwloc1116_save_static ])
151
+ AS_IF([test -n " $opal_hwloc_hwloc1116_save_shared " ],
152
+ [enable_shared= $opal_hwloc_hwloc1116_save_shared ])
153
+ AS_IF([test -n " $opal_hwloc_hwloc1116_save_plugins " ],
154
+ [enable_plugins= $opal_hwloc_hwloc1116_save_shared ])
155
+
156
+ CPPFLAGS= $opal_hwloc_hwloc1116_save_CPPFLAGS
157
+ LDFLAGS= $opal_hwloc_hwloc1116_save_LDFLAGS
158
+ LIBS= $opal_hwloc_hwloc1116_save_LIBS
159
+
160
+ AC_SUBST([opal_hwloc_hwloc1116_CFLAGS ])
161
+ AC_SUBST([opal_hwloc_hwloc1116_CPPFLAGS ])
162
+ AC_SUBST([opal_hwloc_hwloc1116_LDFLAGS ])
163
+ AC_SUBST([opal_hwloc_hwloc1116_LIBS ])
164
164
165
165
# Finally, add some flags to the wrapper compiler so that our
166
166
# headers can be found.
167
- hwloc_hwloc1113_WRAPPER_EXTRA_LDFLAGS = " $HWLOC_EMBEDDED_LDFLAGS "
168
- hwloc_hwloc1113_WRAPPER_EXTRA_LIBS = " $HWLOC_EMBEDDED_LIBS "
169
- hwloc_hwloc1113_WRAPPER_EXTRA_CPPFLAGS = ' -I${pkgincludedir}/' " $opal_hwloc_hwloc1113_basedir /hwloc/include"
167
+ hwloc_hwloc1116_WRAPPER_EXTRA_LDFLAGS = " $HWLOC_EMBEDDED_LDFLAGS "
168
+ hwloc_hwloc1116_WRAPPER_EXTRA_LIBS = " $HWLOC_EMBEDDED_LIBS "
169
+ hwloc_hwloc1116_WRAPPER_EXTRA_CPPFLAGS = ' -I${pkgincludedir}/' " $opal_hwloc_hwloc1116_basedir /hwloc/include"
170
170
171
171
# If we are not building the internal hwloc, then indicate that
172
172
# this component should not be built. NOTE: we still did all the
@@ -176,12 +176,12 @@ AC_DEFUN([MCA_opal_hwloc_hwloc1113_CONFIG],[
176
176
# distclean" infrastructure to work properly).
177
177
AS_IF([test " $opal_hwloc_external " = " yes" ],
178
178
[AC_MSG_WARN([using an external hwloc; disqualifying this component])
179
- opal_hwloc_hwloc1113_support = no],
179
+ opal_hwloc_hwloc1116_support = no],
180
180
[AC_DEFINE([HAVE_DECL_HWLOC_OBJ_OSDEV_COPROC], [1])
181
181
AC_DEFINE([HAVE_HWLOC_TOPOLOGY_DUP], [1])])
182
182
183
183
# Done!
184
- AS_IF([test " $opal_hwloc_hwloc1113_support " = " yes" ],
184
+ AS_IF([test " $opal_hwloc_hwloc1116_support " = " yes" ],
185
185
[$1 ],
186
186
[$2 ])
187
187
0 commit comments