[cogl/msvc-support: 9/9] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit 84719884cae9babb8df3f7c96fa1b378e525e3d1
Merge: 7bb6947 7860df9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jul 21 11:43:45 2011 +0800

    Merge branch 'master' into msvc-support

 .gitignore                            |    1 -
 ChangeLog                             |   20 ++++++++
 Makefile.am                           |   12 ++++-
 NEWS                                  |   65 ++++++++++++++++++++++++++-
 build/autotools/Makefile.am.changelog |   78 ---------------------------------
 build/autotools/Makefile.am.release   |   13 +-----
 cogl/cogl-ext-functions.h             |    7 +++-
 cogl/cogl-xlib-renderer.c             |    2 +-
 configure.ac                          |    4 +-
 doc/RELEASING                         |    3 +-
 10 files changed, 105 insertions(+), 100 deletions(-)
---
diff --cc Makefile.am
index 7b647ba,2806a54..f59775a
--- a/Makefile.am
+++ b/Makefile.am
@@@ -19,9 -16,14 +19,15 @@@ EXTRA_DIST = 
  CLEANFILES=
  DISTCLEANFILES=
  
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-profile
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-gtk-doc \
+ 	--enable-maintainer-flags \
+ 	--enable-profile \
+ 	--enable-gles1 \
+ 	--enable-gles2 \
+ 	--enable-gl \
+ 	--enable-xlib-egl-platform \
+ 	--enable-glx
  
- # .release requires .changelog rules
- include $(top_srcdir)/build/autotools/Makefile.am.changelog
  include $(top_srcdir)/build/autotools/Makefile.am.release
 +