Log Message
[GTK] Cleanup command-line defines https://bugs.webkit.org/show_bug.cgi?id=109213
Reviewed by Xan Lopez. .: * GNUmakefile.am: Remove references to flags that are now provided by autotoolsconfig.h * configure.ac: Add new AC_DEFINE invocations for flags that were before manually appended to the compiler CPPFLAGS and clump all AC_DEFINE invocations together. Source/WebCore: * GNUmakefile.am: Remove references to flags that are now handled via autotoolsconfig.h. Source/WebKit/gtk: * GNUmakefile.am: Remove references to flags that are now provided by autotoolsconfig.h Source/WebKit2: * GNUmakefile.am: Remove references to flags that are now provided by autotoolsconfig.h. Tools: * TestWebKitAPI/config.h: Include the autotoolsconfig.h header to pick up defines from autoconf.
Modified Paths
- trunk/ChangeLog
- trunk/GNUmakefile.am
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/GNUmakefile.am
- trunk/Source/WebKit/gtk/ChangeLog
- trunk/Source/WebKit/gtk/GNUmakefile.am
- trunk/Source/WebKit2/ChangeLog
- trunk/Source/WebKit2/GNUmakefile.am
- trunk/Tools/ChangeLog
- trunk/Tools/TestWebKitAPI/config.h
- trunk/configure.ac
Diff
Modified: trunk/ChangeLog (142178 => 142179)
--- trunk/ChangeLog 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/ChangeLog 2013-02-07 22:08:08 UTC (rev 142179)
@@ -1,3 +1,16 @@
+2013-02-07 Martin Robinson <[email protected]>
+
+ [GTK] Cleanup command-line defines
+ https://bugs.webkit.org/show_bug.cgi?id=109213
+
+ Reviewed by Xan Lopez.
+
+ * GNUmakefile.am: Remove references to flags that are now provided
+ by autotoolsconfig.h
+ * configure.ac: Add new AC_DEFINE invocations for flags that were
+ before manually appended to the compiler CPPFLAGS and clump all
+ AC_DEFINE invocations together.
+
2013-02-07 ChangSeok Oh <[email protected]>
[GTK][AC] Clutter required version up to 1.12
Modified: trunk/GNUmakefile.am (142178 => 142179)
--- trunk/GNUmakefile.am 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/GNUmakefile.am 2013-02-07 22:08:08 UTC (rev 142179)
@@ -138,10 +138,16 @@
-Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
-Wformat -Wformat-security -Wno-format-y2k -Wundef \
-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
- -Wno-unused-parameter -Wno-parentheses \
- -fno-exceptions -DENABLE_GLIB_SUPPORT=1
+ -Wno-unused-parameter -Wno-parentheses -fno-exceptions \
+ -DBUILDING_CAIRO__ \
+ -DBUILDING_GTK__
+if ENABLE_WEBKIT2
+global_cppflags += \
+ -DBUILDING_WEBKIT2__
+endif
+
global_cxxflags += \
-fno-rtti
@@ -156,123 +162,6 @@
version_script = -Wl,--version-script,$(srcdir)/Source/autotools/symbols.filter
endif
-# Extra checks and flags
-global_cppflags += \
- -DBUILDING_CAIRO__=1 \
- -DBUILDING_GTK__=1 \
- -DWTF_CHANGES
-
-if ENABLE_WEBKIT2
-global_cppflags += \
- -DBUILDING_WEBKIT2__=1
-endif
-
-# For the Gtk port we want to use XP_UNIX both in X11 and Mac
-if TARGET_WIN32
-global_cppflags += \
- -DXP_WIN
-else
-global_cppflags += \
- -DXP_UNIX
-endif
-
-# Add MOZ_X11 for X11 targets only
-if TARGET_X11
-global_cppflags += \
- -DMOZ_X11
-endif
-
-# Use the wide character version of win32 API by default
-if TARGET_WIN32
-global_cppflags += \
- -DUNICODE \
- -D_UNICODE
-endif
-
-if USE_ICU_UNICODE
-global_cppflags += \
- -DWTF_USE_ICU_UNICODE=1
-endif
-
-if USE_GLIB_UNICODE
-global_cppflags += \
- -DWTF_USE_GLIB_UNICODE=1
-endif
-
-if !ENABLE_FAST_MALLOC
-global_cppflags += \
- -DUSE_SYSTEM_MALLOC
-endif
-
-if USE_GSTREAMER
-global_cppflags += \
- -DWTF_USE_GSTREAMER=1
-endif
-
-if USE_ACCELERATED_COMPOSITING
-global_cppflags += \
- -DWTF_USE_ACCELERATED_COMPOSITING=1 \
- -DENABLE_3D_RENDERING=1
-endif
-
-if USE_TEXTURE_MAPPER_CAIRO
-global_cppflags += \
- -DWTF_USE_TEXTURE_MAPPER=1 \
- -DWTF_USE_TEXTURE_MAPPER_CAIRO=1
-endif
-
-if USE_TEXTURE_MAPPER_GL
-global_cppflags += \
- -DWTF_USE_TEXTURE_MAPPER=1 \
- -DWTF_USE_TEXTURE_MAPPER_GL=1
-endif
-
-if USE_CLUTTER
-global_cppflags += \
- -DWTF_USE_CLUTTER=1
-endif
-
-if USE_GLX
-global_cppflags += \
- -DWTF_USE_GLX=1
-endif
-
-if USE_EGL
-global_cppflags += \
- -DWTF_USE_EGL=1
-endif
-
-if USE_GLES2
-global_cppflags += \
- -DWTF_USE_OPENGL_ES_2=1
-endif
-
-if USE_OPENGL
-global_cppflags += \
- -DWTF_USE_OPENGL=1
-endif
-
-# ----
-# GTK+ 2.x/3.x support
-# ----
-if GTK_API_VERSION_2
-global_cppflags += \
- -DGTK_API_VERSION_2=1
-endif
-
-if !ENABLE_DEBUG
-global_cppflags += -DNDEBUG
-else
-global_cppflags += \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DPANGO_DISABLE_DEPRECATED
-# Might be useful in the future
-# -DGDK_MULTIHEAD_SAFE \
-# -DGTK_MULTIHEAD_SAFE
-endif
-
if ENABLE_COVERAGE
global_cppflags += \
-DGCC_GENERATE_TEST_COVERAGE_FILES \
Modified: trunk/Source/WebCore/ChangeLog (142178 => 142179)
--- trunk/Source/WebCore/ChangeLog 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Source/WebCore/ChangeLog 2013-02-07 22:08:08 UTC (rev 142179)
@@ -1,3 +1,13 @@
+2013-02-07 Martin Robinson <[email protected]>
+
+ [GTK] Cleanup command-line defines
+ https://bugs.webkit.org/show_bug.cgi?id=109213
+
+ Reviewed by Xan Lopez.
+
+ * GNUmakefile.am: Remove references to flags that are now handled
+ via autotoolsconfig.h.
+
2013-02-07 Tom Sepez <[email protected]>
[V8] Binding Integrity crash in V8MediaStream::createWrapper
Modified: trunk/Source/WebCore/GNUmakefile.am (142178 => 142179)
--- trunk/Source/WebCore/GNUmakefile.am 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Source/WebCore/GNUmakefile.am 2013-02-07 22:08:08 UTC (rev 142179)
@@ -5,9 +5,6 @@
WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
webcore_cppflags += \
- -DWTF_USE_FREETYPE=1 \
- -DWTF_USE_HARFBUZZ=1 \
- -DWTF_USE_WEBP=1 \
-I$(srcdir)/Source/ThirdParty/ANGLE/src \
-I$(srcdir)/Source/ThirdParty/ANGLE/include \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
@@ -114,9 +111,6 @@
webcoregtk_cppflags += \
-DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
- -DWTF_USE_FREETYPE=1 \
- -DWTF_USE_HARFBUZZ_NG=1 \
- -DWTF_USE_SOUP=1 \
-I$(srcdir)/Source/WebCore/accessibility/atk \
-I$(srcdir)/Source/WebCore/loader/gtk \
-I$(srcdir)/Source/WebCore/page/gtk \
@@ -157,12 +151,6 @@
# ----
if ENABLE_VIDEO
feature_defines_overrides += ENABLE_VIDEO=1
-if USE_GSTREAMER
-if ENABLE_DEBUG
-webcore_cppflags += -DGST_DISABLE_DEPRECATED
-endif # END ENABLE_DEBUG
-webcore_cppflags += -DWTF_USE_NATIVE_FULLSCREEN_VIDEO=1
-endif # END USE_GSTREAMER
else
feature_defines_overrides += ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0
endif # END ENABLE_VIDEO
@@ -291,10 +279,6 @@
feature_defines_overrides += ENABLE_WEB_AUDIO=0
endif
-if USE_WEBAUDIO_GSTREAMER
-webcore_cppflags += -DWTF_USE_WEBAUDIO_GSTREAMER=1
-endif
-
# ---
# 3D canvas (WebGL) support
# ---
Modified: trunk/Source/WebKit/gtk/ChangeLog (142178 => 142179)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-02-07 22:08:08 UTC (rev 142179)
@@ -1,3 +1,13 @@
+2013-02-07 Martin Robinson <[email protected]>
+
+ [GTK] Cleanup command-line defines
+ https://bugs.webkit.org/show_bug.cgi?id=109213
+
+ Reviewed by Xan Lopez.
+
+ * GNUmakefile.am: Remove references to flags that are now provided
+ by autotoolsconfig.h
+
2013-02-07 Benjamin Poulain <[email protected]>
Move pauseAnimation/pauseTransition from TestRunner to Internals
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (142178 => 142179)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-02-07 22:08:08 UTC (rev 142179)
@@ -26,9 +26,6 @@
$(global_cflags)
if ENABLE_SPELLCHECK
-webkitgtk_cppflags += \
- -DENABLE_SPELLCHECK=1
-
webkitgtk_sources += \
Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp \
Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.h
Modified: trunk/Source/WebKit2/ChangeLog (142178 => 142179)
--- trunk/Source/WebKit2/ChangeLog 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-07 22:08:08 UTC (rev 142179)
@@ -1,3 +1,13 @@
+2013-02-07 Martin Robinson <[email protected]>
+
+ [GTK] Cleanup command-line defines
+ https://bugs.webkit.org/show_bug.cgi?id=109213
+
+ Reviewed by Xan Lopez.
+
+ * GNUmakefile.am: Remove references to flags that are now
+ provided by autotoolsconfig.h.
+
2013-02-07 Benjamin Poulain <[email protected]>
Move pauseAnimation/pauseTransition from TestRunner to Internals
Modified: trunk/Source/WebKit2/GNUmakefile.am (142178 => 142179)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-02-07 22:08:08 UTC (rev 142179)
@@ -129,6 +129,7 @@
$(_javascript_core_cppflags) \
$(CLUTTER_CFLAGS) \
$(COVERAGE_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GLIB_CFLAGS) \
@@ -155,18 +156,6 @@
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
$(libwebkit2gtkincludedir)/WebKit2
-# For the Gtk port we want to use XP_UNIX both in X11 and Mac
-if !TARGET_WIN32
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
- -DXP_UNIX
-endif
-
-# Add MOZ_X11 for X11 targets only
-if TARGET_X11
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
- -DMOZ_X11
-endif
-
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
-version-info @LIBWEBKIT2GTK_VERSION@ \
$(version_script) \
@@ -195,6 +184,7 @@
$(CAIRO_LIBS) \
$(CLUTTER_LIBS) \
$(COVERAGE_LDFLAGS) \
+ $(ENCHANT_LIBS) \
$(FREETYPE_LIBS) \
$(GAIL_LIBS) \
$(GAMEPAD_LIBS) \
@@ -220,16 +210,6 @@
$(XT_LIBS) \
$(ZLIB_LIBS)
-if ENABLE_SPELLCHECK
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
- -DENABLE_SPELLCHECK=1 \
- $(ENCHANT_CFLAGS)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
- $(ENCHANT_LIBS)
-endif
-
-
if ENABLE_WEBKIT2
pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
Modified: trunk/Tools/ChangeLog (142178 => 142179)
--- trunk/Tools/ChangeLog 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Tools/ChangeLog 2013-02-07 22:08:08 UTC (rev 142179)
@@ -1,3 +1,13 @@
+2013-02-07 Martin Robinson <[email protected]>
+
+ [GTK] Cleanup command-line defines
+ https://bugs.webkit.org/show_bug.cgi?id=109213
+
+ Reviewed by Xan Lopez.
+
+ * TestWebKitAPI/config.h: Include the autotoolsconfig.h header to pick
+ up defines from autoconf.
+
2013-02-07 Ryosuke Niwa <[email protected]>
git.svn_revision doesn't fetch the same revision as svn.svn_revision
Modified: trunk/Tools/TestWebKitAPI/config.h (142178 => 142179)
--- trunk/Tools/TestWebKitAPI/config.h 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/Tools/TestWebKitAPI/config.h 2013-02-07 22:08:08 UTC (rev 142179)
@@ -26,6 +26,8 @@
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#ifdef BUILDING_WITH_CMAKE
#include "cmakeconfig.h"
+#else
+#include "autotoolsconfig.h"
#endif
#endif
Modified: trunk/configure.ac (142178 => 142179)
--- trunk/configure.ac 2013-02-07 22:04:02 UTC (rev 142178)
+++ trunk/configure.ac 2013-02-07 22:08:08 UTC (rev 142179)
@@ -194,16 +194,6 @@
fi
AC_LANG_POP(C++)
-# pthread (not needed on Windows)
-if test "$os_win32" = "no"; then
-AC_CHECK_HEADERS([pthread.h],
- AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
- AC_MSG_ERROR([pthread support is required to build WebKit]))
-AC_CHECK_LIB(pthread, pthread_rwlock_init,
- AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
- AC_MSG_WARN([pthread rwlock support is not available]))
-fi
-
# Check for libjpeg the way Gtk does it.
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no AC_MSG_ERROR([JPEG library (libjpeg) not found]))
if test "$jpeg_ok" = yes; then
@@ -411,7 +401,6 @@
GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext catalog name])
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
AC_SUBST(LIBXML_CFLAGS)
@@ -440,7 +429,6 @@
if test "$with_target" = "directfb"; then
PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION)
- AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])
else
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION)
PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION)
@@ -459,7 +447,6 @@
AC_SUBST([XT_CFLAGS])
AC_SUBST([XT_LIBS])
- AC_DEFINE([WTF_PLATFORM_X11], [1], [Define if target is X11])
fi
fi
AC_SUBST(GTK_CFLAGS)
@@ -739,9 +726,6 @@
esac
AC_SUBST([GST_API_VERSION])
-if test "$GST_API_VERSION" = "1.0"; then
- AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 1.0])
-fi
# Check whether to enable debug features.
AC_MSG_CHECKING([whether to enable debug features])
@@ -770,7 +754,6 @@
if test "$enable_jit" = "yes"; then
AC_MSG_ERROR([JIT must be disabled for Opcode stats to work.])
fi
- AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
fi
# GObject Introspection.
@@ -802,7 +785,6 @@
G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
- AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject introspection support])
fi
AC_SUBST([G_IR_SCANNER])
@@ -823,10 +805,6 @@
CFLAGS="$CFLAGS -g"
fi
-if test "$enable_debug_features" = "no"; then
- AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
-fi
-
# Add the appropriate 'O' level for optimized builds.
if test "$enable_optimizations" = "yes"; then
CXXFLAGS="$CXXFLAGS -O2"
@@ -980,9 +958,6 @@
PKG_CHECK_MODULES(GTK_UNIX_PRINTING, gtk+-unix-print-3.0, [have_gtk_unix_printing=yes], [have_gtk_unix_printing=no])
AC_SUBST(GTK_UNIX_PRINTING_CFLAGS)
AC_SUBST(GTK_UNIX_PRINTING_LIBS)
- if test "$have_gtk_unix_printing" = "yes"; then
- AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
- fi
# On some Linux/Unix platforms, shm_* may only be available if linking
# against librt
@@ -1061,7 +1036,6 @@
AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
-AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
AM_CONDITIONAL([ENABLE_WEBKIT1],[test "$enable_webkit1" = "yes"])
@@ -1095,6 +1069,132 @@
[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
fi
+# Configuration flags that are used throughout WebKitGTK+.
+AC_DEFINE([ENABLE_GLIB_SUPPORT], [1], [ ])
+AC_DEFINE([WTF_USE_FREETYPE], [1], [ ])
+AC_DEFINE([WTF_USE_HARFBUZZ], [1], [ ])
+AC_DEFINE([WTF_USE_SOUP], [1], [ ])
+AC_DEFINE([WTF_USE_WEBP], [1], [ ])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext catalog name])
+
+if test "$enable_debug_features" = "yes"; then
+ AC_DEFINE([GDK_PIXBUF_DISABLE_DEPRECATED], [1], [ ])
+ AC_DEFINE([GDK_DISABLE_DEPRECATED], [1], [ ])
+ AC_DEFINE([GTK_DISABLE_DEPRECATED], [1], [ ])
+ AC_DEFINE([PANGO_DISABLE_DEPRECATED], [1], [ ])
+else
+ AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
+fi
+
+if test "$os_win32" = "no"; then
+AC_CHECK_HEADERS([pthread.h],
+ AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),
+ AC_MSG_ERROR([pthread support is required to build WebKit]))
+AC_CHECK_LIB(pthread, pthread_rwlock_init,
+ AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),
+ AC_MSG_WARN([pthread rwlock support is not available]))
+fi
+
+if test "$GTK_API_VERSION" = "2.0"; then
+ AC_DEFINE([GTK_API_VERSION_2], [1], [ ])
+fi
+
+if test "$enable_webkit2" = "yes"; then
+ AC_DEFINE([ENABLE_PLUGIN_PROCESS], [1], [ ])
+ if test "$have_gtk_unix_printing" = "yes"; then
+ AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
+ fi
+fi
+
+if test "$os_win32" = "yes"; then
+ AC_DEFINE([XP_WIN], [1], [ ])
+ AC_DEFINE([UNICODE], [1], [ ])
+ AC_DEFINE([_UNICODE], [1], [ ])
+else
+ AC_DEFINE([XP_UNIX], [1], [ ])
+fi
+
+if test "$with_target" = "x11"; then
+ AC_DEFINE([MOZ_X11], [1], [ ])
+ AC_DEFINE([WTF_PLATFORM_X11], [1], [Define if target is X11])
+fi
+
+if test "$with_unicode_backend" = "icu"; then
+ AC_DEFINE([WTF_USE_ICU_UNICODE], [1], [ ])
+else
+ AC_DEFINE([WTF_USE_GLIB_UNICODE], [1], [ ])
+fi
+
+if test "$enable_fast_malloc" = "no"; then
+ AC_DEFINE([WTF_SYSTEM_MALLOC], [1], [ ])
+fi
+
+if test "$enable_opcode_stats" = "yes"; then
+ AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
+fi
+
+if test "$enable_introspection" = "yes"; then
+ AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject introspection support])
+fi
+
+if test "$have_gstreamer" = "yes"; then
+ AC_DEFINE([WTF_USE_GSTREAMER], [1], [ ])
+ if test "$enable_debug_features" = "yes"; then
+ AC_DEFINE([GST_DISABLE_DEPRECATED], [1], [ ])
+ fi
+
+ if test "$enable_video" = "yes"; then
+ AC_DEFINE([WTF_USE_NATIVE_FULLSCREEN_VIDEO], [1], [ ])
+ fi
+fi
+
+if test "$GST_API_VERSION" = "1.0"; then
+ AC_DEFINE([GST_API_VERSION_1], [1], [Using GStreamer 1.0])
+fi
+
+if test "$enable_web_audio" = "yes"; then
+ AC_DEFINE([WTF_USE_WEBAUDIO_GSTREAMER], [1], [1])
+fi
+
+if test "$enable_accelerated_compositing" = "yes"; then
+ AC_DEFINE([WTF_USE_ACCELERATED_COMPOSITING], [1], [ ])
+ AC_DEFINE([ENABLE_3D_RENDERING], [1], [ ])
+
+ if test "$with_acceleration_backend" = "none"; then
+ AC_DEFINE([DWTF_USE_TEXTURE_MAPPER], [1], [ ])
+ AC_DEFINE([DWTF_USE_TEXTURE_MAPPER_CAIRO], [1], [ ])
+ fi
+
+ if test "$with_acceleration_backend" = "opengl"; then
+ AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ])
+ AC_DEFINE([WTF_USE_TEXTURE_MAPPER_GL], [1], [ ])
+ fi
+
+ if test "$with_acceleration_backend" = "clutter"; then
+ AC_DEFINE([WTF_USE_CLUTTER], [1], [ ])
+ fi
+fi
+
+if test "$with_acceleration_backend" = "opengl"; then
+ AC_DEFINE([WTF_USE_OPENGL], [1], [ ])
+fi
+
+if test "$enable_glx" = "yes"; then
+ AC_DEFINE([WTF_USE_GLX], [1], [ ])
+fi
+
+if test "$enable_egl" = "yes"; then
+ AC_DEFINE([WTF_USE_EGL], [1], [ ])
+fi
+
+if test "$enable_gles2" = "yes"; then
+ AC_DEFINE([WTF_USE_OPENGL_ES_2], [1], [ ])
+fi
+
+if test "$enable_spellcheck" = "yes"; then
+ AC_DEFINE([ENABLE_SPELLCHECK], [1], [ ])
+fi
+
AC_OUTPUT
echo "
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
