Merge pull request #2864 from jimis/libxml2_configure_fix