We are still maintaining a bunch of patches to hwloc in mpich2.
1. The change to Makefile.am was reported earlier, but we decided there
wasn't a clean way to do this. You can ignore that part.
2. The change to autogen.sh is required for pgcc and friends. You can't
take this patch as is, obviously, but you'll need some version of this.
Cc'ing Dave, in case you need more details of this issue.
3. The changes to config/hwloc.m4 and include/private/private.h are
essentially a warning squash when getpagesize() requires an explicit
prototype declaration. But it's not clear how easy it is for you to
absorb it as it uses an MPICH2 internal m4 macro. Maybe there's a
cleaner way to integrate this patch.
4. The change to configure.ac is an issue with automake-1.12 that Dave