1
1
openmpi/opal/mca/hwloc
Jeff Squyres fec519a793 hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h
Per a prior commit, the presence of "hwloc.h" can cause ambiguity when
using --with-hwloc=external (i.e., whether to include
opal/mca/hwloc/hwloc.h or whether to include the system-installed
hwloc.h).

This commit:

1. Renames opal/mca/hwloc/hwloc.h to hwloc-internal.h.
2. Adds opal/mca/hwloc/autogen.options to tell autogen.pl to expect to
   find hwloc-internal.h (instead of hwloc.h) in opal/mca/hwloc.
3. s@opal/mca/hwloc/hwloc.h@opal/mca/hwloc/hwloc-internal.h@g in the
   rest of the code base.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
2017-02-28 07:48:42 -08:00
..
base hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
external hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
hwloc1113 hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
autogen.options hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
configure.m4 hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
hwloc-internal.h hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
Makefile.am hwloc: rename opal/mca/hwloc/hwloc.h -> hwloc-internal.h 2017-02-28 07:48:42 -08:00
README.txt Purge whitespace from the repo 2015-06-23 20:59:57 -07:00

12 Sep 2011

Notes for hwloc component maintainers:

1. There can only be *1* hwloc version component at a time.
   Specifically: if there are multiple hwlocXYZ components (i.e.,
   different versions of hwloc), then they must all be .ompi_ignore'd
   except for 1.  This is because we currently m4_include all of the
   underlying hwloc's .m4 files -- if there are multiple hwlocXYZ
   components, I don't know if m4 will barf at the multiple,
   conflicting AC_DEFUNs, or whether it'll just do something
   completely undefined.

1a. As a consequence, if you're adding a new hwloc version component,
   you'll need to .ompi_ignore all others while you're testing the new
   one.

2. If someone wants to fix #1 someday, we might be able to do what we
   do for libevent: OPAL_CONFIG_SUBDIR (instead of slurping in hwloc's
   .m4 files).