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
2024-12-22 19:12:04 +00:00 · 2016-05-05 22:21:51 +08:00 · 2016-05-05 22:21:51 +08:00 · bf71cb2e3c
commit bf71cb2e3c
parent 4d13f6e2d0
285 changed files with 388 additions and 288 deletions
--- 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
--- 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>
--- 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"
--- 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"
--- 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

--- 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"

--- 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"
--- 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"
--- 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

--- 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>
--- 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
--- 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"
--- 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>
--- 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"
--- 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>

--- 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"
--- 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
--- 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
--- 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"
--- 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>
--- 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>
--- 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"
--- 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
--- 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>
--- 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>
--- a/clutter/clutter/clutter-build-config.h.in
+++ 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
--- 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"
--- 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>
--- 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"
--- 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"
--- 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
--- 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>
--- 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
--- 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>
--- 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>
--- 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"
--- 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
--- 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
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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 ***/

--- 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"

--- 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"
--- 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>
--- 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"
--- 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"
--- 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>
--- 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"
--- 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>
--- 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"
--- 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
--- 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"
--- 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"
--- 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>
--- 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"
--- 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>

--- 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>
--- 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"
--- 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>
--- 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"
--- 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"
--- 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
--- 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>
--- 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
--- 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
--- 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>
--- 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"
--- 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"
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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"
--- 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
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"
--- 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"
--- 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"

--- 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"
--- 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>
--- 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"
--- 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"
--- 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"
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- a/Show More
+++ b/Show More