[mutter] Don't use config.h in clutter and cogl
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Don't use config.h in clutter and cogl
- Date: Wed, 20 Jul 2016 06:25:32 +0000 (UTC)
commit bf71cb2e3cbb87e00c2543792e89bb99d7e52409
Author: Jonas Ådahl <jadahl gmail com>
Date: Thu May 5 22:21:51 2016 +0800
Don't use config.h in clutter and cogl
In cogl use cogl-config.h and in clutter use clutter-build-config.h. We
can't use clutter-config.h in clutter because its already used and
installed.
https://bugzilla.gnome.org/show_bug.cgi?id=768976
clutter/.gitignore | 1 +
clutter/clutter/cally/cally-actor.c | 2 +-
clutter/clutter/cally/cally-clone.c | 2 +-
clutter/clutter/cally/cally-group.c | 2 +-
clutter/clutter/cally/cally-rectangle.c | 2 +-
clutter/clutter/cally/cally-root.c | 2 +-
clutter/clutter/cally/cally-stage.c | 2 +-
clutter/clutter/cally/cally-text.c | 2 +-
clutter/clutter/cally/cally-texture.c | 2 +-
clutter/clutter/cally/cally-util.c | 2 +-
clutter/clutter/cally/cally.c | 2 +-
clutter/clutter/clutter-action.c | 2 +-
clutter/clutter/clutter-actor-box.c | 2 +-
clutter/clutter/clutter-actor-meta.c | 2 +-
clutter/clutter/clutter-actor.c | 2 +-
clutter/clutter/clutter-align-constraint.c | 2 +-
clutter/clutter/clutter-animatable.c | 2 +-
clutter/clutter/clutter-backend.c | 2 +-
clutter/clutter/clutter-base-types.c | 2 +-
clutter/clutter/clutter-bin-layout.c | 2 +-
clutter/clutter/clutter-bind-constraint.c | 2 +-
clutter/clutter/clutter-binding-pool.c | 2 +-
clutter/clutter/clutter-blur-effect.c | 2 +-
clutter/clutter/clutter-box-layout.c | 2 +-
.../clutter/clutter-brightness-contrast-effect.c | 2 +-
clutter/clutter/clutter-build-config.h.in | 104 ++++++++++++++++++++
clutter/clutter/clutter-cairo.c | 2 +-
clutter/clutter/clutter-canvas.c | 2 +-
clutter/clutter/clutter-child-meta.c | 2 +-
clutter/clutter/clutter-click-action.c | 2 +-
clutter/clutter/clutter-clone.c | 2 +-
clutter/clutter/clutter-color.c | 2 +-
clutter/clutter/clutter-colorize-effect.c | 2 +-
clutter/clutter/clutter-constraint.c | 2 +-
clutter/clutter/clutter-container.c | 2 +-
clutter/clutter/clutter-content.c | 2 +-
clutter/clutter/clutter-deform-effect.c | 2 +-
clutter/clutter/clutter-desaturate-effect.c | 2 +-
clutter/clutter/clutter-device-manager.c | 2 +-
clutter/clutter/clutter-drag-action.c | 2 +-
clutter/clutter/clutter-drop-action.c | 2 +-
clutter/clutter/clutter-easing.c | 2 +-
clutter/clutter/clutter-effect.c | 2 +-
clutter/clutter/clutter-enum-types.c.in | 2 +-
clutter/clutter/clutter-event-translator.c | 2 +-
clutter/clutter/clutter-event.c | 2 +-
clutter/clutter/clutter-feature.c | 2 +-
clutter/clutter/clutter-fixed-layout.c | 2 +-
clutter/clutter/clutter-flatten-effect.c | 2 +-
clutter/clutter/clutter-flow-layout.c | 2 +-
clutter/clutter/clutter-gesture-action.c | 2 +-
clutter/clutter/clutter-grid-layout.c | 2 +-
clutter/clutter/clutter-id-pool.c | 2 +-
clutter/clutter/clutter-image.c | 2 +-
clutter/clutter/clutter-input-device-tool.c | 2 +-
clutter/clutter/clutter-input-device.c | 2 +-
clutter/clutter/clutter-interval.c | 2 +-
clutter/clutter/clutter-keyframe-transition.c | 2 +-
clutter/clutter/clutter-keysyms-table.c | 2 +-
clutter/clutter/clutter-layout-manager.c | 2 +-
clutter/clutter/clutter-layout-meta.c | 2 +-
clutter/clutter/clutter-main.c | 2 +-
clutter/clutter/clutter-master-clock-default.c | 2 +-
clutter/clutter/clutter-master-clock.c | 2 +-
clutter/clutter/clutter-offscreen-effect.c | 2 +-
clutter/clutter/clutter-page-turn-effect.c | 2 +-
clutter/clutter/clutter-paint-node.c | 2 +-
clutter/clutter/clutter-paint-nodes.c | 2 +-
clutter/clutter/clutter-paint-volume.c | 2 +-
clutter/clutter/clutter-pan-action.c | 2 +-
clutter/clutter/clutter-path-constraint.c | 2 +-
clutter/clutter/clutter-path.c | 2 +-
clutter/clutter/clutter-property-transition.c | 2 +-
clutter/clutter/clutter-rotate-action.c | 2 +-
clutter/clutter/clutter-script-parser.c | 2 +-
clutter/clutter/clutter-script.c | 2 +-
clutter/clutter/clutter-scriptable.c | 2 +-
clutter/clutter/clutter-scroll-actor.c | 2 +-
clutter/clutter/clutter-settings.c | 2 +-
clutter/clutter/clutter-shader-effect.c | 2 +-
clutter/clutter/clutter-shader-types.c | 2 +-
clutter/clutter/clutter-snap-constraint.c | 2 +-
clutter/clutter/clutter-stage-manager.c | 2 +-
clutter/clutter/clutter-stage-window.c | 2 +-
clutter/clutter/clutter-stage.c | 2 +-
clutter/clutter/clutter-swipe-action.c | 2 +-
clutter/clutter/clutter-tap-action.c | 2 +-
clutter/clutter/clutter-test-utils.c | 2 +-
clutter/clutter/clutter-text-buffer.c | 2 +-
clutter/clutter/clutter-text.c | 2 +-
clutter/clutter/clutter-timeline.c | 2 +-
clutter/clutter/clutter-transition-group.c | 2 +-
clutter/clutter/clutter-transition.c | 2 +-
clutter/clutter/clutter-units.c | 2 +-
clutter/clutter/clutter-util.c | 2 +-
clutter/clutter/clutter-zoom-action.c | 2 +-
clutter/clutter/cogl/clutter-stage-cogl.c | 2 +-
.../clutter/deprecated/clutter-actor-deprecated.c | 2 +-
clutter/clutter/deprecated/clutter-alpha.c | 2 +-
clutter/clutter/deprecated/clutter-animation.c | 2 +-
clutter/clutter/deprecated/clutter-animator.c | 2 +-
.../clutter/deprecated/clutter-behaviour-depth.c | 2 +-
.../clutter/deprecated/clutter-behaviour-ellipse.c | 2 +-
.../clutter/deprecated/clutter-behaviour-opacity.c | 2 +-
.../clutter/deprecated/clutter-behaviour-path.c | 2 +-
.../clutter/deprecated/clutter-behaviour-rotate.c | 2 +-
.../clutter/deprecated/clutter-behaviour-scale.c | 2 +-
clutter/clutter/deprecated/clutter-behaviour.c | 2 +-
clutter/clutter/deprecated/clutter-box.c | 2 +-
clutter/clutter/deprecated/clutter-cairo-texture.c | 2 +-
clutter/clutter/deprecated/clutter-fixed.c | 2 +-
clutter/clutter/deprecated/clutter-frame-source.c | 2 +-
clutter/clutter/deprecated/clutter-group.c | 2 +-
.../deprecated/clutter-input-device-deprecated.c | 2 +-
.../deprecated/clutter-layout-manager-deprecated.c | 2 +-
clutter/clutter/deprecated/clutter-list-model.c | 2 +-
clutter/clutter/deprecated/clutter-media.c | 2 +-
clutter/clutter/deprecated/clutter-model.c | 2 +-
clutter/clutter/deprecated/clutter-rectangle.c | 2 +-
clutter/clutter/deprecated/clutter-score.c | 2 +-
clutter/clutter/deprecated/clutter-shader.c | 2 +-
clutter/clutter/deprecated/clutter-state.c | 2 +-
clutter/clutter/deprecated/clutter-table-layout.c | 2 +-
clutter/clutter/deprecated/clutter-texture.c | 2 +-
.../clutter/deprecated/clutter-timeout-interval.c | 2 +-
clutter/clutter/deprecated/clutter-timeout-pool.c | 2 +-
clutter/clutter/egl/clutter-backend-eglnative.c | 2 +-
clutter/clutter/egl/clutter-stage-eglnative.c | 2 +-
clutter/clutter/egl/clutter-stage-eglnative.h | 4 -
.../clutter/evdev/clutter-device-manager-evdev.c | 2 +-
clutter/clutter/evdev/clutter-event-evdev.c | 2 +-
clutter/clutter/evdev/clutter-input-device-evdev.c | 2 +-
.../evdev/clutter-input-device-tool-evdev.c | 2 +-
clutter/clutter/wayland/clutter-wayland-surface.c | 2 +-
clutter/clutter/x11/clutter-backend-x11.c | 2 +-
.../clutter/x11/clutter-device-manager-core-x11.c | 2 +-
clutter/clutter/x11/clutter-device-manager-xi2.c | 2 +-
clutter/clutter/x11/clutter-event-x11.c | 2 +-
clutter/clutter/x11/clutter-glx-texture-pixmap.c | 2 +-
.../clutter/x11/clutter-input-device-core-x11.c | 2 +-
clutter/clutter/x11/clutter-input-device-xi2.c | 2 +-
clutter/clutter/x11/clutter-keymap-x11.c | 2 +-
clutter/clutter/x11/clutter-stage-x11.c | 2 +-
clutter/clutter/x11/clutter-x11-texture-pixmap.c | 2 +-
clutter/clutter/x11/xsettings/xsettings-client.c | 2 +-
clutter/clutter/x11/xsettings/xsettings-common.c | 2 +-
clutter/configure.ac | 2 +-
cogl/.gitignore | 5 +-
cogl/cogl-pango/cogl-pango-display-list.c | 2 +-
cogl/cogl-pango/cogl-pango-fontmap.c | 2 +-
cogl/cogl-pango/cogl-pango-glyph-cache.c | 2 +-
cogl/cogl-pango/cogl-pango-pipeline-cache.c | 2 +-
cogl/cogl-pango/cogl-pango-render.c | 2 +-
cogl/cogl-path/cogl-path-enum-types.c.in | 2 +-
cogl/cogl-path/cogl-path.c | 2 +-
cogl/cogl-path/cogl1-path.c | 2 +-
cogl/cogl/cogl-atlas-texture.c | 2 +-
cogl/cogl/cogl-atlas.c | 2 +-
cogl/cogl/cogl-attribute-buffer.c | 2 +-
cogl/cogl/cogl-attribute.c | 2 +-
cogl/cogl/cogl-bitmap-conversion.c | 2 +-
cogl/cogl/cogl-bitmap-pixbuf.c | 2 +-
cogl/cogl/cogl-bitmap.c | 2 +-
cogl/cogl/cogl-bitmask.c | 2 +-
cogl/cogl/cogl-blend-string.c | 2 +-
cogl/cogl/cogl-blit.c | 2 +-
cogl/cogl/cogl-boxed-value.c | 2 +-
cogl/cogl/cogl-buffer.c | 2 +-
cogl/cogl/cogl-clip-stack.c | 2 +-
cogl/cogl/cogl-closure-list.c | 2 +-
cogl/cogl/cogl-color.c | 2 +-
cogl/cogl/cogl-config.c | 2 +-
cogl/cogl/cogl-context.c | 2 +-
cogl/cogl/cogl-debug.c | 2 +-
cogl/cogl/cogl-depth-state.c | 2 +-
cogl/cogl/cogl-display.c | 2 +-
cogl/cogl/cogl-enum-types.c.in | 2 +-
cogl/cogl/cogl-error.c | 2 +-
cogl/cogl/cogl-euler.c | 2 +-
cogl/cogl/cogl-feature-private.c | 2 +-
cogl/cogl/cogl-fence.c | 2 +-
cogl/cogl/cogl-frame-info.c | 2 +-
cogl/cogl/cogl-framebuffer.c | 2 +-
cogl/cogl/cogl-gles2-context.c | 2 +-
cogl/cogl/cogl-glib-source.c | 2 +-
cogl/cogl/cogl-glsl-shader.c | 2 +-
cogl/cogl/cogl-gpu-info.c | 2 +-
cogl/cogl/cogl-gtype-private.h | 2 +-
cogl/cogl/cogl-index-buffer.c | 2 +-
cogl/cogl/cogl-indices.c | 2 +-
cogl/cogl/cogl-journal.c | 2 +-
cogl/cogl/cogl-list.c | 2 +-
cogl/cogl/cogl-magazine.c | 2 +-
cogl/cogl/cogl-matrix-stack.c | 2 +-
cogl/cogl/cogl-matrix.c | 2 +-
cogl/cogl/cogl-memory-stack.c | 2 +-
cogl/cogl/cogl-meta-texture.c | 2 +-
cogl/cogl/cogl-node.c | 2 +-
cogl/cogl/cogl-object.c | 2 +-
cogl/cogl/cogl-onscreen-template.c | 2 +-
cogl/cogl/cogl-onscreen.c | 2 +-
cogl/cogl/cogl-output.c | 2 +-
cogl/cogl/cogl-pipeline-cache.c | 2 +-
cogl/cogl/cogl-pipeline-debug.c | 2 +-
cogl/cogl/cogl-pipeline-hash-table.c | 2 +-
cogl/cogl/cogl-pipeline-layer-state.c | 2 +-
cogl/cogl/cogl-pipeline-layer.c | 2 +-
cogl/cogl/cogl-pipeline-snippet.c | 2 +-
cogl/cogl/cogl-pipeline-state.c | 2 +-
cogl/cogl/cogl-pipeline.c | 2 +-
cogl/cogl/cogl-pixel-buffer.c | 2 +-
cogl/cogl/cogl-point-in-poly.c | 2 +-
cogl/cogl/cogl-poll.c | 2 +-
cogl/cogl/cogl-primitive-texture.c | 2 +-
cogl/cogl/cogl-primitive.c | 2 +-
cogl/cogl/cogl-primitives.c | 2 +-
cogl/cogl/cogl-profile.c | 2 +-
cogl/cogl/cogl-quaternion.c | 2 +-
cogl/cogl/cogl-rectangle-map.c | 2 +-
cogl/cogl/cogl-renderer.c | 2 +-
cogl/cogl/cogl-sampler-cache.c | 2 +-
cogl/cogl/cogl-snippet.c | 2 +-
cogl/cogl/cogl-spans.c | 2 +-
cogl/cogl/cogl-sub-texture.c | 2 +-
cogl/cogl/cogl-swap-chain.c | 2 +-
cogl/cogl/cogl-texture-2d-sliced.c | 2 +-
cogl/cogl/cogl-texture-2d.c | 2 +-
cogl/cogl/cogl-texture-3d.c | 2 +-
cogl/cogl/cogl-texture-rectangle.c | 2 +-
cogl/cogl/cogl-texture.c | 2 +-
cogl/cogl/cogl-util.c | 2 +-
cogl/cogl/cogl-util.h | 2 +-
cogl/cogl/cogl-vector.c | 2 +-
cogl/cogl/cogl-xlib-renderer.c | 2 +-
cogl/cogl/cogl-xlib.c | 2 +-
cogl/cogl/cogl.c | 2 +-
cogl/cogl/deprecated/cogl-auto-texture.c | 2 +-
cogl/cogl/deprecated/cogl-clip-state.c | 2 +-
cogl/cogl/deprecated/cogl-clutter.c | 2 +-
cogl/cogl/deprecated/cogl-fixed.c | 2 +-
cogl/cogl/deprecated/cogl-framebuffer-deprecated.c | 2 +-
cogl/cogl/deprecated/cogl-material-compat.c | 2 +-
cogl/cogl/deprecated/cogl-program.c | 2 +-
cogl/cogl/deprecated/cogl-shader.c | 2 +-
cogl/cogl/deprecated/cogl-texture-deprecated.c | 2 +-
cogl/cogl/deprecated/cogl-vertex-buffer.c | 2 +-
cogl/cogl/driver/gl/cogl-attribute-gl.c | 2 +-
cogl/cogl/driver/gl/cogl-buffer-gl.c | 2 +-
cogl/cogl/driver/gl/cogl-clip-stack-gl.c | 2 +-
cogl/cogl/driver/gl/cogl-framebuffer-gl.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-opengl.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c | 2 +-
cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c | 2 +-
cogl/cogl/driver/gl/cogl-texture-2d-gl.c | 2 +-
cogl/cogl/driver/gl/cogl-texture-gl.c | 2 +-
cogl/cogl/driver/gl/cogl-util-gl.c | 2 +-
cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 2 +-
.../driver/gl/gl/cogl-pipeline-fragend-arbfp.c | 2 +-
.../gl/gl/cogl-pipeline-progend-fixed-arbfp.c | 2 +-
cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c | 2 +-
cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 2 +-
.../cogl/driver/gl/gles/cogl-texture-driver-gles.c | 2 +-
cogl/cogl/driver/nop/cogl-attribute-nop.c | 2 +-
cogl/cogl/driver/nop/cogl-clip-stack-nop.c | 2 +-
cogl/cogl/driver/nop/cogl-driver-nop.c | 2 +-
cogl/cogl/driver/nop/cogl-framebuffer-nop.c | 2 +-
cogl/cogl/driver/nop/cogl-texture-2d-nop.c | 2 +-
cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 2 +-
cogl/cogl/winsys/cogl-winsys-egl-kms.c | 2 +-
cogl/cogl/winsys/cogl-winsys-egl-x11.c | 2 +-
cogl/cogl/winsys/cogl-winsys-egl.c | 2 +-
cogl/cogl/winsys/cogl-winsys-glx.c | 2 +-
cogl/cogl/winsys/cogl-winsys-stub.c | 2 +-
cogl/cogl/winsys/cogl-winsys.c | 2 +-
cogl/configure.ac | 2 +-
cogl/test-fixtures/test-utils.c | 2 +-
cogl/tests/conform/test-conform-main.c | 2 +-
cogl/tests/conform/test-fence.c | 2 +-
cogl/tests/conform/test-materials.c | 2 +-
cogl/tests/conform/test-version.c | 2 +-
cogl/tests/unit/test-unit-main.c | 2 +-
285 files changed, 388 insertions(+), 288 deletions(-)
---
diff --git a/clutter/.gitignore b/clutter/.gitignore
index 3c9d558..7cfe18c 100644
--- a/clutter/.gitignore
+++ b/clutter/.gitignore
@@ -28,6 +28,7 @@ tags
/clutter/*.trs
/clutter-lcov.info
/clutter-lcov
+clutter-build-config.h
!/build/autotools/introspection.m4
!/build/autotools/as-linguas.m4
!/build/autotools/as-compiler-flag.m4
diff --git a/clutter/clutter/cally/cally-actor.c b/clutter/clutter/cally/cally-actor.c
index 375b7db..fe3e274 100644
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -68,7 +68,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib.h>
diff --git a/clutter/clutter/cally/cally-clone.c b/clutter/clutter/cally/cally-clone.c
index 9672ce3..f1832a5 100644
--- a/clutter/clutter/cally/cally-clone.c
+++ b/clutter/clutter/cally/cally-clone.c
@@ -69,7 +69,7 @@
* a11y POV should still be managed as a image (with the proper properties,
* position, size, etc.).
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "cally-clone.h"
#include "cally-actor-private.h"
diff --git a/clutter/clutter/cally/cally-group.c b/clutter/clutter/cally/cally-group.c
index fce8a75..5d0cce5 100644
--- a/clutter/clutter/cally/cally-group.c
+++ b/clutter/clutter/cally/cally-group.c
@@ -34,7 +34,7 @@
* group.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "cally-group.h"
#include "cally-actor-private.h"
diff --git a/clutter/clutter/cally/cally-rectangle.c b/clutter/clutter/cally/cally-rectangle.c
index ec792ef..e02f886 100644
--- a/clutter/clutter/cally/cally-rectangle.c
+++ b/clutter/clutter/cally/cally-rectangle.c
@@ -30,7 +30,7 @@
* In particular it sets a proper role for the rectangle.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/cally/cally-root.c b/clutter/clutter/cally/cally-root.c
index aae37c6..2f16296 100644
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally/cally-root.c
@@ -35,7 +35,7 @@
* #ClutterStageManager).
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "cally-root.h"
diff --git a/clutter/clutter/cally/cally-stage.c b/clutter/clutter/cally/cally-stage.c
index 25bb321..7c100aa 100644
--- a/clutter/clutter/cally/cally-stage.c
+++ b/clutter/clutter/cally/cally-stage.c
@@ -34,7 +34,7 @@
* being a canvas. Anyway, this is required for applications using
* just clutter, or directly #ClutterStage
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "cally-stage.h"
#include "cally-actor-private.h"
diff --git a/clutter/clutter/cally/cally-text.c b/clutter/clutter/cally/cally-text.c
index 734aa6a..43523ce 100644
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
@@ -40,7 +40,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "cally-text.h"
diff --git a/clutter/clutter/cally/cally-texture.c b/clutter/clutter/cally/cally-texture.c
index 12964bd..e7df619 100644
--- a/clutter/clutter/cally/cally-texture.c
+++ b/clutter/clutter/cally/cally-texture.c
@@ -30,7 +30,7 @@
*
* In particular it sets a proper role for the texture.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/cally/cally-util.c b/clutter/clutter/cally/cally-util.c
index ce37869..8ffd207 100644
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdlib.h>
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index 4f23d20..8cee69a 100644
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/clutter-action.c b/clutter/clutter/clutter-action.c
index c233fd1..020b37f 100644
--- a/clutter/clutter/clutter-action.c
+++ b/clutter/clutter/clutter-action.c
@@ -42,7 +42,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-action.h"
diff --git a/clutter/clutter/clutter-actor-box.c b/clutter/clutter/clutter-actor-box.c
index 3f3179d..2991066 100644
--- a/clutter/clutter/clutter-actor-box.c
+++ b/clutter/clutter/clutter-actor-box.c
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-actor-meta.c b/clutter/clutter/clutter-actor-meta.c
index 583e816..085f2f6 100644
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -42,7 +42,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-actor-meta-private.h"
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index fedcbfe..196d1ad 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -605,7 +605,7 @@
* #ClutterActor:reactive property instead of this macro.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <math.h>
diff --git a/clutter/clutter/clutter-align-constraint.c b/clutter/clutter/clutter-align-constraint.c
index 8c84f35..345228a 100644
--- a/clutter/clutter/clutter-align-constraint.c
+++ b/clutter/clutter/clutter-align-constraint.c
@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-align-constraint.h"
diff --git a/clutter/clutter/clutter-animatable.c b/clutter/clutter/clutter-animatable.c
index 85a835d..ea285b8 100644
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -46,7 +46,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index a827229..7a1b8ae 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-base-types.c b/clutter/clutter/clutter-base-types.c
index 53d57b2..1705ff9 100644
--- a/clutter/clutter/clutter-base-types.c
+++ b/clutter/clutter/clutter-base-types.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-types.h"
diff --git a/clutter/clutter/clutter-bin-layout.c b/clutter/clutter/clutter-bin-layout.c
index 2360ee2..764f5bc 100644
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@@ -44,7 +44,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-bind-constraint.c b/clutter/clutter/clutter-bind-constraint.c
index 53cbbba..93831f5 100644
--- a/clutter/clutter/clutter-bind-constraint.c
+++ b/clutter/clutter/clutter-bind-constraint.c
@@ -81,7 +81,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-binding-pool.c b/clutter/clutter/clutter-binding-pool.c
index 66959c7..9c24b63 100644
--- a/clutter/clutter/clutter-binding-pool.c
+++ b/clutter/clutter/clutter-binding-pool.c
@@ -95,7 +95,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-binding-pool.h"
diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c
index 305e1f2..21cb3b4 100644
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -38,7 +38,7 @@
#define CLUTTER_BLUR_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BLUR_EFFECT,
ClutterBlurEffectClass))
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c
index ba4eee0..49c8d45 100644
--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
@@ -49,7 +49,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c
b/clutter/clutter/clutter-brightness-contrast-effect.c
index 7b03732..7b38391 100644
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -38,7 +38,7 @@
#define CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT, ClutterBrightnessContrastEffectClass))
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-build-config.h.in b/clutter/clutter/clutter-build-config.h.in
new file mode 100644
index 0000000..d56ba98
--- /dev/null
+++ b/clutter/clutter/clutter-build-config.h.in
@@ -0,0 +1,104 @@
+/* clutter/clutter-build-config.h.in. Generated from configure.ac by autoheader. */
+
+/* List of Cogl drivers */
+#undef CLUTTER_DRIVERS
+
+/* Use Generic EGL backend */
+#undef CLUTTER_EGL_BACKEND_GENERIC
+
+/* Can use Cogl 2.0 API internally */
+#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Have evdev support for input handling */
+#undef HAVE_EVDEV
+
+/* Whether you have gcov */
+#undef HAVE_GCOV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Supports PangoFt2 */
+#undef HAVE_PANGO_FT2
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */
+#undef HAVE_X11_EXTENSIONS_XINPUT2_H
+
+/* Define to 1 if we have the XCOMPOSITE X extension */
+#undef HAVE_XCOMPOSITE
+
+/* Define to 1 if we have the XDAMAGE X extension */
+#undef HAVE_XDAMAGE
+
+/* Define to 1 if we have the XEXT X extension */
+#undef HAVE_XEXT
+
+/* Define to 1 if X Generic Extensions is available */
+#undef HAVE_XGE
+
+/* Define to 1 if XI2 is available */
+#undef HAVE_XINPUT_2
+
+/* Define to 1 if XInput 2.2 is available */
+#undef HAVE_XINPUT_2_2
+
+/* Define to use XKB extension */
+#undef HAVE_XKB
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
+/* Define to 1 if building for Linux */
+#undef OS_LINUX
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* defines how to decorate public symbols while building */
+#undef _CLUTTER_EXTERN
diff --git a/clutter/clutter/clutter-cairo.c b/clutter/clutter/clutter-cairo.c
index fac7c18..b5c24b2 100644
--- a/clutter/clutter/clutter-cairo.c
+++ b/clutter/clutter/clutter-cairo.c
@@ -28,7 +28,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-cairo.h"
diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c
index 00b8c8a..6c92c44 100644
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -43,7 +43,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <cogl/cogl.h>
diff --git a/clutter/clutter/clutter-child-meta.c b/clutter/clutter/clutter-child-meta.c
index aeabd2f..4267090 100644
--- a/clutter/clutter/clutter-child-meta.c
+++ b/clutter/clutter/clutter-child-meta.c
@@ -37,7 +37,7 @@
* #ClutterChildMeta is available since Clutter 0.8
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-child-meta.h"
diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c
index cd13da4..c10eec2 100644
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -93,7 +93,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-click-action.h"
diff --git a/clutter/clutter/clutter-clone.c b/clutter/clutter/clutter-clone.c
index eb91915..af03a4e 100644
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-color.c b/clutter/clutter/clutter-color.c
index b855184..83ae406 100644
--- a/clutter/clutter/clutter-color.c
+++ b/clutter/clutter/clutter-color.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c
index c6e8bf1..960708e 100644
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -38,7 +38,7 @@
#define CLUTTER_COLORIZE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
CLUTTER_TYPE_COLORIZE_EFFECT, ClutterColorizeEffectClass))
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-constraint.c b/clutter/clutter/clutter-constraint.c
index 2e7eb76..c3d3f7d 100644
--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -129,7 +129,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-container.c b/clutter/clutter/clutter-container.c
index 72d40fa..81fe4dc 100644
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdarg.h>
diff --git a/clutter/clutter/clutter-content.c b/clutter/clutter/clutter-content.c
index 26d8f26..76ca65d 100644
--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-content-private.h"
diff --git a/clutter/clutter/clutter-deform-effect.c b/clutter/clutter/clutter-deform-effect.c
index 925866a..be90aad 100644
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -52,7 +52,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c
index c5fd04b..7e1804b 100644
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -40,7 +40,7 @@
#define CLUTTER_DESATURATE_EFFECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
CLUTTER_TYPE_DESATURATE_EFFECT, ClutterDesaturateEffectClass))
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-device-manager.c b/clutter/clutter/clutter-device-manager.c
index 597b0d1..885f973 100644
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-backend-private.h"
diff --git a/clutter/clutter/clutter-drag-action.c b/clutter/clutter/clutter-drag-action.c
index 1314522..57dae72 100644
--- a/clutter/clutter/clutter-drag-action.c
+++ b/clutter/clutter/clutter-drag-action.c
@@ -64,7 +64,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-drag-action.h"
diff --git a/clutter/clutter/clutter-drop-action.c b/clutter/clutter/clutter-drop-action.c
index 8aa5f26..e778411 100644
--- a/clutter/clutter/clutter-drop-action.c
+++ b/clutter/clutter/clutter-drop-action.c
@@ -59,7 +59,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-drop-action.h"
diff --git a/clutter/clutter/clutter-easing.c b/clutter/clutter/clutter-easing.c
index 1ed6798..544994d 100644
--- a/clutter/clutter/clutter-easing.c
+++ b/clutter/clutter/clutter-easing.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-easing.h"
diff --git a/clutter/clutter/clutter-effect.c b/clutter/clutter/clutter-effect.c
index 33d8f13..06df7ff 100644
--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -161,7 +161,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-effect.h"
diff --git a/clutter/clutter/clutter-enum-types.c.in b/clutter/clutter/clutter-enum-types.c.in
index 39bffd4..de2cb26 100644
--- a/clutter/clutter/clutter-enum-types.c.in
+++ b/clutter/clutter/clutter-enum-types.c.in
@@ -1,5 +1,5 @@
/*** BEGIN file-header ***/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-enum-types.h"
/*** END file-header ***/
diff --git a/clutter/clutter/clutter-event-translator.c b/clutter/clutter/clutter-event-translator.c
index b455496..b98957d 100644
--- a/clutter/clutter/clutter-event-translator.c
+++ b/clutter/clutter/clutter-event-translator.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-event-translator.h"
diff --git a/clutter/clutter/clutter-event.c b/clutter/clutter/clutter-event.c
index 05682fb..be92610 100644
--- a/clutter/clutter/clutter-event.c
+++ b/clutter/clutter/clutter-event.c
@@ -24,7 +24,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-backend-private.h"
diff --git a/clutter/clutter/clutter-feature.c b/clutter/clutter/clutter-feature.c
index 41992a4..a228064 100644
--- a/clutter/clutter/clutter-feature.c
+++ b/clutter/clutter/clutter-feature.c
@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdlib.h>
diff --git a/clutter/clutter/clutter-fixed-layout.c b/clutter/clutter/clutter-fixed-layout.c
index 3eba559..7034af7 100644
--- a/clutter/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter/clutter-fixed-layout.c
@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-debug.h"
diff --git a/clutter/clutter/clutter-flatten-effect.c b/clutter/clutter/clutter-flatten-effect.c
index 3342b04..d61930a 100644
--- a/clutter/clutter/clutter-flatten-effect.c
+++ b/clutter/clutter/clutter-flatten-effect.c
@@ -28,7 +28,7 @@
it only exists because that class is abstract */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-flatten-effect.h"
diff --git a/clutter/clutter/clutter-flow-layout.c b/clutter/clutter/clutter-flow-layout.c
index c32122c..13df882 100644
--- a/clutter/clutter/clutter-flow-layout.c
+++ b/clutter/clutter/clutter-flow-layout.c
@@ -53,7 +53,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c
index 6eca26f..668112f 100644
--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@@ -84,7 +84,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-gesture-action-private.h"
diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c
index f7b8f9e..069ccb6 100644
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-id-pool.c b/clutter/clutter/clutter-id-pool.c
index bd224f3..a565436 100644
--- a/clutter/clutter/clutter-id-pool.c
+++ b/clutter/clutter/clutter-id-pool.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-debug.h"
diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c
index f944ec4..722b037 100644
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-input-device-tool.c b/clutter/clutter/clutter-input-device-tool.c
index 547801e..11c72ad 100644
--- a/clutter/clutter/clutter-input-device-tool.c
+++ b/clutter/clutter/clutter-input-device-tool.c
@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-input-device-tool.h"
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index 216644a..7f9c6f7 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-input-device.h"
diff --git a/clutter/clutter/clutter-interval.c b/clutter/clutter/clutter-interval.c
index 782f826..270864b 100644
--- a/clutter/clutter/clutter-interval.c
+++ b/clutter/clutter/clutter-interval.c
@@ -46,7 +46,7 @@
* #ClutterInterval is available since Clutter 1.0
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/clutter/clutter/clutter-keyframe-transition.c b/clutter/clutter/clutter-keyframe-transition.c
index 54b670b..0142414 100644
--- a/clutter/clutter/clutter-keyframe-transition.c
+++ b/clutter/clutter/clutter-keyframe-transition.c
@@ -63,7 +63,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-keyframe-transition.h"
diff --git a/clutter/clutter/clutter-keysyms-table.c b/clutter/clutter/clutter-keysyms-table.c
index 310d103..47931f0 100644
--- a/clutter/clutter/clutter-keysyms-table.c
+++ b/clutter/clutter/clutter-keysyms-table.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clutter-build-config.h"
#include <glib.h>
diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
index 3b731c9..069d9af 100644
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -130,7 +130,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/clutter-layout-meta.c b/clutter/clutter/clutter-layout-meta.c
index af10624..971079e 100644
--- a/clutter/clutter/clutter-layout-meta.c
+++ b/clutter/clutter/clutter-layout-meta.c
@@ -35,7 +35,7 @@
* #ClutterLayoutMeta is available since Clutter 1.2
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-layout-meta.h"
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 3b862dd..9e51bbb 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -48,7 +48,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdlib.h>
diff --git a/clutter/clutter/clutter-master-clock-default.c b/clutter/clutter/clutter-master-clock-default.c
index d854d01..7b2df0d 100644
--- a/clutter/clutter/clutter-master-clock-default.c
+++ b/clutter/clutter/clutter-master-clock-default.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-master-clock.h"
diff --git a/clutter/clutter/clutter-master-clock.c b/clutter/clutter/clutter-master-clock.c
index df76932..379df3a 100644
--- a/clutter/clutter/clutter-master-clock.c
+++ b/clutter/clutter/clutter-master-clock.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-master-clock.h"
diff --git a/clutter/clutter/clutter-offscreen-effect.c b/clutter/clutter/clutter-offscreen-effect.c
index 741242c..2b57bc1 100644
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -63,7 +63,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-page-turn-effect.c b/clutter/clutter/clutter-page-turn-effect.c
index ec42f89..4146b13 100644
--- a/clutter/clutter/clutter-page-turn-effect.c
+++ b/clutter/clutter/clutter-page-turn-effect.c
@@ -36,7 +36,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-paint-node.c b/clutter/clutter/clutter-paint-node.c
index 1e5a3b7..5ebfb6b 100644
--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@@ -59,7 +59,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index 4823138..44e7727 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/clutter-paint-volume.c b/clutter/clutter/clutter-paint-volume.c
index 184e186..b48f7f9 100644
--- a/clutter/clutter/clutter-paint-volume.c
+++ b/clutter/clutter/clutter-paint-volume.c
@@ -25,7 +25,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-pan-action.c b/clutter/clutter/clutter-pan-action.c
index f2d1e18..582a7d7 100644
--- a/clutter/clutter/clutter-pan-action.c
+++ b/clutter/clutter/clutter-pan-action.c
@@ -54,7 +54,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-pan-action.h"
diff --git a/clutter/clutter/clutter-path-constraint.c b/clutter/clutter/clutter-path-constraint.c
index 20b6789..fc9720b 100644
--- a/clutter/clutter/clutter-path-constraint.c
+++ b/clutter/clutter/clutter-path-constraint.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-path-constraint.h"
diff --git a/clutter/clutter/clutter-path.c b/clutter/clutter/clutter-path.c
index 0ff7a21..5f8763a 100644
--- a/clutter/clutter/clutter-path.c
+++ b/clutter/clutter/clutter-path.c
@@ -62,7 +62,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-property-transition.c b/clutter/clutter/clutter-property-transition.c
index 6cdceb2..2b98cb1 100644
--- a/clutter/clutter/clutter-property-transition.c
+++ b/clutter/clutter/clutter-property-transition.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-property-transition.h"
diff --git a/clutter/clutter/clutter-rotate-action.c b/clutter/clutter/clutter-rotate-action.c
index 7286c2b..b1c28db 100644
--- a/clutter/clutter/clutter-rotate-action.c
+++ b/clutter/clutter/clutter-rotate-action.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-script-parser.c b/clutter/clutter/clutter-script-parser.c
index 1611037..5b7dcd8 100644
--- a/clutter/clutter/clutter-script-parser.c
+++ b/clutter/clutter/clutter-script-parser.c
@@ -25,7 +25,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c
index cd58e9d..9ca5fbb 100644
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -221,7 +221,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdlib.h>
diff --git a/clutter/clutter/clutter-scriptable.c b/clutter/clutter/clutter-scriptable.c
index e4ffdc4..5b5096e 100644
--- a/clutter/clutter/clutter-scriptable.c
+++ b/clutter/clutter/clutter-scriptable.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-scroll-actor.c b/clutter/clutter/clutter-scroll-actor.c
index 49f7327..941f643 100644
--- a/clutter/clutter/clutter-scroll-actor.c
+++ b/clutter/clutter/clutter-scroll-actor.c
@@ -43,7 +43,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-scroll-actor.h"
diff --git a/clutter/clutter/clutter-settings.c b/clutter/clutter/clutter-settings.c
index 068914d..bfe68a5 100644
--- a/clutter/clutter/clutter-settings.c
+++ b/clutter/clutter/clutter-settings.c
@@ -18,7 +18,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-settings.h"
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index a516978..c6ec49f 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -112,7 +112,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
/* XXX: This file depends on the cogl_program_ api with has been
diff --git a/clutter/clutter/clutter-shader-types.c b/clutter/clutter/clutter-shader-types.c
index 5b9fcdc..c956ef3 100644
--- a/clutter/clutter/clutter-shader-types.c
+++ b/clutter/clutter/clutter-shader-types.c
@@ -25,7 +25,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/clutter-snap-constraint.c b/clutter/clutter/clutter-snap-constraint.c
index b4c558f..5b6db9b 100644
--- a/clutter/clutter/clutter-snap-constraint.c
+++ b/clutter/clutter/clutter-snap-constraint.c
@@ -36,7 +36,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-stage-manager.c b/clutter/clutter/clutter-stage-manager.c
index e743653..3a44c82 100644
--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-stage-manager-private.h"
diff --git a/clutter/clutter/clutter-stage-window.c b/clutter/clutter/clutter-stage-window.c
index 450d264..197bf6c 100644
--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index e81a245..aa34240 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -43,7 +43,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-swipe-action.c b/clutter/clutter/clutter-swipe-action.c
index f0f8dbd..554f360 100644
--- a/clutter/clutter/clutter-swipe-action.c
+++ b/clutter/clutter/clutter-swipe-action.c
@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-swipe-action.h"
diff --git a/clutter/clutter/clutter-tap-action.c b/clutter/clutter/clutter-tap-action.c
index 4d30eb1..ae9f69d 100644
--- a/clutter/clutter/clutter-tap-action.c
+++ b/clutter/clutter/clutter-tap-action.c
@@ -54,7 +54,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-tap-action.h"
diff --git a/clutter/clutter/clutter-test-utils.c b/clutter/clutter/clutter-test-utils.c
index 077f815..edc413e 100644
--- a/clutter/clutter/clutter-test-utils.c
+++ b/clutter/clutter/clutter-test-utils.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-test-utils.h"
diff --git a/clutter/clutter/clutter-text-buffer.c b/clutter/clutter/clutter-text-buffer.c
index 63cab22..5aaee36 100644
--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/clutter-text-buffer.c
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-text-buffer.h"
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c
index 54dfae9..b57b3c5 100644
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/clutter-timeline.c b/clutter/clutter/clutter-timeline.c
index 612379f..d3db947 100644
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -94,7 +94,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-timeline.h"
diff --git a/clutter/clutter/clutter-transition-group.c b/clutter/clutter/clutter-transition-group.c
index f479dc4..0063564 100644
--- a/clutter/clutter/clutter-transition-group.c
+++ b/clutter/clutter/clutter-transition-group.c
@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-transition-group.h"
diff --git a/clutter/clutter/clutter-transition.c b/clutter/clutter/clutter-transition.c
index 03f91d0..83e9677 100644
--- a/clutter/clutter/clutter-transition.c
+++ b/clutter/clutter/clutter-transition.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-transition.h"
diff --git a/clutter/clutter/clutter-units.c b/clutter/clutter/clutter-units.c
index f49df9b..64ac570 100644
--- a/clutter/clutter/clutter-units.c
+++ b/clutter/clutter/clutter-units.c
@@ -63,7 +63,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdlib.h>
diff --git a/clutter/clutter/clutter-util.c b/clutter/clutter/clutter-util.c
index 5020c29..04c2ca1 100644
--- a/clutter/clutter/clutter-util.c
+++ b/clutter/clutter/clutter-util.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/clutter-zoom-action.c b/clutter/clutter/clutter-zoom-action.c
index 4e844a9..b60973d 100644
--- a/clutter/clutter/clutter-zoom-action.c
+++ b/clutter/clutter/clutter-zoom-action.c
@@ -47,7 +47,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c
index a94e082..37ce127 100644
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@@ -27,7 +27,7 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/deprecated/clutter-actor-deprecated.c
b/clutter/clutter/deprecated/clutter-actor-deprecated.c
index e3f3813..65d98dc 100644
--- a/clutter/clutter/deprecated/clutter-actor-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-actor-deprecated.c
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/deprecated/clutter-alpha.c b/clutter/clutter/deprecated/clutter-alpha.c
index 7305acf..c3936da 100644
--- a/clutter/clutter/deprecated/clutter-alpha.c
+++ b/clutter/clutter/deprecated/clutter-alpha.c
@@ -96,7 +96,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-animation.c b/clutter/clutter/deprecated/clutter-animation.c
index 3cca7d8..14b9e72 100644
--- a/clutter/clutter/deprecated/clutter-animation.c
+++ b/clutter/clutter/deprecated/clutter-animation.c
@@ -98,7 +98,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/deprecated/clutter-animator.c b/clutter/clutter/deprecated/clutter-animator.c
index 0c38811..8464c05 100644
--- a/clutter/clutter/deprecated/clutter-animator.c
+++ b/clutter/clutter/deprecated/clutter-animator.c
@@ -116,7 +116,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/deprecated/clutter-behaviour-depth.c
b/clutter/clutter/deprecated/clutter-behaviour-depth.c
index 405b14b..9282ac8 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-depth.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-depth.c
@@ -24,7 +24,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
index 168430c..659b752 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-ellipse.c
@@ -44,7 +44,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-behaviour-opacity.c
b/clutter/clutter/deprecated/clutter-behaviour-opacity.c
index 3855067..26fb47f 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-opacity.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-opacity.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-behaviour-path.c
b/clutter/clutter/deprecated/clutter-behaviour-path.c
index 929500c..81064fa 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-path.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-path.c
@@ -64,7 +64,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-behaviour-rotate.c
b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
index 67ab3e4..7096e83 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-rotate.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-rotate.c
@@ -36,7 +36,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-behaviour-scale.c
b/clutter/clutter/deprecated/clutter-behaviour-scale.c
index c0d5fcf..82976fd 100644
--- a/clutter/clutter/deprecated/clutter-behaviour-scale.c
+++ b/clutter/clutter/deprecated/clutter-behaviour-scale.c
@@ -36,7 +36,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-behaviour.c b/clutter/clutter/deprecated/clutter-behaviour.c
index fe85d61..11f9507 100644
--- a/clutter/clutter/deprecated/clutter-behaviour.c
+++ b/clutter/clutter/deprecated/clutter-behaviour.c
@@ -71,7 +71,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-box.c b/clutter/clutter/deprecated/clutter-box.c
index 645163a..74780e8 100644
--- a/clutter/clutter/deprecated/clutter-box.c
+++ b/clutter/clutter/deprecated/clutter-box.c
@@ -70,7 +70,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/deprecated/clutter-cairo-texture.c
b/clutter/clutter/deprecated/clutter-cairo-texture.c
index c69149c..6de16d4 100644
--- a/clutter/clutter/deprecated/clutter-cairo-texture.c
+++ b/clutter/clutter/deprecated/clutter-cairo-texture.c
@@ -58,7 +58,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-fixed.c b/clutter/clutter/deprecated/clutter-fixed.c
index cb68d16..8a255bd 100644
--- a/clutter/clutter/deprecated/clutter-fixed.c
+++ b/clutter/clutter/deprecated/clutter-fixed.c
@@ -26,7 +26,7 @@
#define G_IMPLEMENT_INLINES
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-frame-source.c
b/clutter/clutter/deprecated/clutter-frame-source.c
index bd9583d..5bff608 100644
--- a/clutter/clutter/deprecated/clutter-frame-source.c
+++ b/clutter/clutter/deprecated/clutter-frame-source.c
@@ -24,7 +24,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-group.c b/clutter/clutter/deprecated/clutter-group.c
index 90b3504..050cdfa 100644
--- a/clutter/clutter/deprecated/clutter-group.c
+++ b/clutter/clutter/deprecated/clutter-group.c
@@ -48,7 +48,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdarg.h>
diff --git a/clutter/clutter/deprecated/clutter-input-device-deprecated.c
b/clutter/clutter/deprecated/clutter-input-device-deprecated.c
index 1a65ecc..3b9e697 100644
--- a/clutter/clutter/deprecated/clutter-input-device-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-input-device-deprecated.c
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib-object.h>
diff --git a/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
b/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
index 20ce964..94f0e35 100644
--- a/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
+++ b/clutter/clutter/deprecated/clutter-layout-manager-deprecated.c
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-layout-manager.h"
diff --git a/clutter/clutter/deprecated/clutter-list-model.c b/clutter/clutter/deprecated/clutter-list-model.c
index d717bf2..2072a25 100644
--- a/clutter/clutter/deprecated/clutter-list-model.c
+++ b/clutter/clutter/deprecated/clutter-list-model.c
@@ -41,7 +41,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <stdlib.h>
diff --git a/clutter/clutter/deprecated/clutter-media.c b/clutter/clutter/deprecated/clutter-media.c
index c43b832..7336a78 100644
--- a/clutter/clutter/deprecated/clutter-media.c
+++ b/clutter/clutter/deprecated/clutter-media.c
@@ -40,7 +40,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-model.c b/clutter/clutter/deprecated/clutter-model.c
index eb2f82a..5cd8c07 100644
--- a/clutter/clutter/deprecated/clutter-model.c
+++ b/clutter/clutter/deprecated/clutter-model.c
@@ -154,7 +154,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/deprecated/clutter-rectangle.c b/clutter/clutter/deprecated/clutter-rectangle.c
index 6bc27b2..e4cfeb4 100644
--- a/clutter/clutter/deprecated/clutter-rectangle.c
+++ b/clutter/clutter/deprecated/clutter-rectangle.c
@@ -37,7 +37,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-score.c b/clutter/clutter/deprecated/clutter-score.c
index bae7285..a37dd3d 100644
--- a/clutter/clutter/deprecated/clutter-score.c
+++ b/clutter/clutter/deprecated/clutter-score.c
@@ -80,7 +80,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-shader.c b/clutter/clutter/deprecated/clutter-shader.c
index d9b0860..629595e 100644
--- a/clutter/clutter/deprecated/clutter-shader.c
+++ b/clutter/clutter/deprecated/clutter-shader.c
@@ -42,7 +42,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/deprecated/clutter-state.c b/clutter/clutter/deprecated/clutter-state.c
index 2f919a1..5a83a82 100644
--- a/clutter/clutter/deprecated/clutter-state.c
+++ b/clutter/clutter/deprecated/clutter-state.c
@@ -179,7 +179,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <gobject/gvaluecollector.h>
diff --git a/clutter/clutter/deprecated/clutter-table-layout.c
b/clutter/clutter/deprecated/clutter-table-layout.c
index 51944d0..f8b1b87 100644
--- a/clutter/clutter/deprecated/clutter-table-layout.c
+++ b/clutter/clutter/deprecated/clutter-table-layout.c
@@ -73,7 +73,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c
index f970502..dd0e9b0 100644
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
@@ -44,7 +44,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
/* sadly, we are still using ClutterShader internally */
diff --git a/clutter/clutter/deprecated/clutter-timeout-interval.c
b/clutter/clutter/deprecated/clutter-timeout-interval.c
index 52ee180..bb9f141 100644
--- a/clutter/clutter/deprecated/clutter-timeout-interval.c
+++ b/clutter/clutter/deprecated/clutter-timeout-interval.c
@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/deprecated/clutter-timeout-pool.c
b/clutter/clutter/deprecated/clutter-timeout-pool.c
index a220a3a..21b3543 100644
--- a/clutter/clutter/deprecated/clutter-timeout-pool.c
+++ b/clutter/clutter/deprecated/clutter-timeout-pool.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
diff --git a/clutter/clutter/egl/clutter-backend-eglnative.c b/clutter/clutter/egl/clutter-backend-eglnative.c
index fe2a2cd..808e46a 100644
--- a/clutter/clutter/egl/clutter-backend-eglnative.c
+++ b/clutter/clutter/egl/clutter-backend-eglnative.c
@@ -26,7 +26,7 @@
* Neil Roberts
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/clutter/clutter/egl/clutter-stage-eglnative.c b/clutter/clutter/egl/clutter-stage-eglnative.c
index d7484bb..c2b179d 100644
--- a/clutter/clutter/egl/clutter-stage-eglnative.c
+++ b/clutter/clutter/egl/clutter-stage-eglnative.c
@@ -23,7 +23,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <glib.h>
diff --git a/clutter/clutter/egl/clutter-stage-eglnative.h b/clutter/clutter/egl/clutter-stage-eglnative.h
index cc64390..a237ffa 100644
--- a/clutter/clutter/egl/clutter-stage-eglnative.h
+++ b/clutter/clutter/egl/clutter-stage-eglnative.h
@@ -25,10 +25,6 @@
#ifndef __CLUTTER_STAGE_EGL_NATIVE_H__
#define __CLUTTER_STAGE_EGL_NATIVE_H__
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <glib-object.h>
#include <clutter/clutter-stage.h>
diff --git a/clutter/clutter/evdev/clutter-device-manager-evdev.c
b/clutter/clutter/evdev/clutter-device-manager-evdev.c
index 2ffceb9..9877da2 100644
--- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
@@ -24,7 +24,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <math.h>
diff --git a/clutter/clutter/evdev/clutter-event-evdev.c b/clutter/clutter/evdev/clutter-event-evdev.c
index c80a642..737859d 100644
--- a/clutter/clutter/evdev/clutter-event-evdev.c
+++ b/clutter/clutter/evdev/clutter-event-evdev.c
@@ -20,7 +20,7 @@
* Carlos Garnacho <carlosg gnome org>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter/clutter-device-manager-private.h"
#include "clutter/clutter-event-private.h"
diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c
b/clutter/clutter/evdev/clutter-input-device-evdev.c
index e4182d1..44b3ee8 100644
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
@@ -24,7 +24,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter/clutter-device-manager-private.h"
diff --git a/clutter/clutter/evdev/clutter-input-device-tool-evdev.c
b/clutter/clutter/evdev/clutter-input-device-tool-evdev.c
index 8269ecf..f36fa92 100644
--- a/clutter/clutter/evdev/clutter-input-device-tool-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-tool-evdev.c
@@ -22,7 +22,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include "clutter-input-device-tool-evdev.h"
diff --git a/clutter/clutter/wayland/clutter-wayland-surface.c
b/clutter/clutter/wayland/clutter-wayland-surface.c
index 9ee4035..2465a18 100644
--- a/clutter/clutter/wayland/clutter-wayland-surface.c
+++ b/clutter/clutter/wayland/clutter-wayland-surface.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
index 281473e..4a299cf 100644
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -20,7 +20,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#include <string.h>
diff --git a/clutter/clutter/x11/clutter-device-manager-core-x11.c
b/clutter/clutter/x11/clutter-device-manager-core-x11.c
index f47e3b8..497b40b 100644
--- a/clutter/clutter/x11/clutter-device-manager-core-x11.c
+++ b/clutter/clutter/x11/clutter-device-manager-core-x11.c
@@ -21,7 +21,7 @@
* Author: Emmanuele Bassi <ebassi linux intel com>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-device-manager-core-x11.h"
diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c
b/clutter/clutter/x11/clutter-device-manager-xi2.c
index ac513f2..ca17db1 100644
--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
@@ -21,7 +21,7 @@
* Author: Emmanuele Bassi <ebassi linux intel com>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <stdint.h>
diff --git a/clutter/clutter/x11/clutter-event-x11.c b/clutter/clutter/x11/clutter-event-x11.c
index 3305063..3636ff3 100644
--- a/clutter/clutter/x11/clutter-event-x11.c
+++ b/clutter/clutter/x11/clutter-event-x11.c
@@ -24,7 +24,7 @@
* Emmanuele Bassi <ebassi linux intel com>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-backend-x11.h"
#include "clutter-x11.h"
diff --git a/clutter/clutter/x11/clutter-glx-texture-pixmap.c
b/clutter/clutter/x11/clutter-glx-texture-pixmap.c
index 33166df..1fdd9e4 100644
--- a/clutter/clutter/x11/clutter-glx-texture-pixmap.c
+++ b/clutter/clutter/x11/clutter-glx-texture-pixmap.c
@@ -45,7 +45,7 @@
* may use the extension if it is possible.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <string.h>
diff --git a/clutter/clutter/x11/clutter-input-device-core-x11.c
b/clutter/clutter/x11/clutter-input-device-core-x11.c
index c7eda97..c7543f9 100644
--- a/clutter/clutter/x11/clutter-input-device-core-x11.c
+++ b/clutter/clutter/x11/clutter-input-device-core-x11.c
@@ -21,7 +21,7 @@
* Author: Emmanuele Bassi <ebassi linux intel com>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-input-device-core-x11.h"
diff --git a/clutter/clutter/x11/clutter-input-device-xi2.c b/clutter/clutter/x11/clutter-input-device-xi2.c
index 9490c52..00416a3 100644
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@@ -21,7 +21,7 @@
* Author: Emmanuele Bassi <ebassi linux intel com>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-input-device-xi2.h"
diff --git a/clutter/clutter/x11/clutter-keymap-x11.c b/clutter/clutter/x11/clutter-keymap-x11.c
index 2e9bae4..914e314 100644
--- a/clutter/clutter/x11/clutter-keymap-x11.c
+++ b/clutter/clutter/x11/clutter-keymap-x11.c
@@ -21,7 +21,7 @@
* Author: Emmanuele Bassi <ebassi linux intel com>
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "clutter-keymap-x11.h"
#include "clutter-backend-x11.h"
diff --git a/clutter/clutter/x11/clutter-stage-x11.c b/clutter/clutter/x11/clutter-stage-x11.c
index 84a6ab7..d19241e 100644
--- a/clutter/clutter/x11/clutter-stage-x11.c
+++ b/clutter/clutter/x11/clutter-stage-x11.c
@@ -19,7 +19,7 @@
*
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <math.h>
#include <stdlib.h>
diff --git a/clutter/clutter/x11/clutter-x11-texture-pixmap.c
b/clutter/clutter/x11/clutter-x11-texture-pixmap.c
index 1fe92f3..7c1152f 100644
--- a/clutter/clutter/x11/clutter-x11-texture-pixmap.c
+++ b/clutter/clutter/x11/clutter-x11-texture-pixmap.c
@@ -39,7 +39,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "clutter-build-config.h"
#endif
#define CLUTTER_ENABLE_EXPERIMENTAL_API
diff --git a/clutter/clutter/x11/xsettings/xsettings-client.c
b/clutter/clutter/x11/xsettings/xsettings-client.c
index 753e461..494d575 100644
--- a/clutter/clutter/x11/xsettings/xsettings-client.c
+++ b/clutter/clutter/x11/xsettings/xsettings-client.c
@@ -20,7 +20,7 @@
*
* Author: Owen Taylor, Red Hat, Inc.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/clutter/clutter/x11/xsettings/xsettings-common.c
b/clutter/clutter/x11/xsettings/xsettings-common.c
index 1831324..8a9bcc0 100644
--- a/clutter/clutter/x11/xsettings/xsettings-common.c
+++ b/clutter/clutter/x11/xsettings/xsettings-common.c
@@ -20,7 +20,7 @@
*
* Author: Owen Taylor, Red Hat, Inc.
*/
-#include "config.h"
+#include "clutter-build-config.h"
#include "string.h"
#include "stdlib.h"
diff --git a/clutter/configure.ac b/clutter/configure.ac
index e54b160..d24d3b8 100644
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -54,7 +54,7 @@ AC_INIT([clutter],
[http://www.clutter-project.org])
AC_CONFIG_SRCDIR([clutter/clutter.h])
-AC_CONFIG_HEADERS([clutter/config.h])
+AC_CONFIG_HEADERS([clutter/clutter-build-config.h])
AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build/autotools])
diff --git a/cogl/.gitignore b/cogl/.gitignore
index 25c354b..3fbebd8 100644
--- a/cogl/.gitignore
+++ b/cogl/.gitignore
@@ -40,9 +40,8 @@ stamp-marshal
/cogl/cogl-gl-header.h
/cogl-path/cogl-path-enum-types.c
/cogl-path/cogl-path-enum-types.h
-config.h
-config.h.in
-config.h.win32
+cogl-config.h
+cogl-config.h.in
config.log
config.lt
config.status
diff --git a/cogl/cogl-pango/cogl-pango-display-list.c b/cogl/cogl-pango/cogl-pango-display-list.c
index 6967ab0..e8332b9 100644
--- a/cogl/cogl-pango/cogl-pango-display-list.c
+++ b/cogl/cogl-pango/cogl-pango-display-list.c
@@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib.h>
diff --git a/cogl/cogl-pango/cogl-pango-fontmap.c b/cogl/cogl-pango/cogl-pango-fontmap.c
index a9c7df0..145f3b9 100644
--- a/cogl/cogl-pango/cogl-pango-fontmap.c
+++ b/cogl/cogl-pango/cogl-pango-fontmap.c
@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
/* This is needed to get the Pango headers to export stuff needed to
diff --git a/cogl/cogl-pango/cogl-pango-glyph-cache.c b/cogl/cogl-pango/cogl-pango-glyph-cache.c
index 093404f..038db7d 100644
--- a/cogl/cogl-pango/cogl-pango-glyph-cache.c
+++ b/cogl/cogl-pango/cogl-pango-glyph-cache.c
@@ -27,7 +27,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib.h>
diff --git a/cogl/cogl-pango/cogl-pango-pipeline-cache.c b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
index 625a8fa..b084487 100644
--- a/cogl/cogl-pango/cogl-pango-pipeline-cache.c
+++ b/cogl/cogl-pango/cogl-pango-pipeline-cache.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib.h>
diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c
index a8855ea..d8cc713 100644
--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#ifndef PANGO_ENABLE_BACKEND
diff --git a/cogl/cogl-path/cogl-path-enum-types.c.in b/cogl/cogl-path/cogl-path-enum-types.c.in
index 5474607..661e81c 100644
--- a/cogl/cogl-path/cogl-path-enum-types.c.in
+++ b/cogl/cogl-path/cogl-path-enum-types.c.in
@@ -1,6 +1,6 @@
/*** BEGIN file-header ***/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
/* We need to undefine this so that we will be sure to include
diff --git a/cogl/cogl-path/cogl-path.c b/cogl/cogl-path/cogl-path.c
index 2b4b3c6..8adf542 100644
--- a/cogl/cogl-path/cogl-path.c
+++ b/cogl/cogl-path/cogl-path.c
@@ -32,7 +32,7 @@
* Robert Bragg <robert linux intel com>
*/
-#include "config.h"
+#include "cogl-config.h"
#include "cogl-util.h"
#include "cogl-object.h"
diff --git a/cogl/cogl-path/cogl1-path.c b/cogl/cogl-path/cogl1-path.c
index b2c5923..384d6b4 100644
--- a/cogl/cogl-path/cogl1-path.c
+++ b/cogl/cogl-path/cogl1-path.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-atlas-texture.c b/cogl/cogl/cogl-atlas-texture.c
index 1c8b569..97bb84a 100644
--- a/cogl/cogl/cogl-atlas-texture.c
+++ b/cogl/cogl/cogl-atlas-texture.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/cogl-atlas.c b/cogl/cogl/cogl-atlas.c
index 0fd8b72..023dff8 100644
--- a/cogl/cogl/cogl-atlas.c
+++ b/cogl/cogl/cogl-atlas.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-atlas.h"
diff --git a/cogl/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c
index 8d92d29..dfc8e89 100644
--- a/cogl/cogl/cogl-attribute-buffer.c
+++ b/cogl/cogl/cogl-attribute-buffer.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-object-private.h"
diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c
index bcfbf78..73fb07a 100644
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c
index 67168e7..9748aca 100644
--- a/cogl/cogl/cogl-bitmap-conversion.c
+++ b/cogl/cogl/cogl-bitmap-conversion.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-private.h"
diff --git a/cogl/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl/cogl-bitmap-pixbuf.c
index 9696de6..21b6fb4 100644
--- a/cogl/cogl/cogl-bitmap-pixbuf.c
+++ b/cogl/cogl/cogl-bitmap-pixbuf.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-bitmap.c b/cogl/cogl/cogl-bitmap.c
index fbeb2d1..b395c42 100644
--- a/cogl/cogl/cogl-bitmap.c
+++ b/cogl/cogl/cogl-bitmap.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-bitmask.c b/cogl/cogl/cogl-bitmask.c
index 7034bc9..7ec84b5 100644
--- a/cogl/cogl/cogl-bitmask.c
+++ b/cogl/cogl/cogl-bitmask.c
@@ -31,7 +31,7 @@
* Neil Roberts <neil linux intel com>
*/
-#include "config.h"
+#include "cogl-config.h"
#include <glib.h>
#include <string.h>
diff --git a/cogl/cogl/cogl-blend-string.c b/cogl/cogl/cogl-blend-string.c
index 5d876bf..659152d 100644
--- a/cogl/cogl/cogl-blend-string.c
+++ b/cogl/cogl/cogl-blend-string.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdlib.h>
diff --git a/cogl/cogl/cogl-blit.c b/cogl/cogl/cogl-blit.c
index a6d60ef..af78e21 100644
--- a/cogl/cogl/cogl-blit.c
+++ b/cogl/cogl/cogl-blit.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-boxed-value.c b/cogl/cogl/cogl-boxed-value.c
index bf6a979..fb8f27b 100644
--- a/cogl/cogl/cogl-boxed-value.c
+++ b/cogl/cogl/cogl-boxed-value.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-buffer.c b/cogl/cogl/cogl-buffer.c
index ede46cc..18a6a4b 100644
--- a/cogl/cogl/cogl-buffer.c
+++ b/cogl/cogl/cogl-buffer.c
@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdio.h>
diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c
index b0e5b0d..128b1bc 100644
--- a/cogl/cogl/cogl-clip-stack.c
+++ b/cogl/cogl/cogl-clip-stack.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-closure-list.c b/cogl/cogl/cogl-closure-list.c
index eb8cadd..a2e82e7 100644
--- a/cogl/cogl/cogl-closure-list.c
+++ b/cogl/cogl/cogl-closure-list.c
@@ -27,7 +27,7 @@
*
*/
-#include <config.h>
+#include "cogl-config.h"
#include <glib.h>
diff --git a/cogl/cogl/cogl-color.c b/cogl/cogl/cogl-color.c
index 02e501d..0872cf1 100644
--- a/cogl/cogl/cogl-color.c
+++ b/cogl/cogl/cogl-color.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-config.c b/cogl/cogl/cogl-config.c
index 6c960d4..ea6e106 100644
--- a/cogl/cogl/cogl-config.c
+++ b/cogl/cogl/cogl-config.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index 4b1af61..c45c9b4 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-object.h"
diff --git a/cogl/cogl/cogl-debug.c b/cogl/cogl/cogl-debug.c
index 345406c..1ef2fd0 100644
--- a/cogl/cogl/cogl-debug.c
+++ b/cogl/cogl/cogl-debug.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdlib.h>
diff --git a/cogl/cogl/cogl-depth-state.c b/cogl/cogl/cogl-depth-state.c
index 5ea0aab..8346d4c 100644
--- a/cogl/cogl/cogl-depth-state.c
+++ b/cogl/cogl/cogl-depth-state.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
index 039e881..81d3d84 100644
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-enum-types.c.in b/cogl/cogl/cogl-enum-types.c.in
index a08711b..6122acf 100644
--- a/cogl/cogl/cogl-enum-types.c.in
+++ b/cogl/cogl/cogl-enum-types.c.in
@@ -1,6 +1,6 @@
/*** BEGIN file-header ***/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
/* We need to undefine this so that we will be sure to include
diff --git a/cogl/cogl/cogl-error.c b/cogl/cogl/cogl-error.c
index d83afc3..18e2b1a 100644
--- a/cogl/cogl/cogl-error.c
+++ b/cogl/cogl/cogl-error.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-types.h"
diff --git a/cogl/cogl/cogl-euler.c b/cogl/cogl/cogl-euler.c
index f877bbc..7af6ea0 100644
--- a/cogl/cogl/cogl-euler.c
+++ b/cogl/cogl/cogl-euler.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <cogl-util.h>
diff --git a/cogl/cogl/cogl-feature-private.c b/cogl/cogl/cogl-feature-private.c
index 7c160c3..31b421b 100644
--- a/cogl/cogl/cogl-feature-private.c
+++ b/cogl/cogl/cogl-feature-private.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c
index 05c91ff..f1209be 100644
--- a/cogl/cogl/cogl-fence.c
+++ b/cogl/cogl/cogl-fence.c
@@ -28,7 +28,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-fence.h"
diff --git a/cogl/cogl/cogl-frame-info.c b/cogl/cogl/cogl-frame-info.c
index 2114a64..0571960 100644
--- a/cogl/cogl/cogl-frame-info.c
+++ b/cogl/cogl/cogl-frame-info.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-frame-info-private.h"
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index 1f70d3d..9dbd2a1 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-gles2-context.c b/cogl/cogl/cogl-gles2-context.c
index 33c4387..78d423f 100644
--- a/cogl/cogl/cogl-gles2-context.c
+++ b/cogl/cogl/cogl-gles2-context.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-glib-source.c b/cogl/cogl/cogl-glib-source.c
index fea2544..b0b0ac5 100644
--- a/cogl/cogl/cogl-glib-source.c
+++ b/cogl/cogl/cogl-glib-source.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-glib-source.h"
diff --git a/cogl/cogl/cogl-glsl-shader.c b/cogl/cogl/cogl-glsl-shader.c
index 196e0c7..5aadd10 100644
--- a/cogl/cogl/cogl-glsl-shader.c
+++ b/cogl/cogl/cogl-glsl-shader.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/cogl-gpu-info.c b/cogl/cogl/cogl-gpu-info.c
index 54dfe18..8453828 100644
--- a/cogl/cogl/cogl-gpu-info.c
+++ b/cogl/cogl/cogl-gpu-info.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-gtype-private.h b/cogl/cogl/cogl-gtype-private.h
index 8498385..e750526 100644
--- a/cogl/cogl/cogl-gtype-private.h
+++ b/cogl/cogl/cogl-gtype-private.h
@@ -31,7 +31,7 @@
#ifndef __COGL_GTYPE_PRIVATE_H__
#define __COGL_GTYPE_PRIVATE_H__
-#include "config.h"
+#include "cogl-config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/cogl/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c
index cddaf47..1f9b59d 100644
--- a/cogl/cogl/cogl-index-buffer.c
+++ b/cogl/cogl/cogl-index-buffer.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-object-private.h"
diff --git a/cogl/cogl/cogl-indices.c b/cogl/cogl/cogl-indices.c
index 2256830..8ffcdc6 100644
--- a/cogl/cogl/cogl-indices.c
+++ b/cogl/cogl/cogl-indices.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-journal.c b/cogl/cogl/cogl-journal.c
index 8ffe25f..9f11e8b 100644
--- a/cogl/cogl/cogl-journal.c
+++ b/cogl/cogl/cogl-journal.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/cogl-list.c b/cogl/cogl/cogl-list.c
index 3fbc675..08e6a24 100644
--- a/cogl/cogl/cogl-list.c
+++ b/cogl/cogl/cogl-list.c
@@ -24,7 +24,7 @@
/* This list implementation is based on the Wayland source code */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdlib.h>
diff --git a/cogl/cogl/cogl-magazine.c b/cogl/cogl/cogl-magazine.c
index 5617751..89c9122 100644
--- a/cogl/cogl/cogl-magazine.c
+++ b/cogl/cogl/cogl-magazine.c
@@ -52,7 +52,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-memory-stack-private.h"
diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
index 400855f..d426e1f 100644
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c
index fd0f6af..a67f0ab 100644
--- a/cogl/cogl/cogl-matrix.c
+++ b/cogl/cogl/cogl-matrix.c
@@ -70,7 +70,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <cogl-util.h>
diff --git a/cogl/cogl/cogl-memory-stack.c b/cogl/cogl/cogl-memory-stack.c
index f723abc..a7c3ee3 100644
--- a/cogl/cogl/cogl-memory-stack.c
+++ b/cogl/cogl/cogl-memory-stack.c
@@ -55,7 +55,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-memory-stack-private.h"
diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c
index 554aaad..ed12269 100644
--- a/cogl/cogl/cogl-meta-texture.c
+++ b/cogl/cogl/cogl-meta-texture.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-texture.h"
diff --git a/cogl/cogl/cogl-node.c b/cogl/cogl/cogl-node.c
index 60d3e73..dcec3cc 100644
--- a/cogl/cogl/cogl-node.c
+++ b/cogl/cogl/cogl-node.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-object.c b/cogl/cogl/cogl-object.c
index 452f625..1b849d5 100644
--- a/cogl/cogl/cogl-object.c
+++ b/cogl/cogl/cogl-object.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib.h>
diff --git a/cogl/cogl/cogl-onscreen-template.c b/cogl/cogl/cogl-onscreen-template.c
index 3940627..1adbf41 100644
--- a/cogl/cogl/cogl-onscreen-template.c
+++ b/cogl/cogl/cogl-onscreen-template.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-object.h"
diff --git a/cogl/cogl/cogl-onscreen.c b/cogl/cogl/cogl-onscreen.c
index 4b53bb2..e766e59 100644
--- a/cogl/cogl/cogl-onscreen.c
+++ b/cogl/cogl/cogl-onscreen.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-output.c b/cogl/cogl/cogl-output.c
index ae85605..573e8dc 100644
--- a/cogl/cogl/cogl-output.c
+++ b/cogl/cogl/cogl-output.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-output-private.h"
diff --git a/cogl/cogl/cogl-pipeline-cache.c b/cogl/cogl/cogl-pipeline-cache.c
index 0a6bb6a..62b3724 100644
--- a/cogl/cogl/cogl-pipeline-cache.c
+++ b/cogl/cogl/cogl-pipeline-cache.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <test-fixtures/test-unit.h>
diff --git a/cogl/cogl/cogl-pipeline-debug.c b/cogl/cogl/cogl-pipeline-debug.c
index beb35b3..0e4f6cd 100644
--- a/cogl/cogl/cogl-pipeline-debug.c
+++ b/cogl/cogl/cogl-pipeline-debug.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/cogl-pipeline-hash-table.c b/cogl/cogl/cogl-pipeline-hash-table.c
index 9c8e3df..8f961b0 100644
--- a/cogl/cogl/cogl-pipeline-hash-table.c
+++ b/cogl/cogl/cogl-pipeline-hash-table.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c
index fb20192..c30fae9 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl/cogl-pipeline-layer-state.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer.c b/cogl/cogl/cogl-pipeline-layer.c
index 37a5120..2747024 100644
--- a/cogl/cogl/cogl-pipeline-layer.c
+++ b/cogl/cogl/cogl-pipeline-layer.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-pipeline-snippet.c b/cogl/cogl/cogl-pipeline-snippet.c
index 59f85b3..18aefc7 100644
--- a/cogl/cogl/cogl-pipeline-snippet.c
+++ b/cogl/cogl/cogl-pipeline-snippet.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-pipeline-state.c b/cogl/cogl/cogl-pipeline-state.c
index 04c76f8..57eaf57 100644
--- a/cogl/cogl/cogl-pipeline-state.c
+++ b/cogl/cogl/cogl-pipeline-state.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
index b2fee10..da2d2ce 100644
--- a/cogl/cogl/cogl-pipeline.c
+++ b/cogl/cogl/cogl-pipeline.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c
index e2d6565..348f74a 100644
--- a/cogl/cogl/cogl-pixel-buffer.c
+++ b/cogl/cogl/cogl-pixel-buffer.c
@@ -38,7 +38,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdio.h>
diff --git a/cogl/cogl/cogl-point-in-poly.c b/cogl/cogl/cogl-point-in-poly.c
index cf87b93..64bbd30 100644
--- a/cogl/cogl/cogl-point-in-poly.c
+++ b/cogl/cogl/cogl-point-in-poly.c
@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-poll.c b/cogl/cogl/cogl-poll.c
index 1ce62f6..d0926e3 100644
--- a/cogl/cogl/cogl-poll.c
+++ b/cogl/cogl/cogl-poll.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-poll.h"
diff --git a/cogl/cogl/cogl-primitive-texture.c b/cogl/cogl/cogl-primitive-texture.c
index fce9723..ae913d1 100644
--- a/cogl/cogl/cogl-primitive-texture.c
+++ b/cogl/cogl/cogl-primitive-texture.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-primitive-texture.h"
diff --git a/cogl/cogl/cogl-primitive.c b/cogl/cogl/cogl-primitive.c
index b31a25a..728d94f 100644
--- a/cogl/cogl/cogl-primitive.c
+++ b/cogl/cogl/cogl-primitive.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-primitives.c b/cogl/cogl/cogl-primitives.c
index bfe7735..07ef412 100644
--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/cogl-profile.c b/cogl/cogl/cogl-profile.c
index 766e271..d5bca6a 100644
--- a/cogl/cogl/cogl-profile.c
+++ b/cogl/cogl/cogl-profile.c
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#ifdef COGL_ENABLE_PROFILE
diff --git a/cogl/cogl/cogl-quaternion.c b/cogl/cogl/cogl-quaternion.c
index 9567443..d380cec 100644
--- a/cogl/cogl/cogl-quaternion.c
+++ b/cogl/cogl/cogl-quaternion.c
@@ -40,7 +40,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <cogl-util.h>
diff --git a/cogl/cogl/cogl-rectangle-map.c b/cogl/cogl/cogl-rectangle-map.c
index 69368ee..ef6b421 100644
--- a/cogl/cogl/cogl-rectangle-map.c
+++ b/cogl/cogl/cogl-rectangle-map.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib.h>
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index da2f411..0272163 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdlib.h>
diff --git a/cogl/cogl/cogl-sampler-cache.c b/cogl/cogl/cogl-sampler-cache.c
index e21c64c..1f92120 100644
--- a/cogl/cogl/cogl-sampler-cache.c
+++ b/cogl/cogl/cogl-sampler-cache.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-sampler-cache-private.h"
diff --git a/cogl/cogl/cogl-snippet.c b/cogl/cogl/cogl-snippet.c
index a3f5d6c..c5a7940 100644
--- a/cogl/cogl/cogl-snippet.c
+++ b/cogl/cogl/cogl-snippet.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-types.h"
diff --git a/cogl/cogl/cogl-spans.c b/cogl/cogl/cogl-spans.c
index e7ca678..85f8e01 100644
--- a/cogl/cogl/cogl-spans.c
+++ b/cogl/cogl/cogl-spans.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "math.h"
diff --git a/cogl/cogl/cogl-sub-texture.c b/cogl/cogl/cogl-sub-texture.c
index 7baf95e..9d7abea 100644
--- a/cogl/cogl/cogl-sub-texture.c
+++ b/cogl/cogl/cogl-sub-texture.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-swap-chain.c b/cogl/cogl/cogl-swap-chain.c
index e5dd2f4..558dad2 100644
--- a/cogl/cogl/cogl-swap-chain.c
+++ b/cogl/cogl/cogl-swap-chain.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-object.h"
diff --git a/cogl/cogl/cogl-texture-2d-sliced.c b/cogl/cogl/cogl-texture-2d-sliced.c
index e76bef6..4f586cd 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl/cogl-texture-2d-sliced.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c
index cc28cd9..447d33b 100644
--- a/cogl/cogl/cogl-texture-2d.c
+++ b/cogl/cogl/cogl-texture-2d.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-private.h"
diff --git a/cogl/cogl/cogl-texture-3d.c b/cogl/cogl/cogl-texture-3d.c
index 31d2941..5644119 100644
--- a/cogl/cogl/cogl-texture-3d.c
+++ b/cogl/cogl/cogl-texture-3d.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-private.h"
diff --git a/cogl/cogl/cogl-texture-rectangle.c b/cogl/cogl/cogl-texture-rectangle.c
index da5f1f0..cc2e642 100644
--- a/cogl/cogl/cogl-texture-rectangle.c
+++ b/cogl/cogl/cogl-texture-rectangle.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-private.h"
diff --git a/cogl/cogl/cogl-texture.c b/cogl/cogl/cogl-texture.c
index d93db22..40aaa3b 100644
--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-util.h"
diff --git a/cogl/cogl/cogl-util.c b/cogl/cogl/cogl-util.c
index a8a6504..f26c896 100644
--- a/cogl/cogl/cogl-util.c
+++ b/cogl/cogl/cogl-util.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/cogl-util.h b/cogl/cogl/cogl-util.h
index 160c978..3be71af 100644
--- a/cogl/cogl/cogl-util.h
+++ b/cogl/cogl/cogl-util.h
@@ -43,7 +43,7 @@
/* Double check that config.h has been included */
#if !defined (PACKAGE_NAME) && !defined (_COGL_IN_TEST_BITMASK)
-#error "config.h must be included before including cogl-util.h"
+#error "cogl-config.h must be included before including cogl-util.h"
#endif
/* When compiling with Visual Studio, symbols that represent data that
diff --git a/cogl/cogl/cogl-vector.c b/cogl/cogl/cogl-vector.c
index 9da94af..e98d01b 100644
--- a/cogl/cogl/cogl-vector.c
+++ b/cogl/cogl/cogl-vector.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <cogl-util.h>
diff --git a/cogl/cogl/cogl-xlib-renderer.c b/cogl/cogl/cogl-xlib-renderer.c
index 8801c1c..66fe0e5 100644
--- a/cogl/cogl/cogl-xlib-renderer.c
+++ b/cogl/cogl/cogl-xlib-renderer.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-xlib-renderer.h"
diff --git a/cogl/cogl/cogl-xlib.c b/cogl/cogl/cogl-xlib.c
index 315a1bf..c381035 100644
--- a/cogl/cogl/cogl-xlib.c
+++ b/cogl/cogl/cogl-xlib.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <cogl-xlib.h>
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index e4e7808..fc8e461 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -28,7 +28,7 @@
*
*/
-#include <config.h>
+#include "cogl-config.h"
#include <string.h>
#include <math.h>
diff --git a/cogl/cogl/deprecated/cogl-auto-texture.c b/cogl/cogl/deprecated/cogl-auto-texture.c
index 87b19c5..29a5f73 100644
--- a/cogl/cogl/deprecated/cogl-auto-texture.c
+++ b/cogl/cogl/deprecated/cogl-auto-texture.c
@@ -34,7 +34,7 @@
* Robert Bragg <robert linux intel com>
*/
-#include <config.h>
+#include "cogl-config.h"
#include "cogl-context-private.h"
#include "cogl-texture.h"
diff --git a/cogl/cogl/deprecated/cogl-clip-state.c b/cogl/cogl/deprecated/cogl-clip-state.c
index 1e0ec92..63013e8 100644
--- a/cogl/cogl/deprecated/cogl-clip-state.c
+++ b/cogl/cogl/deprecated/cogl-clip-state.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c
index 4e53a94..6c972f2 100644
--- a/cogl/cogl/deprecated/cogl-clutter.c
+++ b/cogl/cogl/deprecated/cogl-clutter.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib.h>
diff --git a/cogl/cogl/deprecated/cogl-fixed.c b/cogl/cogl/deprecated/cogl-fixed.c
index bdae6cd..8a4c35e 100644
--- a/cogl/cogl/deprecated/cogl-fixed.c
+++ b/cogl/cogl/deprecated/cogl-fixed.c
@@ -31,7 +31,7 @@
#define G_IMPLEMENT_INLINES
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <glib-object.h>
diff --git a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c
b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c
index 97a2a0a..c1fb560 100644
--- a/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c
+++ b/cogl/cogl/deprecated/cogl-framebuffer-deprecated.c
@@ -28,7 +28,7 @@
*
*/
-#include <config.h>
+#include "cogl-config.h"
#include "cogl-types.h"
#include "cogl-context-private.h"
diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c
index 25f97b1..5d73eae 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.c
+++ b/cogl/cogl/deprecated/cogl-material-compat.c
@@ -30,7 +30,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <cogl-material-compat.h>
diff --git a/cogl/cogl/deprecated/cogl-program.c b/cogl/cogl/deprecated/cogl-program.c
index 9b44d35..fbf4f2c 100644
--- a/cogl/cogl/deprecated/cogl-program.c
+++ b/cogl/cogl/deprecated/cogl-program.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
diff --git a/cogl/cogl/deprecated/cogl-shader.c b/cogl/cogl/deprecated/cogl-shader.c
index d4b687c..4a2af04 100644
--- a/cogl/cogl/deprecated/cogl-shader.c
+++ b/cogl/cogl/deprecated/cogl-shader.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-shader-private.h"
diff --git a/cogl/cogl/deprecated/cogl-texture-deprecated.c b/cogl/cogl/deprecated/cogl-texture-deprecated.c
index d18a013..d15114f 100644
--- a/cogl/cogl/deprecated/cogl-texture-deprecated.c
+++ b/cogl/cogl/deprecated/cogl-texture-deprecated.c
@@ -28,7 +28,7 @@
*
*/
-#include <config.h>
+#include "cogl-config.h"
#include "cogl-types.h"
#include "cogl-texture.h"
diff --git a/cogl/cogl/deprecated/cogl-vertex-buffer.c b/cogl/cogl/deprecated/cogl-vertex-buffer.c
index b51db13..cf6e51e 100644
--- a/cogl/cogl/deprecated/cogl-vertex-buffer.c
+++ b/cogl/cogl/deprecated/cogl-vertex-buffer.c
@@ -96,7 +96,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <stdio.h>
diff --git a/cogl/cogl/driver/gl/cogl-attribute-gl.c b/cogl/cogl/driver/gl/cogl-attribute-gl.c
index 34ddb55..0599049 100644
--- a/cogl/cogl/driver/gl/cogl-attribute-gl.c
+++ b/cogl/cogl/driver/gl/cogl-attribute-gl.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-buffer-gl.c b/cogl/cogl/driver/gl/cogl-buffer-gl.c
index b8cd03f..f3c134a 100644
--- a/cogl/cogl/driver/gl/cogl-buffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-buffer-gl.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
index ea1ae62..5c77e07 100644
--- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
+++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
index a30ccc1..18ba08a 100644
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c
b/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c
index 55b0956..b529122 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-fixed.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
index 6fdb3a1..c255bf9 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
index 52c2392..1782696 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -31,7 +31,7 @@
* Robert Bragg <robert linux intel com>
*/
-#include "config.h"
+#include "cogl-config.h"
#include "cogl-debug.h"
#include "cogl-util-gl-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c
b/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c
index 99f71bf..4eb4191 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-fixed.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
index 8884ce6..3db5342 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c
b/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c
index f34a012..eec60d3 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-fixed.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
index c9e6a28..6386110 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
index 1cae680..1193df4 100644
--- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
@@ -32,7 +32,7 @@
* Robert Bragg <robert linux intel com>
*/
-#include <config.h>
+#include "cogl-config.h"
#include <string.h>
diff --git a/cogl/cogl/driver/gl/cogl-texture-gl.c b/cogl/cogl/driver/gl/cogl-texture-gl.c
index 2e281c0..0225341 100644
--- a/cogl/cogl/driver/gl/cogl-texture-gl.c
+++ b/cogl/cogl/driver/gl/cogl-texture-gl.c
@@ -28,7 +28,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#ifdef HAVE_STRINGS_H
diff --git a/cogl/cogl/driver/gl/cogl-util-gl.c b/cogl/cogl/driver/gl/cogl-util-gl.c
index add2574..25e4903 100644
--- a/cogl/cogl/driver/gl/cogl-util-gl.c
+++ b/cogl/cogl/driver/gl/cogl-util-gl.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-types.h"
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
index 716d1dd..2b9a49c 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
b/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
index 7be4a3f..96ab3a3 100644
--- a/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
+++ b/cogl/cogl/driver/gl/gl/cogl-pipeline-fragend-arbfp.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
b/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
index 956bffc..ac79500 100644
--- a/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
+++ b/cogl/cogl/driver/gl/gl/cogl-pipeline-progend-fixed-arbfp.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
index 1113966..c76a0cf 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-private.h"
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index e94449f..bf63fcc 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
index 85412a8..34ba57f 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-private.h"
diff --git a/cogl/cogl/driver/nop/cogl-attribute-nop.c b/cogl/cogl/driver/nop/cogl-attribute-nop.c
index 5441d5b..dcb6891 100644
--- a/cogl/cogl/driver/nop/cogl-attribute-nop.c
+++ b/cogl/cogl/driver/nop/cogl-attribute-nop.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-types.h"
diff --git a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
index 314e7e7..441dd6e 100644
--- a/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
+++ b/cogl/cogl/driver/nop/cogl-clip-stack-nop.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-clip-stack.h"
diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c
index 53f5975..d9b1d0f 100644
--- a/cogl/cogl/driver/nop/cogl-driver-nop.c
+++ b/cogl/cogl/driver/nop/cogl-driver-nop.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
index 8190784..2e730e4 100644
--- a/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
+++ b/cogl/cogl/driver/nop/cogl-framebuffer-nop.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-framebuffer-nop-private.h"
diff --git a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
index b521498..539048a 100644
--- a/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
+++ b/cogl/cogl/driver/nop/cogl-texture-2d-nop.c
@@ -33,7 +33,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <string.h>
diff --git a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
index 398c357..d03040c 100644
--- a/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
+++ b/cogl/cogl/winsys/cogl-texture-pixmap-x11.c
@@ -34,7 +34,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-debug.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/cogl/winsys/cogl-winsys-egl-kms.c
index 4da1f14..271059c 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-kms.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-kms.c
@@ -35,7 +35,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <EGL/egl.h>
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
index 724a4d0..454b41e 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include <X11/Xlib.h>
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index a53c0c7..ed41196 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-i18n-private.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index f88ee37..c50db3a 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -31,7 +31,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-i18n-private.h"
diff --git a/cogl/cogl/winsys/cogl-winsys-stub.c b/cogl/cogl/winsys/cogl-winsys-stub.c
index 4fc8c90..ba49a94 100644
--- a/cogl/cogl/winsys/cogl-winsys-stub.c
+++ b/cogl/cogl/winsys/cogl-winsys-stub.c
@@ -32,7 +32,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-renderer-private.h"
diff --git a/cogl/cogl/winsys/cogl-winsys.c b/cogl/cogl/winsys/cogl-winsys.c
index fccb94c..b0a7b68 100644
--- a/cogl/cogl/winsys/cogl-winsys.c
+++ b/cogl/cogl/winsys/cogl-winsys.c
@@ -29,7 +29,7 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "cogl-config.h"
#endif
#include "cogl-context-private.h"
diff --git a/cogl/configure.ac b/cogl/configure.ac
index 62c63ca..c2674fb 100644
--- a/cogl/configure.ac
+++ b/cogl/configure.ac
@@ -79,7 +79,7 @@ AC_INIT(cogl, [cogl_1_version])
AC_CONFIG_SRCDIR(cogl/cogl.h)
AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build/autotools])
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(cogl-config.h)
AC_GNU_SOURCE
dnl ================================================================
diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
index 59e3fd8..e920dd8 100644
--- a/cogl/test-fixtures/test-utils.c
+++ b/cogl/test-fixtures/test-utils.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "cogl-config.h"
#include <stdlib.h>
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 9b6573d..64fdfba 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "cogl-config.h"
#include <cogl/cogl.h>
diff --git a/cogl/tests/conform/test-fence.c b/cogl/tests/conform/test-fence.c
index d5e3586..ab8dbac 100644
--- a/cogl/tests/conform/test-fence.c
+++ b/cogl/tests/conform/test-fence.c
@@ -5,7 +5,7 @@
#undef COGL_ENABLE_EXPERIMENTAL_API
#include "test-utils.h"
-#include "config.h"
+#include "cogl-config.h"
/* I'm writing this on the train after having dinner at a churrascuria. */
#define MAGIC_CHUNK_O_DATA ((void *) 0xdeadbeef)
diff --git a/cogl/tests/conform/test-materials.c b/cogl/tests/conform/test-materials.c
index 69c9c74..e260683 100644
--- a/cogl/tests/conform/test-materials.c
+++ b/cogl/tests/conform/test-materials.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "cogl-config.h"
#include <clutter/clutter.h>
#include <cogl/cogl.h>
diff --git a/cogl/tests/conform/test-version.c b/cogl/tests/conform/test-version.c
index b651165..1b2e2e7 100644
--- a/cogl/tests/conform/test-version.c
+++ b/cogl/tests/conform/test-version.c
@@ -5,7 +5,7 @@
#undef COGL_ENABLE_EXPERIMENTAL_API
#include "test-utils.h"
-#include "config.h"
+#include "cogl-config.h"
/* So we can use _COGL_STATIC_ASSERT we include the internal
* cogl-util.h header. Since internal headers explicitly guard against
diff --git a/cogl/tests/unit/test-unit-main.c b/cogl/tests/unit/test-unit-main.c
index b1f7864..4be6700 100644
--- a/cogl/tests/unit/test-unit-main.c
+++ b/cogl/tests/unit/test-unit-main.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "cogl-config.h"
#include <gmodule.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
