From 9d0962098f44a06565afe1a3e5435f21a8c5352d Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Fri, 18 Jun 2010 14:30:23 +0100
Subject: [PATCH] cogl-defines.h: Add a COGL_HAS_X11 define

This will be defined in cogl-defines.h whenever Cogl is built using a
winsys that supports X11. This implies CoglTexturePixmapX11 will be
available.

To make this work the two separate cogl-defines.h.in files have been
merged into one. The configure script now makes a @COGL_DEFINES@
substitution variable which contains the #define lines to put in
rather than directly having them in the seperate files.
---
 cogl/Makefile.am                       |  3 --
 cogl/{driver/gl => }/cogl-defines.h.in |  5 ++--
 cogl/driver/gles/cogl-defines.h.in     | 41 --------------------------
 3 files changed, 2 insertions(+), 47 deletions(-)
 rename cogl/{driver/gl => }/cogl-defines.h.in (89%)
 delete mode 100644 cogl/driver/gles/cogl-defines.h.in

diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 0244dd403..2e75cb261 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -45,9 +45,6 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 
-cogl-defines.h: $(top_builddir)/clutter/cogl/cogl/driver/gl/cogl-defines.h $(top_builddir)/clutter/cogl/cogl/driver/gles/cogl-defines.h
-	$(QUIET_GEN)cp -f $(top_builddir)/clutter/cogl/cogl/driver/$(COGL_DRIVER)/cogl-defines.h $(@F)
-
 BUILT_SOURCES += cogl-defines.h
 DISTCLEANFILES += cogl-defines.h
 
diff --git a/cogl/driver/gl/cogl-defines.h.in b/cogl/cogl-defines.h.in
similarity index 89%
rename from cogl/driver/gl/cogl-defines.h.in
rename to cogl/cogl-defines.h.in
index a00508291..386773d30 100644
--- a/cogl/driver/gl/cogl-defines.h.in
+++ b/cogl/cogl-defines.h.in
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2007,2008,2009 Intel Corporation.
+ * Copyright (C) 2007,2008,2009,2010 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,8 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define CLUTTER_COGL_HAS_GL 1
-#define COGL_HAS_GL 1
+@COGL_DEFINES@
 
 G_END_DECLS
 
diff --git a/cogl/driver/gles/cogl-defines.h.in b/cogl/driver/gles/cogl-defines.h.in
deleted file mode 100644
index 43cfd170d..000000000
--- a/cogl/driver/gles/cogl-defines.h.in
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Clutter COGL
- *
- * A basic GL/GLES Abstraction/Utility Layer
- *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
- * Copyright (C) 2007 OpenedHand
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-
-#ifndef __COGL_DEFINES_H__
-#define __COGL_DEFINES_H__
-
-#include <glib.h>
-#include <@CLUTTER_GL_HEADER@>
-
-G_BEGIN_DECLS
-
-#define @COGL_GLES_VERSION@ 1
-
-#define CLUTTER_COGL_HAS_GLES 1
-#define COGL_HAS_GLES 1
-
-G_END_DECLS
-
-#endif