Accomodate Automake 1.12.x.
Accomodate Automake 1.12.x.

This commit was SVN r4568.

ggouaillardet/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc,ggouaillardet/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc,shekkbuilder/hwloc