Bug 543380 - Port |Bug 462004 - JavaScript shell should provide line editing facilities| to comm-central; (Av1) Just remove it.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 01 Feb 2010 04:14:03 +0100
changeset 4792 054b81c80ea5a0361cc38b55bc006fba98d3c05b
parent 4791 4769df74717012b3a6b3c60ed83db6a1bdf6473b
child 4793 db0e3f363e112fdbb25c86bec7774281b8e4c370
push idunknown
push userunknown
push dateunknown
bugs543380, 462004
Bug 543380 - Port |Bug 462004 - JavaScript shell should provide line editing facilities| to comm-central; (Av1) Just remove it. r=Callek.
config/autoconf.mk.in
configure.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -127,17 +127,16 @@ MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
 MOZ_XPINSTALL = @MOZ_XPINSTALL@
 MOZ_JSLOADER  = @MOZ_JSLOADER@
 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
 JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
-JS_STATIC_BUILD = @JS_STATIC_BUILD@
 MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
 MOZ_DISABLE_PARENTAL_CONTROLS = @MOZ_DISABLE_PARENTAL_CONTROLS@
 XPC_IDISPATCH_SUPPORT = @XPC_IDISPATCH_SUPPORT@
--- a/configure.in
+++ b/configure.in
@@ -4434,17 +4434,16 @@ MOZ_URL_CLASSIFIER=
 MOZ_USE_NATIVE_UCONV=
 MOZ_VIEW_SOURCE=1
 MOZ_XPFE_COMPONENTS=1
 MOZ_XPINSTALL=1
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
-JS_STATIC_BUILD=
 XPC_IDISPATCH_SUPPORT=
 
 
 case "$target_os" in
 darwin*)
     ACCESSIBILITY=
     ;;
 *)
@@ -4503,17 +4502,16 @@ basic)
   MOZ_UPDATER=
   MOZ_USE_NATIVE_UCONV=
   MOZ_VIEW_SOURCE=
   MOZ_XPFE_COMPONENTS=
   MOZ_XPINSTALL=
   MOZ_XTF=
   MOZ_ZIPWRITER=
   NS_DISABLE_LOGGING=1
-  JS_STATIC_BUILD=1
   ;;
 
 minimal)
   ENABLE_TESTS=
   MOZ_ACTIVEX_SCRIPTING_SUPPORT=
   MOZ_COMPOSER=
   MOZ_ENABLE_CANVAS=
   MOZ_INSTALLER=
@@ -4538,17 +4536,16 @@ minimal)
   MOZ_VIEW_SOURCE=
   MOZ_XPFE_COMPONENTS=
   MOZ_XPINSTALL=
   MOZ_XTF=
   MOZ_XUL=
   MOZ_ZIPWRITER=
   MOZ_RDF=
   NS_DISABLE_LOGGING=1
-  JS_STATIC_BUILD=1
   ;;
 
 *)
   AC_MSG_ERROR([Unrecognized value: --with-embedding-profile=$MOZ_EMBEDDING_PROFILE])
   ;;
 esac
 
 MOZ_ARG_WITH_STRING(xulrunner-stub-name,
@@ -6710,35 +6707,16 @@ if test -n "$MOZ_ENABLE_LIBXUL"; then
     AC_DEFINE(MOZ_ENABLE_LIBXUL)
 else
     if test -n "$BUILD_STATIC_LIBS"; then
         AC_DEFINE(MOZ_STATIC_BUILD)
     fi
     XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS"
 fi
 
-dnl ========================================================
-dnl = Force JS to be a static lib
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(js-static-build,
-[  --enable-js-static-build  Force js to be a static lib],
-    JS_STATIC_BUILD=1,
-    JS_STATIC_BUILD= )
-
-AC_SUBST(JS_STATIC_BUILD)
-        
-if test -n "$JS_STATIC_BUILD"; then
-    AC_DEFINE(EXPORT_JS_API)
-
-if test -z "$BUILD_STATIC_LIBS"; then
-    AC_MSG_ERROR([--enable-js-static-build is only compatible with --enable-static])
-fi
-
-fi
-
 dnl Disable static mail in debug builds, but not with libxul sdk.
 if test -n "$MOZ_DEBUG" -a -z "$LIBXUL_SDK"; then
    MOZ_STATIC_MAIL_BUILD=
 fi
 MOZ_ARG_ENABLE_BOOL(static-mail,
 [  --enable-static-mail Enable static mail build support],
     MOZ_STATIC_MAIL_BUILD=1,
     MOZ_STATIC_MAIL_BUILD= )