Changeset 142179 in webkit
- Timestamp:
- Feb 7, 2013 2:08:08 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r142172 r142179 1 2013-02-07 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Cleanup command-line defines 4 https://bugs.webkit.org/show_bug.cgi?id=109213 5 6 Reviewed by Xan Lopez. 7 8 * GNUmakefile.am: Remove references to flags that are now provided 9 by autotoolsconfig.h 10 * configure.ac: Add new AC_DEFINE invocations for flags that were 11 before manually appended to the compiler CPPFLAGS and clump all 12 AC_DEFINE invocations together. 13 1 14 2013-02-07 ChangSeok Oh <shivamidow@gmail.com> 2 15 -
trunk/GNUmakefile.am
r142158 r142179 139 139 -Wformat -Wformat-security -Wno-format-y2k -Wundef \ 140 140 -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ 141 -Wno-unused-parameter -Wno-parentheses \ 142 -fno-exceptions -DENABLE_GLIB_SUPPORT=1 143 141 -Wno-unused-parameter -Wno-parentheses -fno-exceptions \ 142 -DBUILDING_CAIRO__ \ 143 -DBUILDING_GTK__ 144 145 if ENABLE_WEBKIT2 146 global_cppflags += \ 147 -DBUILDING_WEBKIT2__ 148 149 endif 144 150 145 151 global_cxxflags += \ … … 155 161 if OS_GNU 156 162 version_script = -Wl,--version-script,$(srcdir)/Source/autotools/symbols.filter 157 endif158 159 # Extra checks and flags160 global_cppflags += \161 -DBUILDING_CAIRO__=1 \162 -DBUILDING_GTK__=1 \163 -DWTF_CHANGES164 165 if ENABLE_WEBKIT2166 global_cppflags += \167 -DBUILDING_WEBKIT2__=1168 endif169 170 # For the Gtk port we want to use XP_UNIX both in X11 and Mac171 if TARGET_WIN32172 global_cppflags += \173 -DXP_WIN174 else175 global_cppflags += \176 -DXP_UNIX177 endif178 179 # Add MOZ_X11 for X11 targets only180 if TARGET_X11181 global_cppflags += \182 -DMOZ_X11183 endif184 185 # Use the wide character version of win32 API by default186 if TARGET_WIN32187 global_cppflags += \188 -DUNICODE \189 -D_UNICODE190 endif191 192 if USE_ICU_UNICODE193 global_cppflags += \194 -DWTF_USE_ICU_UNICODE=1195 endif196 197 if USE_GLIB_UNICODE198 global_cppflags += \199 -DWTF_USE_GLIB_UNICODE=1200 endif201 202 if !ENABLE_FAST_MALLOC203 global_cppflags += \204 -DUSE_SYSTEM_MALLOC205 endif206 207 if USE_GSTREAMER208 global_cppflags += \209 -DWTF_USE_GSTREAMER=1210 endif211 212 if USE_ACCELERATED_COMPOSITING213 global_cppflags += \214 -DWTF_USE_ACCELERATED_COMPOSITING=1 \215 -DENABLE_3D_RENDERING=1216 endif217 218 if USE_TEXTURE_MAPPER_CAIRO219 global_cppflags += \220 -DWTF_USE_TEXTURE_MAPPER=1 \221 -DWTF_USE_TEXTURE_MAPPER_CAIRO=1222 endif223 224 if USE_TEXTURE_MAPPER_GL225 global_cppflags += \226 -DWTF_USE_TEXTURE_MAPPER=1 \227 -DWTF_USE_TEXTURE_MAPPER_GL=1228 endif229 230 if USE_CLUTTER231 global_cppflags += \232 -DWTF_USE_CLUTTER=1233 endif234 235 if USE_GLX236 global_cppflags += \237 -DWTF_USE_GLX=1238 endif239 240 if USE_EGL241 global_cppflags += \242 -DWTF_USE_EGL=1243 endif244 245 if USE_GLES2246 global_cppflags += \247 -DWTF_USE_OPENGL_ES_2=1248 endif249 250 if USE_OPENGL251 global_cppflags += \252 -DWTF_USE_OPENGL=1253 endif254 255 # ----256 # GTK+ 2.x/3.x support257 # ----258 if GTK_API_VERSION_2259 global_cppflags += \260 -DGTK_API_VERSION_2=1261 endif262 263 if !ENABLE_DEBUG264 global_cppflags += -DNDEBUG265 else266 global_cppflags += \267 -DGDK_PIXBUF_DISABLE_DEPRECATED \268 -DGDK_DISABLE_DEPRECATED \269 -DGTK_DISABLE_DEPRECATED \270 -DPANGO_DISABLE_DEPRECATED271 # Might be useful in the future272 # -DGDK_MULTIHEAD_SAFE \273 # -DGTK_MULTIHEAD_SAFE274 163 endif 275 164 -
trunk/Source/WebCore/ChangeLog
r142177 r142179 1 2013-02-07 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Cleanup command-line defines 4 https://bugs.webkit.org/show_bug.cgi?id=109213 5 6 Reviewed by Xan Lopez. 7 8 * GNUmakefile.am: Remove references to flags that are now handled 9 via autotoolsconfig.h. 10 1 11 2013-02-07 Tom Sepez <tsepez@chromium.org> 2 12 -
trunk/Source/WebCore/GNUmakefile.am
r142158 r142179 6 6 7 7 webcore_cppflags += \ 8 -DWTF_USE_FREETYPE=1 \9 -DWTF_USE_HARFBUZZ=1 \10 -DWTF_USE_WEBP=1 \11 8 -I$(srcdir)/Source/ThirdParty/ANGLE/src \ 12 9 -I$(srcdir)/Source/ThirdParty/ANGLE/include \ … … 115 112 webcoregtk_cppflags += \ 116 113 -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \ 117 -DWTF_USE_FREETYPE=1 \118 -DWTF_USE_HARFBUZZ_NG=1 \119 -DWTF_USE_SOUP=1 \120 114 -I$(srcdir)/Source/WebCore/accessibility/atk \ 121 115 -I$(srcdir)/Source/WebCore/loader/gtk \ … … 158 152 if ENABLE_VIDEO 159 153 feature_defines_overrides += ENABLE_VIDEO=1 160 if USE_GSTREAMER161 if ENABLE_DEBUG162 webcore_cppflags += -DGST_DISABLE_DEPRECATED163 endif # END ENABLE_DEBUG164 webcore_cppflags += -DWTF_USE_NATIVE_FULLSCREEN_VIDEO=1165 endif # END USE_GSTREAMER166 154 else 167 155 feature_defines_overrides += ENABLE_VIDEO=0 ENABLE_VIDEO_TRACK=0 … … 290 278 else 291 279 feature_defines_overrides += ENABLE_WEB_AUDIO=0 292 endif293 294 if USE_WEBAUDIO_GSTREAMER295 webcore_cppflags += -DWTF_USE_WEBAUDIO_GSTREAMER=1296 280 endif 297 281 -
trunk/Source/WebKit/gtk/ChangeLog
r142171 r142179 1 2013-02-07 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Cleanup command-line defines 4 https://bugs.webkit.org/show_bug.cgi?id=109213 5 6 Reviewed by Xan Lopez. 7 8 * GNUmakefile.am: Remove references to flags that are now provided 9 by autotoolsconfig.h 10 1 11 2013-02-07 Benjamin Poulain <bpoulain@apple.com> 2 12 -
trunk/Source/WebKit/gtk/GNUmakefile.am
r141566 r142179 27 27 28 28 if ENABLE_SPELLCHECK 29 webkitgtk_cppflags += \30 -DENABLE_SPELLCHECK=131 32 29 webkitgtk_sources += \ 33 30 Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp \ -
trunk/Source/WebKit2/ChangeLog
r142171 r142179 1 2013-02-07 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Cleanup command-line defines 4 https://bugs.webkit.org/show_bug.cgi?id=109213 5 6 Reviewed by Xan Lopez. 7 8 * GNUmakefile.am: Remove references to flags that are now 9 provided by autotoolsconfig.h. 10 1 11 2013-02-07 Benjamin Poulain <bpoulain@apple.com> 2 12 -
trunk/Source/WebKit2/GNUmakefile.am
r142158 r142179 130 130 $(CLUTTER_CFLAGS) \ 131 131 $(COVERAGE_CFLAGS) \ 132 $(ENCHANT_CFLAGS) \ 132 133 $(FREETYPE_CFLAGS) \ 133 134 $(GEOCLUE_CFLAGS) \ … … 156 157 $(libwebkit2gtkincludedir)/WebKit2 157 158 158 # For the Gtk port we want to use XP_UNIX both in X11 and Mac159 if !TARGET_WIN32160 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \161 -DXP_UNIX162 endif163 164 # Add MOZ_X11 for X11 targets only165 if TARGET_X11166 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \167 -DMOZ_X11168 endif169 170 159 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ 171 160 -version-info @LIBWEBKIT2GTK_VERSION@ \ … … 196 185 $(CLUTTER_LIBS) \ 197 186 $(COVERAGE_LDFLAGS) \ 187 $(ENCHANT_LIBS) \ 198 188 $(FREETYPE_LIBS) \ 199 189 $(GAIL_LIBS) \ … … 220 210 $(XT_LIBS) \ 221 211 $(ZLIB_LIBS) 222 223 if ENABLE_SPELLCHECK224 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \225 -DENABLE_SPELLCHECK=1 \226 $(ENCHANT_CFLAGS)227 228 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \229 $(ENCHANT_LIBS)230 endif231 232 212 233 213 if ENABLE_WEBKIT2 -
trunk/Tools/ChangeLog
r142178 r142179 1 2013-02-07 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Cleanup command-line defines 4 https://bugs.webkit.org/show_bug.cgi?id=109213 5 6 Reviewed by Xan Lopez. 7 8 * TestWebKitAPI/config.h: Include the autotoolsconfig.h header to pick 9 up defines from autoconf. 10 1 11 2013-02-07 Ryosuke Niwa <rniwa@webkit.org> 2 12 -
trunk/Tools/TestWebKitAPI/config.h
r138305 r142179 27 27 #ifdef BUILDING_WITH_CMAKE 28 28 #include "cmakeconfig.h" 29 #else 30 #include "autotoolsconfig.h" 29 31 #endif 30 32 #endif -
trunk/configure.ac
r142172 r142179 195 195 AC_LANG_POP(C++) 196 196 197 # pthread (not needed on Windows)198 if test "$os_win32" = "no"; then199 AC_CHECK_HEADERS([pthread.h],200 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]),201 AC_MSG_ERROR([pthread support is required to build WebKit]))202 AC_CHECK_LIB(pthread, pthread_rwlock_init,203 AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]),204 AC_MSG_WARN([pthread rwlock support is not available]))205 fi206 207 197 # Check for libjpeg the way Gtk does it. 208 198 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no AC_MSG_ERROR([JPEG library (libjpeg) not found])) … … 412 402 GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION 413 403 AC_SUBST(GETTEXT_PACKAGE) 414 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext catalog name])415 404 416 405 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION) … … 441 430 PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION) 442 431 PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) 443 AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB])444 432 else 445 433 PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION) … … 460 448 AC_SUBST([XT_CFLAGS]) 461 449 AC_SUBST([XT_LIBS]) 462 AC_DEFINE([WTF_PLATFORM_X11], [1], [Define if target is X11])463 450 fi 464 451 fi … … 740 727 741 728 AC_SUBST([GST_API_VERSION]) 742 if test "$GST_API_VERSION" = "1.0"; then743 AC_DEFINE([GST_API_VERSION_1],[1], [Using GStreamer 1.0])744 fi745 729 746 730 # Check whether to enable debug features. … … 771 755 AC_MSG_ERROR([JIT must be disabled for Opcode stats to work.]) 772 756 fi 773 AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])774 757 fi 775 758 … … 803 786 G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)" 804 787 G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)" 805 AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject introspection support])806 788 fi 807 789 … … 822 804 CXXFLAGS="$CXXFLAGS -g" 823 805 CFLAGS="$CFLAGS -g" 824 fi825 826 if test "$enable_debug_features" = "no"; then827 AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])828 806 fi 829 807 … … 981 959 AC_SUBST(GTK_UNIX_PRINTING_CFLAGS) 982 960 AC_SUBST(GTK_UNIX_PRINTING_LIBS) 983 if test "$have_gtk_unix_printing" = "yes"; then984 AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])985 fi986 961 987 962 # On some Linux/Unix platforms, shm_* may only be available if linking … … 1062 1037 AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) 1063 1038 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) 1064 AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])1065 1039 AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"]) 1066 1040 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"]) … … 1094 1068 AC_CONFIG_FILES([Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in], 1095 1069 [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]) 1070 fi 1071 1072 # Configuration flags that are used throughout WebKitGTK+. 1073 AC_DEFINE([ENABLE_GLIB_SUPPORT], [1], [ ]) 1074 AC_DEFINE([WTF_USE_FREETYPE], [1], [ ]) 1075 AC_DEFINE([WTF_USE_HARFBUZZ], [1], [ ]) 1076 AC_DEFINE([WTF_USE_SOUP], [1], [ ]) 1077 AC_DEFINE([WTF_USE_WEBP], [1], [ ]) 1078 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext catalog name]) 1079 1080 if test "$enable_debug_features" = "yes"; then 1081 AC_DEFINE([GDK_PIXBUF_DISABLE_DEPRECATED], [1], [ ]) 1082 AC_DEFINE([GDK_DISABLE_DEPRECATED], [1], [ ]) 1083 AC_DEFINE([GTK_DISABLE_DEPRECATED], [1], [ ]) 1084 AC_DEFINE([PANGO_DISABLE_DEPRECATED], [1], [ ]) 1085 else 1086 AC_DEFINE([NDEBUG], [1], [Define to disable debugging features]) 1087 fi 1088 1089 if test "$os_win32" = "no"; then 1090 AC_CHECK_HEADERS([pthread.h], 1091 AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]), 1092 AC_MSG_ERROR([pthread support is required to build WebKit])) 1093 AC_CHECK_LIB(pthread, pthread_rwlock_init, 1094 AC_DEFINE([HAVE_PTHREAD_RWLOCK],[1],[Define if pthread rwlock is present]), 1095 AC_MSG_WARN([pthread rwlock support is not available])) 1096 fi 1097 1098 if test "$GTK_API_VERSION" = "2.0"; then 1099 AC_DEFINE([GTK_API_VERSION_2], [1], [ ]) 1100 fi 1101 1102 if test "$enable_webkit2" = "yes"; then 1103 AC_DEFINE([ENABLE_PLUGIN_PROCESS], [1], [ ]) 1104 if test "$have_gtk_unix_printing" = "yes"; then 1105 AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available]) 1106 fi 1107 fi 1108 1109 if test "$os_win32" = "yes"; then 1110 AC_DEFINE([XP_WIN], [1], [ ]) 1111 AC_DEFINE([UNICODE], [1], [ ]) 1112 AC_DEFINE([_UNICODE], [1], [ ]) 1113 else 1114 AC_DEFINE([XP_UNIX], [1], [ ]) 1115 fi 1116 1117 if test "$with_target" = "x11"; then 1118 AC_DEFINE([MOZ_X11], [1], [ ]) 1119 AC_DEFINE([WTF_PLATFORM_X11], [1], [Define if target is X11]) 1120 fi 1121 1122 if test "$with_unicode_backend" = "icu"; then 1123 AC_DEFINE([WTF_USE_ICU_UNICODE], [1], [ ]) 1124 else 1125 AC_DEFINE([WTF_USE_GLIB_UNICODE], [1], [ ]) 1126 fi 1127 1128 if test "$enable_fast_malloc" = "no"; then 1129 AC_DEFINE([WTF_SYSTEM_MALLOC], [1], [ ]) 1130 fi 1131 1132 if test "$enable_opcode_stats" = "yes"; then 1133 AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics]) 1134 fi 1135 1136 if test "$enable_introspection" = "yes"; then 1137 AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject introspection support]) 1138 fi 1139 1140 if test "$have_gstreamer" = "yes"; then 1141 AC_DEFINE([WTF_USE_GSTREAMER], [1], [ ]) 1142 if test "$enable_debug_features" = "yes"; then 1143 AC_DEFINE([GST_DISABLE_DEPRECATED], [1], [ ]) 1144 fi 1145 1146 if test "$enable_video" = "yes"; then 1147 AC_DEFINE([WTF_USE_NATIVE_FULLSCREEN_VIDEO], [1], [ ]) 1148 fi 1149 fi 1150 1151 if test "$GST_API_VERSION" = "1.0"; then 1152 AC_DEFINE([GST_API_VERSION_1], [1], [Using GStreamer 1.0]) 1153 fi 1154 1155 if test "$enable_web_audio" = "yes"; then 1156 AC_DEFINE([WTF_USE_WEBAUDIO_GSTREAMER], [1], [1]) 1157 fi 1158 1159 if test "$enable_accelerated_compositing" = "yes"; then 1160 AC_DEFINE([WTF_USE_ACCELERATED_COMPOSITING], [1], [ ]) 1161 AC_DEFINE([ENABLE_3D_RENDERING], [1], [ ]) 1162 1163 if test "$with_acceleration_backend" = "none"; then 1164 AC_DEFINE([DWTF_USE_TEXTURE_MAPPER], [1], [ ]) 1165 AC_DEFINE([DWTF_USE_TEXTURE_MAPPER_CAIRO], [1], [ ]) 1166 fi 1167 1168 if test "$with_acceleration_backend" = "opengl"; then 1169 AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ]) 1170 AC_DEFINE([WTF_USE_TEXTURE_MAPPER_GL], [1], [ ]) 1171 fi 1172 1173 if test "$with_acceleration_backend" = "clutter"; then 1174 AC_DEFINE([WTF_USE_CLUTTER], [1], [ ]) 1175 fi 1176 fi 1177 1178 if test "$with_acceleration_backend" = "opengl"; then 1179 AC_DEFINE([WTF_USE_OPENGL], [1], [ ]) 1180 fi 1181 1182 if test "$enable_glx" = "yes"; then 1183 AC_DEFINE([WTF_USE_GLX], [1], [ ]) 1184 fi 1185 1186 if test "$enable_egl" = "yes"; then 1187 AC_DEFINE([WTF_USE_EGL], [1], [ ]) 1188 fi 1189 1190 if test "$enable_gles2" = "yes"; then 1191 AC_DEFINE([WTF_USE_OPENGL_ES_2], [1], [ ]) 1192 fi 1193 1194 if test "$enable_spellcheck" = "yes"; then 1195 AC_DEFINE([ENABLE_SPELLCHECK], [1], [ ]) 1096 1196 fi 1097 1197
Note: See TracChangeset
for help on using the changeset viewer.