[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1e4149f6e545a7d385825143f794981d23b73d1a
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 10:55:30 2010 +0000

    2010-09-21  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Configure flag for Opcode stats
            https://bugs.webkit.org/show_bug.cgi?id=46081
    
            Opcode stats won't work with JIT enabled, so bail out if both are
            enabled at the same time.
    
            * configure.ac:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 0aab315..8091d9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Martin Robinson.
 
+        [GTK] Configure flag for Opcode stats
+        https://bugs.webkit.org/show_bug.cgi?id=46081
+
+        Opcode stats won't work with JIT enabled, so bail out if both are
+        enabled at the same time.
+
+        * configure.ac:
+
+2010-09-21  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
         [GTK] Fix --disable-jit
         https://bugs.webkit.org/show_bug.cgi?id=46080
 
diff --git a/configure.ac b/configure.ac
index 623353f..f310a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -710,6 +710,20 @@ else
 fi
 AC_MSG_RESULT([$enable_jit])
 
+# Opcode stats
+AC_MSG_CHECKING([whether to enable opcode stats])
+AC_ARG_ENABLE([opcode-stats],
+  [AS_HELP_STRING([--enable-opcode-stats], [Enable Opcode statistics (default: disabled)])],
+  [], [enable_opcode_stats=no])
+AC_MSG_RESULT([$enable_opcode_stats])
+
+if test "$enable_opcode_stats" = "yes"; then
+  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
 AC_MSG_CHECKING([whether to enable GObject introspection support])
 AC_ARG_ENABLE([introspection],
@@ -926,6 +940,7 @@ AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
 AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
+AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
 
 # Gtk conditionals
 AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
@@ -980,6 +995,7 @@ Features:
  HTML5 video element support                              : $enable_video
  Icon database support                                    : $enable_icon_database
  Image resizer support                                    : $enable_image_resizer
+ Opcode stats                                             : $enable_opcode_stats
  SharedWorkers support                                    : $enable_shared_workers
  Speech input support                                     : $enable_input_speech
  SVG support                                              : $enable_svg

-- 
WebKit Debian packaging