Remove *OJI* from c-c "configure", m-* one(s) is enough.
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 13 Nov 2009 07:53:17 +0100
changeset 4382 51801a22f1184c0aa5c4866b40180ea937182e79
parent 4381 a7d1bfb5f6034d27c01b08c28c1b9bfba75331ab
child 4383 6134122abbcd97563c04b1414ead7c66257e1e73
push id3425
push usersgautherie.bz@free.fr
push dateFri, 13 Nov 2009 07:25:16 +0000
treeherdercomm-central@2f4046f9f31b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs521624, 517355
Remove *OJI* from c-c "configure", m-* one(s) is enough. Bug 521624 - Port |Bug 517355 - Restore OJI, Liveconnect and the JEP on the 1.9.2 branch on OS X| to comm-central (apps); (Av1a). r=standard8.
calendar/confvars.sh
config/autoconf.mk.in
configure.in
mail/confvars.sh
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -44,17 +44,16 @@ MOZ_CALENDAR=1
 MOZ_APP_VERSION=$SUNBIRD_VERSION
 MOZ_PLAINTEXT_EDITOR_ONLY=1
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_INSTALLER=
 MOZ_MATHML=
 NECKO_DISK_CACHE=
-# MOZ_OJI is only required to be cleared for MOZILLA_1_9_1_BRANCH.
-# mozilla-central does not have this.
+# MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
 MOZ_OJI=
 NECKO_COOKIES=
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=
 MOZ_UNIVERSALCHARDET=
 MOZ_APP_VERSION=`cat $topsrcdir/$MOZ_BUILD_APP/sunbird/config/version.txt`
 SUNBIRD_VERSION=$MOZ_APP_VERSION
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -178,19 +178,16 @@ MOZ_TIMELINE=@MOZ_TIMELINE@
 
 ENABLE_STRIP	= @ENABLE_STRIP@
 PKG_SKIP_STRIP	= @PKG_SKIP_STRIP@
 
 ClientWallet=1
 CookieManagement=1
 SingleSignon=1
 
-ifdef MOZILLA_1_9_1_BRANCH
-MOZ_OJI		= @MOZ_OJI@
-endif
 MOZ_PLUGINS	= @MOZ_PLUGINS@
 
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 
 MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
 
 MOZ_XUL                    = @MOZ_XUL@
--- a/configure.in
+++ b/configure.in
@@ -2736,29 +2736,16 @@ case "$target" in
 *-msvc*|*-mks*|*-mingw*|*-cygwin*|*-wince)
     if test -z "$GNU_CC"; then
         NO_LD_ARCHIVE_FLAGS=
     fi
     ;;
 esac
 AC_SUBST(NO_LD_ARCHIVE_FLAGS)
 
-if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-dnl
-dnl Indicate that platform requires special thread safe 
-dnl locking when starting up the OJI JVM 
-dnl (see mozilla/modules/oji/src/nsJVMManager.cpp)
-dnl ========================================================
-case "$target" in
-    *-hpux*)      
-        AC_DEFINE(MOZ_OJI_REQUIRE_THREAD_SAFE_ON_STARTUP)
-        ;;
-esac
-fi
-
 dnl ========================================================
 dnl = Flags to strip unused symbols from .so components
 dnl ========================================================
 case "$target" in
     *-linux*|*-kfreebsd*-gnu)
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         ;;
     *-solaris*)
@@ -4440,19 +4427,16 @@ MOZ_MORKREADER=
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_INSPECTOR_APIS=
 MOZ_NO_XPCOM_OBSOLETE=
 MOZ_NO_FAST_LOAD=
 MOZ_OGG=1
 MOZ_SYDNEYAUDIO=
 MOZ_WAVE=1
-if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-MOZ_OJI=1
-fi
 MOZ_PERMISSIONS=1
 MOZ_PLACES=
 MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_PROFILELOCKING=1
 MOZ_PSM=1
 MOZ_RDF=1
@@ -4525,19 +4509,16 @@ basic)
   MOZ_JSDEBUGGER=
   MOZ_LDAP_XPCOM=
   MOZ_MAIL_NEWS=
   MOZ_AUTH_EXTENSION=
   MOZ_NO_ACTIVEX_SUPPORT=1
   MOZ_NO_INSPECTOR_APIS=1
   MOZ_NO_XPCOM_OBSOLETE=1
   MOZ_NO_FAST_LOAD=1
-  if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-  MOZ_OJI=
-  fi
   MOZ_PLAINTEXT_EDITOR_ONLY=1
 #  MOZ_PLUGINS=
   MOZ_PREF_EXTENSIONS=
   MOZ_PROFILELOCKING=
   MOZ_SPELLCHECK=
   MOZ_UNIVERSALCHARDET=
   MOZ_UPDATER=
   MOZ_USE_NATIVE_UCONV=
@@ -4560,19 +4541,16 @@ minimal)
   MOZ_JSDEBUGGER=
   MOZ_LDAP_XPCOM=
   MOZ_MAIL_NEWS=
   MOZ_AUTH_EXTENSION=
   MOZ_NO_ACTIVEX_SUPPORT=1
   MOZ_NO_INSPECTOR_APIS=1
   MOZ_NO_XPCOM_OBSOLETE=1
   MOZ_NO_FAST_LOAD=1
-  if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-  MOZ_OJI=
-  fi
   MOZ_PLAINTEXT_EDITOR_ONLY=1
   MOZ_PLUGINS=
   MOZ_PREF_EXTENSIONS=
   MOZ_PROFILELOCKING=
   MOZ_SPELLCHECK=
   MOZ_STORAGE=1
   MOZ_PLACES=
   MOZ_UNIVERSALCHARDET=
@@ -5159,29 +5137,16 @@ MOZ_ARG_DISABLE_BOOL(jsd,
 dnl ========================================================
 dnl = Disable plugin support
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(plugins,
 [  --disable-plugins       Disable plugins support],
     MOZ_PLUGINS=,
     MOZ_PLUGINS=1)
 
-if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-dnl ========================================================
-dnl = Open JVM Interface (OJI) support
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(oji,
-[  --disable-oji           Disable Open JVM Integration support],
-    MOZ_OJI=,
-    MOZ_OJI=1)
-if test -n "$MOZ_OJI"; then
-    AC_DEFINE(OJI)
-fi
-fi
-
 dnl bi-directional support always on
 IBMBIDI=1
 AC_DEFINE(IBMBIDI)
 
 dnl ========================================================
 dnl view source support on by default
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(view-source,
@@ -7089,21 +7054,16 @@ AC_SUBST(MOZ_DEBUG_MODULES)
 AC_SUBST(MOZ_PROFILE_MODULES)
 AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(MOZ_DBGRINFO_MODULES)
 AC_SUBST(MOZ_JSDEBUGGER)
-if test "$MOZILLA_1_9_1_BRANCH" = "1"; then
-AC_SUBST(MOZ_OJI)
-# Dumb statemet, not to have an empty block.
-true
-fi
 AC_SUBST(MOZ_NO_XPCOM_OBSOLETE)
 AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(ENABLE_EAZEL_PROFILER)
 AC_SUBST(EAZEL_PROFILER_CFLAGS)
 AC_SUBST(EAZEL_PROFILER_LIBS)
 AC_SUBST(MOZ_PERF_METRICS)
 AC_SUBST(GC_LEAK_DETECTOR)
 AC_SUBST(MOZ_LOG_REFCNT)
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -36,18 +36,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=thunderbird
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
-# MOZ_OJI is only required to be cleared for MOZILLA_1_9_1_BRANCH.
-# mozilla-central does not have this.
+# MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
 MOZ_OJI=
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_IMG_DECODERS_DEFAULT=`echo "$MOZ_IMG_DECODERS_DEFAULT" | sed "s/ xbm//"`
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1
 fi
 MOZ_STATIC_MAIL_BUILD=1