Bug 496236 - Resync' configure.in between c-c and m-1.9.1; (Mv1)
Bug 445391 + (m-c)
Bug 485984;
r=kairo.
Bug 445391 - Re-enable OJI for Firefox 3.1
Bug 485984 - remove OJI from the tree
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -44,15 +44,17 @@ 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=
+if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
MOZ_OJI=
+fi
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
@@ -182,17 +182,19 @@ 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
@@ -2756,26 +2756,28 @@ 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'
;;
@@ -4507,17 +4509,19 @@ 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
-MOZ_OJI=
+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
@@ -4602,17 +4606,19 @@ 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=
@@ -4640,17 +4646,19 @@ 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=
@@ -5299,26 +5307,28 @@ 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_ENABLE_BOOL(oji,
-[ --enable-oji Enable Open JVM Integration support],
- MOZ_OJI=1,
- MOZ_OJI=)
+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 ========================================================
@@ -6283,23 +6293,23 @@ if test "$MOZ_MEMORY"; then
[ --with-valgrind Enable valgrind integration hooks],
[enable_valgrind="yes"], [enable_valgrind="no"])
AC_CHECK_HEADER([valgrind/valgrind.h], [], [enable_valgrind="no"])
if test "x$enable_valgrind" = "xyes" ; then
AC_DEFINE(MOZ_VALGRIND)
fi
fi
AC_SUBST(MOZ_MEMORY)
-dnl only applies to !MOZILLA_1_9_1_BRANCH
+if test "$MOZILLA_1_9_1_BRANCH" != "1"; then
AC_SUBST(MOZ_MEMORY_LDFLAGS)
-dnl these apply to MOZILLA_1_9_1_BRANCH
+else
AC_SUBST(WIN32_CUSTOM_CRT_DIR)
AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_PATH)
-dnl end apply to MOZILLA_1_9_1_BRANCH
+fi
AC_SUBST(WIN32_CRT_SRC_DIR)
dnl Need to set this for make because NSS doesn't have configure
AC_SUBST(DLLFLAGS)
dnl ========================================================
dnl = Use malloc wrapper lib
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(wrap-malloc,
@@ -7429,17 +7439,19 @@ 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)
+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)
@@ -7967,9 +7979,8 @@ if test "$MOZ_LDAP_XPCOM"; then
fi
if test -n "$HAVE_64BIT_OS"; then
ac_configure_args="$ac_configure_args --enable-64bit"
fi
AC_OUTPUT_SUBDIRS(directory/c-sdk)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi
fi # COMPILE_ENVIRONMENT
-
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -36,17 +36,19 @@
#
# ***** END LICENSE BLOCK *****
MOZ_APP_NAME=thunderbird
MOZ_UPDATER=1
MOZ_THUNDERBIRD=1
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
+if test "$MOZILLA_BRANCH_VERSION" = "1.9.1"; then
MOZ_OJI=
+fi
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
MOZ_COMPOSER=1