[GTK] Remove V8 compilation option.
authornayankk@motorola.com <nayankk@motorola.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jan 2012 10:01:23 +0000 (10:01 +0000)
committernayankk@motorola.com <nayankk@motorola.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Jan 2012 10:01:23 +0000 (10:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=77405

Reviewed by Philippe Normand.

Revert the changes introduced as part of bug 69469
to provide an option to compile V8 as JavaScript engine.

* GNUmakefile.am: Remove defining USE_JSC macro.
* configure.ac: Remove --with-jsengine option.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
configure.ac

index 8b8a34e..6919734 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-31  Nayan Kumar K  <nayankk@motorola.com>
+
+        [GTK] Remove V8 compilation option.
+        https://bugs.webkit.org/show_bug.cgi?id=77405
+
+        Reviewed by Philippe Normand.
+
+        Revert the changes introduced as part of bug 69469
+        to provide an option to compile V8 as JavaScript engine.
+
+        * GNUmakefile.am: Remove defining USE_JSC macro.
+        * configure.ac: Remove --with-jsengine option.
+
 2012-01-25  Philippe Normand  <pnormand@igalia.com>
 
         [GStreamer] 0.11 build support
index c97ef32..33ef462 100644 (file)
@@ -224,11 +224,7 @@ EXTRA_DIST += \
 
 # Include module makefiles
 include Source/WTF/GNUmakefile.am
-
-if USE_JSC
 include Source/JavaScriptCore/GNUmakefile.am
-endif
-
 include Source/WebCore/GNUmakefile.am
 include Source/WebKit/gtk/GNUmakefile.am
 include Source/WebCore/bindings/gobject/GNUmakefile.am
@@ -247,17 +243,13 @@ endif
 
 # Autogenerated sources
 BUILT_SOURCES += \
+       $(javascriptcore_built_sources) \
+       $(javascriptcore_built_nosources) \
        $(webcore_built_sources) \
        $(webcore_built_nosources) \
        $(webkitgtk_built_sources) \
        $(webkitgtk_built_nosources)
 
-if USE_JSC
-BUILT_SOURCES += \
-       $(javascriptcore_built_sources) \
-       $(javascriptcore_built_nosources)
-endif
-
 DISTCLEANFILES += \
        $(CLEANFILES) \
        $(builddir)/doltcompile \
index 874daba..b067b5e 100644 (file)
@@ -843,19 +843,6 @@ AC_ARG_ENABLE(debug_features,
               [],[if test "$enable_debug" = "yes"; then enable_debug_features="yes"; else enable_debug_features="no"; fi])
 AC_MSG_RESULT([$enable_debug_features])
 
-# Determine JavaScript engine to use.
-AC_MSG_CHECKING([Javascript engine])
-AC_ARG_WITH(jsengine,
-            AC_HELP_STRING([--with-jsengine=@<:@jsc@:>@],
-                           [Select Javascript engine [default=jsc]]),
-            [],[with_jsengine="jsc"])
-
-case "$with_jsengine" in
-     jsc) ;;
-     *) AC_MSG_ERROR([Invalid JS engine: Must be jsc]) ;;
-esac
-AC_MSG_RESULT([$with_jsengine])
-
 AC_MSG_CHECKING([whether to enable JIT compilation])
 AC_ARG_ENABLE(jit,
               AS_HELP_STRING([--enable-jit],
@@ -1177,9 +1164,6 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"])
 AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"])
 AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"])
 
-# JS engine conditionals
-AM_CONDITIONAL([USE_JSC], [test "$with_jsengine" = "jsc"])
-
 # Unicode backend conditionals
 AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"])
 AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
@@ -1306,7 +1290,6 @@ Build configuration:
  Unicode backend                                          : $with_unicode_backend
  Font backend                                             : $with_font_backend
  Optimized memory allocator                               : $enable_fast_malloc
- JavaScript Engine                                        : $with_jsengine
  Accelerated Compositing                                  : $with_accelerated_compositing
 
 Features: