 * Restore building cairo and XML by default  * Use AC_PATH_XTRA instead of AC_PATH_X  * Incorporate the CFLAGS and LIBS from PATH_XTRA when testing for X    headers and libs.
 * Restore building cairo and XML by default
 * Use AC_PATH_XTRA instead of AC_PATH_X
 * Incorporate the CFLAGS and LIBS from PATH_XTRA when testing for X
   headers and libs.

This commit was SVN r1806.

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