Merge commit '871b4f36'

* commit '871b4f36':
  configure: Check for xcb as well as xcb-shape before enabling libxcb

This commit is a noop. We already check for libxcb_shape.
Merged-by: James Almer <jamrial@gmail.com>