[PULL 1.18] XQuartz configure cherry-picks

[Adam Jackson]

On Wed, 2016-05-18 at 14:15 -0700, Jeremy Huddleston Sequoia wrote:
> The following changes since commit
> 9454cd51da9b38b974cff7c8b7125901f6403848:
> 
>   xserver 1.18.3 (2016-04-04 14:39:36 -0400)
> 
> are available in the git repository at:
> 
>   https://github.com/XQuartz/xorg-server.git 
> 
> for you to fetch changes up to 98499770640c747128f212b1ebb6bd42775f3b72:
> 
>   XQuartz: Fix default CFBundleVersion (2016-05-18 14:13:04 -0700)

Merged:

To ssh://git.freedesktop.org/git/xorg/xserver
   9454cd5..9849977  server-1.18-branch -> server-1.18-branch

- ajax