glamor: Changes to 'master'

[Zhigang Gong]

 configure.ac     |    7 +++++--
 src/glamor_egl.c |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 89a62fb9363da243f55917eb4f01f441dc4ef8df
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Dec 8 16:43:08 2013 -0500

    Fix glamor_egl->egl_create_image_khr makes pointer from integer
    
    This is a warning, but a real problem can occur on some system.
    
    Reported-by: Fabio Pedretti <fabio.ped at libero.it>
    Reviewed-by: Axel Davy <davyaxel at free.fr>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>

commit 6f285c23b1663a0c3ac12d5fceeec465e90717f5
Author: Axel Davy <axel.davy at ens.fr>
Date:   Sun Dec 8 11:30:32 2013 +0100

    Fix configure to disable building Dri3 support when GBM v9 is missing
    
    Signed-off-by: Axel Davy <axel.davy at ens.fr>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>