More prefixing ...

find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_HWLOC\b"/STARPU_HAVE_HWLOC/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_INTTYPES_H\b"/STARPU_HAVE_INTTYPES_H/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_LIBATLAS\b"/STARPU_HAVE_LIBATLAS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_LIBCBLAS\b"/STARPU_HAVE_LIBCBLAS/g
find . -type f -not -name "*svn*"|xargs sed -i s/"\bHAVE_LIBELF\b"/STARPU_HAVE_LIBELF/g

configure.ac

@@ -685,8 +685,8 @@ PKG_CHECK_MODULES([FFTWL], [fftw3l], [
 AM_CONDITIONAL(STARPU_HAVE_FFTWL, [test x$have_fftwl = xyes])
 
 PKG_CHECK_MODULES([HWLOC], [hwloc], [
-  AC_DEFINE([HAVE_HWLOC], [1], [Define to 1 if you have the hwloc library.])
-  AC_SUBST([HAVE_HWLOC], [1])
+  AC_DEFINE([STARPU_HAVE_HWLOC], [1], [Define to 1 if you have the hwloc library.])
+  AC_SUBST([STARPU_HAVE_HWLOC], [1])
 ], [:])
 
 AC_CONFIG_HEADER(src/common/config.h include/starpu_config.h)

src/core/topology.c

@@ -22,7 +22,7 @@
 #include <core/topology.h>
 #include <drivers/cuda/driver_cuda.h>
 
-#ifdef HAVE_HWLOC
+#ifdef STARPU_HAVE_HWLOC
 #include <hwloc.h>
 #endif
 
@@ -125,7 +125,7 @@ static void _starpu_init_topology(struct machine_config_s *config)
 {
 	if (!topology_is_initialized)
 	{
-#ifdef HAVE_HWLOC
+#ifdef STARPU_HAVE_HWLOC
 		hwloc_topology_init(&config->hwtopology);
 		hwloc_topology_load(config->hwtopology);
 
@@ -415,7 +415,7 @@ static inline int _starpu_get_next_bindid(struct machine_config_s *config,
 
 void _starpu_bind_thread_on_cpu(struct machine_config_s *config __attribute__((unused)), unsigned cpuid)
 {
-#ifdef HAVE_HWLOC
+#ifdef STARPU_HAVE_HWLOC
 	int ret;
 	_starpu_init_topology(config);
 
@@ -546,7 +546,7 @@ void starpu_destroy_topology(struct machine_config_s *config __attribute__ ((unu
 	/* cleanup StarPU internal data structures */
 	deinit_memory_nodes();
 
-#ifdef HAVE_HWLOC
+#ifdef STARPU_HAVE_HWLOC
 	hwloc_topology_destroy(config->hwtopology);
 #endif
 

src/core/workers.h

@@ -34,7 +34,7 @@
 
 #include <starpu.h>
 
-#ifdef HAVE_HWLOC
+#ifdef STARPU_HAVE_HWLOC
 #include <hwloc.h>
 #endif
 
@@ -99,7 +99,7 @@ struct worker_set_s {
 struct machine_config_s {
 	unsigned nworkers;
 
-#ifdef HAVE_HWLOC
+#ifdef STARPU_HAVE_HWLOC
 	hwloc_topology_t hwtopology;
 	int cpu_depth;
 #endif