--- a/Makefile.in
+++ b/Makefile.in
@@ -102,20 +102,18 @@ ifeq ($(OS_ARCH),WINNT)
MAKE_SYM_STORE_PATH=..
endif
buildsymbols ::
$(MAKE) -C mozilla MAKE_SYM_STORE_PATH=$(MAKE_SYM_STORE_PATH) SYM_STORE_SOURCE_DIRS="$(topsrcdir)/mozilla/extensions/inspector $(topsrcdir)/mozilla $(topsrcdir)" $@
include $(topsrcdir)/config/rules.mk
-ifndef MOZILLA_1_9_2_BRANCH
# defined in (mozilla/.../)package-name.mk
export MOZ_SOURCE_STAMP
-endif
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
dependencies.beos config/autoconf.mk \
unallmakefiles comm-config.h \
$(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
distclean::
cat unallmakefiles | $(XARGS) rm -f
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7,19 +7,17 @@ builtin(include, mozilla/build/autoconf/
builtin(include, mozilla/build/autoconf/libIDL.m4)dnl
builtin(include, mozilla/build/autoconf/nspr.m4)dnl
builtin(include, mozilla/build/autoconf/nss.m4)dnl
builtin(include, mozilla/build/autoconf/pkg.m4)dnl
builtin(include, mozilla/build/autoconf/freetype2.m4)dnl
builtin(include, mozilla/build/autoconf/codeset.m4)dnl
builtin(include, mozilla/build/autoconf/altoptions.m4)dnl
builtin(include, mozilla/build/autoconf/mozprog.m4)dnl
-
-dnl use mozilla/build below when we drop support for MOZILLA_1_9_2_BRANCH
-builtin(include, build/autoconf/acwinpaths.m4)dnl
+builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
MOZ_PROG_CHECKMSYS()
# Read the user's .mozconfig script. We can't do this in
# configure.in: autoconf puts the argument parsing code above anything
# expanded from configure.in, and we need to get the configure options
# from .mozconfig in place before that argument parsing code.
MOZ_READ_MOZCONFIG(mozilla)
deleted file mode 100644
--- a/build/autoconf/acwinpaths.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl ***** BEGIN LICENSE BLOCK *****
-dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
-dnl
-dnl The contents of this file are subject to the Mozilla Public License Version
-dnl 1.1 (the "License"); you may not use this file except in compliance with
-dnl the License. You may obtain a copy of the License at
-dnl http://www.mozilla.org/MPL/
-dnl
-dnl Software distributed under the License is distributed on an "AS IS" basis,
-dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-dnl for the specific language governing rights and limitations under the
-dnl License.
-dnl
-dnl The Original Code is mozilla.org code.
-dnl
-dnl The Initial Developer of the Original Code is the
-dnl Mozilla Foundation <http://www.mozilla.org>
-dnl
-dnl Portions created by the Initial Developer are Copyright (C) 2009
-dnl the Initial Developer. All Rights Reserved.
-dnl
-dnl Contributor(s):
-dnl Benjamin Smedberg
-dnl
-dnl Alternatively, the contents of this file may be used under the terms of
-dnl either of the GNU General Public License Version 2 or later (the "GPL"),
-dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-dnl in which case the provisions of the GPL or the LGPL are applicable instead
-dnl of those above. If you wish to allow use of your version of this file only
-dnl under the terms of either the GPL or the LGPL, and not to allow others to
-dnl use your version of this file under the terms of the MPL, indicate your
-dnl decision by deleting the provisions above and replace them with the notice
-dnl and other provisions required by the GPL or the LGPL. If you do not delete
-dnl the provisions above, a recipient may use your version of this file under
-dnl the terms of any one of the MPL, the GPL or the LGPL.
-dnl
-dnl ***** END LICENSE BLOCK *****
-
-dnl this file exists in c-c only for MOZILLA_1_9_2_BRANCH
-dnl and is a mirror of the same file in mozilla-central (1.9.3)
-
-define(GENERATE_SUB_ABS, [
-define([AC_OUTPUT_FILES_SUB1], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
-
-define(GENERATE_SUB_NOSPLIT, [
-define([AC_OUTPUT_FILES], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
-
-define(GENERATE_HEADER_NOSPLIT, [
-define([AC_OUTPUT_HEADER], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
-
-define(GENERATE_SUBDIRS_ABS, [
-define([AC_OUTPUT_SUBDIRS], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))
deleted file mode 100644
--- a/build/msys-perl-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# this file exists in c-c only for MOZILLA_1_9_2_BRANCH
-# and is a mirror of the same file in mozilla-central (1.9.3)
-
-args=""
-
-for i in "${@}"
-do
- case "$i" in
- -I?:/*)
- i="$(echo "${i}" | sed -e 's|^-I\(.\):/|-I/\1/|')"
- ;;
- esac
-
- args="${args} '${i}'"
-done
-
-eval "exec perl $args"
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -39,17 +39,16 @@
# A netscape style .mk file for autoconf builds
INCLUDED_AUTOCONF_MK = 1
USE_AUTOCONF = 1
MOZILLA_CLIENT = 1
COMM_BUILD = @COMM_BUILD@
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZILLA_VERSION = @MOZILLA_VERSION@
-MOZILLA_1_9_2_BRANCH = @MOZILLA_1_9_2_BRANCH@
THUNDERBIRD_VERSION = @THUNDERBIRD_VERSION@
SUNBIRD_VERSION = @SUNBIRD_VERSION@
SEAMONKEY_VERSION = @SEAMONKEY_VERSION@
MOZ_BUILD_APP = @MOZ_BUILD_APP@
MOZ_APP_NAME = @MOZ_APP_NAME@
MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
@@ -94,19 +93,17 @@ MOZ_DEBUG = @MOZ_DEBUG@
MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@
MOZ_PROFILE_MODULES = @MOZ_PROFILE_MODULES@
MOZ_DEBUG_ENABLE_DEFS = @MOZ_DEBUG_ENABLE_DEFS@
MOZ_DEBUG_DISABLE_DEFS = @MOZ_DEBUG_DISABLE_DEFS@
MOZ_DEBUG_FLAGS = @MOZ_DEBUG_FLAGS@
MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@
MOZ_DBGRINFO_MODULES = @MOZ_DBGRINFO_MODULES@
MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
-ifndef MOZILLA_1_9_2_BRANCH
MOZ_IPC = @MOZ_IPC@
-endif
MOZ_MEMORY = @MOZ_MEMORY@
MOZ_JPROF = @MOZ_JPROF@
MOZ_SHARK = @MOZ_SHARK@
DEHYDRA_PATH = @DEHYDRA_PATH@
ENABLE_EAZEL_PROFILER=@ENABLE_EAZEL_PROFILER@
EAZEL_PROFILER_CFLAGS=@EAZEL_PROFILER_CFLAGS@
EAZEL_PROFILER_LIBS=@EAZEL_PROFILER_LIBS@
@@ -310,19 +307,17 @@ CXX = @CXX@
GNU_AS = @GNU_AS@
GNU_LD = @GNU_LD@
GNU_CC = @GNU_CC@
GNU_CXX = @GNU_CXX@
HAVE_GCC3_ABI = @HAVE_GCC3_ABI@
INTEL_CC = @INTEL_CC@
INTEL_CXX = @INTEL_CXX@
-ifndef MOZILLA_1_9_2_BRANCH
STL_FLAGS = @STL_FLAGS@
-endif
MOZ_MSVC_STL_WRAP__Throw= @MOZ_MSVC_STL_WRAP__Throw@
MOZ_MSVC_STL_WRAP__RAISE= @MOZ_MSVC_STL_WRAP__RAISE@
HOST_CC = @HOST_CC@
HOST_CXX = @HOST_CXX@
HOST_CFLAGS = @HOST_CFLAGS@
HOST_CXXFLAGS = @HOST_CXXFLAGS@
HOST_OPTIMIZE_FLAGS = @HOST_OPTIMIZE_FLAGS@
@@ -479,20 +474,16 @@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@
COMPILER_DEPEND = @COMPILER_DEPEND@
MDDEPDIR := @MDDEPDIR@
MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@
# XXX - these need to be cleaned up and have real checks added -cls
CM_BLDTYPE=dbg
AWT_11=1
-ifdef MOZILLA_1_9_2_BRANCH
-# Windows m-1.9.2 /toolkit/mozapps/installer/package-name.mk needs this variable.
-MOZ_BITS=32
-endif
OS_TARGET=@OS_TARGET@
OS_ARCH=@OS_ARCH@
OS_RELEASE=@OS_RELEASE@
OS_TEST=@OS_TEST@
# For Solaris build
SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@
SOLARIS_SUNPRO_CXX = @SOLARIS_SUNPRO_CXX@
--- a/config/config.mk
+++ b/config/config.mk
@@ -149,21 +149,17 @@ FINAL_LINK_LIBS = $(MOZDEPTH)/config/fin
FINAL_LINK_COMPS = $(MOZDEPTH)/config/final-link-comps
FINAL_LINK_COMP_NAMES = $(MOZDEPTH)/config/final-link-comp-names
MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
ifdef MOZ_MEMORY
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
-ifdef MOZILLA_1_9_2_BRANCH
-JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,jemalloc,$(DIST)/lib) $(MKSHLIB_UNFORCE_ALL)
-else
JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(call EXPAND_MOZLIBNAME,jemalloc) $(MKSHLIB_UNFORCE_ALL)
-endif # ! MOZILLA_1_9_2_BRANCH
endif
endif
# determine debug-related options
_DEBUG_CFLAGS :=
_DEBUG_LDFLAGS :=
ifndef MOZ_DEBUG
@@ -232,19 +228,17 @@ else
ifeq ($(first_match), ^ALL_MODULES)
# the user didn't mention this module explicitly,
# but wanted all modules to be compiled without -g (nothing to do)
endif
endif
endif
endif
-ifndef MOZILLA_1_9_2_BRANCH
MOZALLOC_LIB = $(call EXPAND_MOZLIBNAME,mozalloc)
-endif
# append debug flags
# (these might have been above when processing MOZ_DBGRINFO_MODULES)
OS_CFLAGS += $(_DEBUG_CFLAGS)
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
# XXX: What does this? Bug 482434 filed for better explanation.
@@ -266,21 +260,16 @@ endif
# MOZ_DEBUG_SYMBOLS generates debug symbols in separate PDB files.
# Used for generating an optimized build with debugging symbols.
# Used in the Windows nightlies to generate symbols for crash reporting.
ifdef MOZ_DEBUG_SYMBOLS
OS_CXXFLAGS += -Zi -UDEBUG -DNDEBUG
OS_CFLAGS += -Zi -UDEBUG -DNDEBUG
OS_LDFLAGS += -DEBUG -OPT:REF
-ifdef MOZILLA_1_9_2_BRANCH
-# This breaks builds on VC10, but mozilla-1.9.2 doesn't build with VC10 anyway,
-# so this isn't a big loss.
-OS_LDFLAGS += -OPT:NOWIN98
-endif # MOZILLA_1_9_2_BRANCH
endif # MOZ_DEBUG_SYMBOLS
ifdef MOZ_QUANTIFY
# -FIXED:NO is needed for Quantify to work, but it increases the size
# of executables, so only use it if building for Quantify.
WIN32_EXE_LDFLAGS += -FIXED:NO
# We need -OPT:NOICF to prevent identical methods from being merged together.
@@ -592,21 +581,17 @@ ifeq ($(OS_ARCH),Darwin)
# Darwin doesn't cross-compile, so just set both types of flags here.
HOST_CMFLAGS += -fobjc-exceptions
HOST_CMMFLAGS += -fobjc-exceptions
OS_COMPILE_CMFLAGS += -fobjc-exceptions
OS_COMPILE_CMMFLAGS += -fobjc-exceptions
endif
COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS)
-ifdef MOZILLA_1_9_2_BRANCH
-COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
-else
COMPILE_CXXFLAGS = $(STL_FLAGS) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
-endif
COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS)
COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS)
ifndef CROSS_COMPILE
HOST_CFLAGS += $(RTL_FLAGS)
endif
#
@@ -651,21 +636,19 @@ DEFINES += -DXPCONNECT_STANDALONE
endif
ifeq ($(OS_ARCH),OS2)
ELF_DYNSTR_GC = echo
else
ELF_DYNSTR_GC = :
endif
-ifndef MOZILLA_1_9_2_BRANCH
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
OS_LIBS += $(MOZ_QT_LIBS)
endif
-endif # ! MOZILLA_1_9_2_BRANCH
ifndef CROSS_COMPILE
ifdef USE_ELF_DYNSTR_GC
ifdef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS
ELF_DYNSTR_GC = $(MOZDEPTH)/config/elf-dynstr-gc
endif
endif
endif
@@ -850,19 +833,17 @@ MAKE_JARS_FLAGS += -c $(LOCALE_MERGEDIR)
endif
MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
ifdef LOCALE_MERGEDIR
MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
endif
endif
ifdef WINCE
-ifndef MOZILLA_1_9_2_BRANCH
RUN_TEST_PROGRAM = $(PYTHON) $(MOZILLA_SRCDIR)/build/mobile/devicemanager-run-test.py
-endif # ! MOZILLA_1_9_2_BRANCH
else
ifeq (OS2,$(OS_ARCH))
RUN_TEST_PROGRAM = $(MOZILLA_SRCDIR)/build/os2/test_os2.cmd "$(DIST)"
else
ifneq (WINNT,$(OS_ARCH))
RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
endif # ! WINNT
endif # ! OS2
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -150,25 +150,19 @@ define _INSTALL_TESTS
$(TEST_INSTALLER) $(wildcard $(srcdir)/$(dir)/*) $(testxpcobjdir)/$(MODULE)/$(dir)
endef # do not remove the blank line!
SOLO_FILE ?= $(error Specify a test filename in SOLO_FILE when using check-interactive or check-one)
libs::
$(foreach dir,$(XPCSHELL_TESTS),$(_INSTALL_TESTS))
-ifdef MOZILLA_1_9_2_BRANCH
- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl \
- $(testxpcobjdir)/all-test-dirs.list \
- $(addprefix $(MODULE)/,$(XPCSHELL_TESTS))
-else
$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py \
$(testxpcobjdir)/all-test-dirs.list \
$(addprefix $(MODULE)/,$(XPCSHELL_TESTS))
-endif
testxpcsrcdir = $(MOZILLA_SRCDIR)/testing/xpcshell
# Execute all tests in the $(XPCSHELL_TESTS) directories.
# See also $(MOZILLA_DIR)/testing/testsuite-targets.mk 'xpcshell-tests' target for global execution.
xpcshell-tests:
$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
-I$(MOZILLA_DIR)/build \
@@ -349,24 +343,22 @@ endif
endif # !GNU_CC
ifdef ENABLE_CXX_EXCEPTIONS
CXXFLAGS += $(MOZ_EXCEPTIONS_FLAGS_ON) -DMOZ_CPP_EXCEPTIONS=1
endif # ENABLE_CXX_EXCEPTIONS
endif # WINNT
-ifndef MOZILLA_1_9_2_BRANCH
ifeq ($(SOLARIS_SUNPRO_CXX),1)
CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
ifeq (86,$(findstring 86,$(OS_TEST)))
OS_LDFLAGS += -M $(MOZILLA_DIR)/config/solaris_ia32.map
endif # x86
endif # Solaris Sun Studio C++
-endif # ! MOZILLA_1_9_2_BRANCH
ifeq (,$(filter-out WINNT WINCE,$(HOST_OS_ARCH)))
HOST_PDBFILE=$(basename $(@F)).pdb
endif
ifndef TARGETS
TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS)
endif
@@ -811,62 +803,48 @@ endif
#
# Rule to create list of libraries for final link
#
export::
ifdef LIBRARY_NAME
ifdef EXPORT_LIBRARY
ifdef IS_COMPONENT
ifdef BUILD_STATIC_LIBS
-ifdef MOZILLA_1_9_2_BRANCH
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) $(STATIC_LIBRARY_NAME)
-else
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMPS) $(STATIC_LIBRARY_NAME)
-endif
ifdef MODULE_NAME
-ifdef MOZILLA_1_9_2_BRANCH
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) $(MODULE_NAME)
-else
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMP_NAMES) $(MODULE_NAME)
endif
-endif
endif # BUILD_STATIC_LIBS
else # !IS_COMPONENT
-ifdef MOZILLA_1_9_2_BRANCH
- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_LIBS) $(STATIC_LIBRARY_NAME)
-else
$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_LIBS) $(STATIC_LIBRARY_NAME)
-endif
endif # IS_COMPONENT
endif # EXPORT_LIBRARY
endif # LIBRARY_NAME
# Create dependencies on static (and shared EXTRA_DSO_LIBS) libraries
LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(LIBS))
HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(HOST_LIBS))
DSO_LDOPTS_DEPS = $(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))
-ifndef MOZILLA_1_9_2_BRANCH
ifndef _LIBNAME_RELATIVE_PATHS
LIBS_DEPS += $(filter -l%, $(LIBS))
HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
_LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
ifneq (,$(_LIBDIRS))
vpath $(LIB_PREFIX)%.$(LIB_SUFFIX) $(_LIBDIRS)
ifdef IMPORT_LIB_SUFFIX
vpath $(LIB_PREFIX)%.$(IMPORT_LIB_SUFFIX) $(_LIBDIRS)
endif # IMPORT_LIB_SUFFIX
vpath $(DLL_PREFIX)%$(DLL_SUFFIX) $(_LIBDIRS)
endif # _LIBDIRS
endif # _LIBNAME_RELATIVE_PATHS
-endif # ! MOZILLA_1_9_2_BRANCH
# Dependencies which, if modified, should cause everything to rebuild
GLOBAL_DEPS += Makefile Makefile.in $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
##############################################
ifdef PARALLEL_DIRS
libs:: $(PARALLEL_DIRS_libs)
@@ -891,21 +869,17 @@ else
$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
endif
endif # DIST_INSTALL
endif # LIBRARY
ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
-ifdef MOZILLA_1_9_2_BRANCH
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_TARGET)/components/components.list $(SHARED_LIBRARY)
-else
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.list $(SHARED_LIBRARY)
-endif
ifdef BEOS_ADDON_WORKAROUND
( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
endif
else # ! IS_COMPONENT
ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
else
$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
@@ -1081,21 +1055,17 @@ endif
# in one directory, it assumes everything to compile Foo is in
# Foo.o (from either Foo.c or Foo.cpp).
#
# SIMPLE_PROGRAMS = Foo Bar
# creates Foo.o Bar.o, links with LIBS to create Foo, Bar.
#
$(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
ifeq (WINCE,$(OS_ARCH))
- ifdef MOZILLA_1_9_2_BRANCH
- $(LD) -nologo -entry:main -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
- else
$(LD) -nologo -entry:mainACRTStartup -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
- endif
else
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
$(LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
ifdef MSMANIFEST_TOOL
@if test -f $@.manifest; then \
mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
rm -f $@.manifest; \
fi
@@ -1251,21 +1221,17 @@ endif
endif
endif
# On Darwin (Mac OS X), dwarf2 debugging uses debug info left in .o files,
# so instead of deleting .o files after repacking them into a dylib, we make
# symlinks back to the originals. The symlinks are a no-op for stabs debugging,
# so no need to conditionalize on OS version or debugging format.
-ifdef MOZILLA_1_9_2_BRANCH
-$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
-else
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
-endif
ifndef INCREMENTAL_LINKER
rm -f $@
endif
ifeq ($(OS_ARCH),OpenVMS)
@if test ! -f $(VMS_SYMVEC_FILE); then \
if test -f $(VMS_SYMVEC_FILE_MODULE); then \
echo Creating specific component options file $(VMS_SYMVEC_FILE); \
cp $(VMS_SYMVEC_FILE_MODULE) $(VMS_SYMVEC_FILE); \
@@ -1731,51 +1697,35 @@ endif
$(LOOP_OVER_TOOL_DIRS)
################################################################################
# Copy each element of EXTRA_COMPONENTS to $(FINAL_TARGET)/components
ifdef EXTRA_COMPONENTS
libs:: $(EXTRA_COMPONENTS)
ifndef NO_DIST_INSTALL
$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/components
-ifdef MOZILLA_1_9_2_BRANCH
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_TARGET)/components/components.list $(notdir $^)
-else
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.list $(notdir $^)
-endif
endif
endif
ifdef EXTRA_PP_COMPONENTS
libs:: $(EXTRA_PP_COMPONENTS)
ifndef NO_DIST_INSTALL
-ifdef MOZILLA_1_9_2_BRANCH
- $(EXIT_ON_ERROR) \
- $(NSINSTALL) -D $(FINAL_TARGET)/components; \
- for i in $^; do \
- fname=`basename $$i`; \
- dest=$(FINAL_TARGET)/components/$${fname}; \
- $(RM) -f $$dest; \
- $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_TARGET)/components/components.list $$fname; \
- done
-else
$(EXIT_ON_ERROR) \
$(NSINSTALL) -D $(FINAL_TARGET)/components; \
for i in $^; do \
fname=`basename $$i`; \
dest=$(FINAL_TARGET)/components/$${fname}; \
$(RM) -f $$dest; \
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/components/components.list $$fname; \
done
endif
-endif
endif
################################################################################
# Copy each element of EXTRA_JS_MODULES to $(FINAL_TARGET)/modules
ifdef EXTRA_JS_MODULES
libs:: $(EXTRA_JS_MODULES)
ifndef NO_DIST_INSTALL
@@ -2012,36 +1962,18 @@ endif # COMPILER_DEPEND
$(CURDIR)/$(MDDEPDIR):
@if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi
ifneq (,$(filter-out all chrome default export realchrome tools clean clobber clobber_all distclean realclean,$(MAKECMDGOALS)))
ifneq (,$(OBJS)$(XPIDLSRCS)$(SIMPLE_PROGRAMS))
MDDEPEND_FILES := $(strip $(wildcard $(MDDEPDIR)/*.pp))
ifneq (,$(MDDEPEND_FILES))
-ifdef MOZILLA_1_9_2_BRANCH
-ifdef PERL
-# The script mddepend.pl checks the dependencies and writes to stdout
-# one rule to force out-of-date objects. For example,
-# foo.o boo.o: FORCE
-# The script has an advantage over including the *.pp files directly
-# because it handles the case when header files are removed from the build.
-# 'make' would complain that there is no way to build missing headers.
-ifeq (,$(MAKE_RESTARTS))
-$(MDDEPDIR)/.all.pp: FORCE
- @$(PERL) $(BUILD_TOOLS)/mddepend.pl $@ $(MDDEPEND_FILES)
-endif
--include $(MDDEPDIR)/.all.pp
-else
-include $(MDDEPEND_FILES)
-endif
-else
ALL_PP_RESULTS = $(shell $(PERL) $(BUILD_TOOLS)/mddepend.pl - $(MDDEPEND_FILES))
$(eval $(ALL_PP_RESULTS))
-endif # ! MOZILLA_1_9_2_BRANCH
endif
endif
endif
#############################################################################
-include $(topsrcdir)/$(MOZ_BUILD_APP)/app-rules.mk
-include $(MY_RULES)
--- a/configure.in
+++ b/configure.in
@@ -87,28 +87,16 @@ MOZ_PATH_PROGS(PERL, $PERL perl5 perl)
if test -z "$PERL" || test "$PERL" = ":"; then
AC_MSG_ERROR([perl not found in \$PATH])
fi
dnl Get mozilla version from central milestone file
MOZILLA_VERSION=`$PERL $MOZILLA_SRCDIR/config/milestone.pl -topsrcdir $MOZILLA_SRCDIR`
-changequote(,)
-MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
-changequote([,])
-
-dnl Set the Gecko 1.9.2 branch version.
-MOZILLA_1_9_2_BRANCH=
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
- MOZILLA_1_9_2_BRANCH=1
- AC_DEFINE(MOZILLA_1_9_2_BRANCH)
-fi
-AC_SUBST(MOZILLA_1_9_2_BRANCH)
-
MOZ_DEB_TIMESTAMP=`date +"%a, %d %b %Y %T %z" 2>&1`
AC_SUBST(MOZ_DEB_TIMESTAMP)
dnl ========================================================
dnl =
dnl = Don't change the following two lines. Doing so breaks:
dnl =
@@ -138,46 +126,36 @@ dnl ====================================
_SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
_SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
_SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
_SUBDIR_CONFIG_ARGS="$ac_configure_args"
dnl Set the version number of the libs included with mozilla
dnl ========================================================
MOZJPEG=62
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-MOZPNG=10217
-else
MOZPNG=10400
-fi
MOZZLIB=0x1230
NSPR_VERSION=4
NSS_VERSION=3
dnl Set the minimum version of toolkit libs used by mozilla
dnl ========================================================
GLIB_VERSION=1.2.0
PERL_VERSION=5.006
CAIRO_VERSION=1.8.8
PANGO_VERSION=1.14.0
GTK2_VERSION=2.10.0
WINDRES_VERSION=2.14.90
W32API_VERSION=3.8
GNOMEVFS_VERSION=2.0
GCONF_VERSION=1.2.1
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
GIO_VERSION=2.0
-fi
STARTUP_NOTIFICATION_VERSION=0.8
DBUS_VERSION=0.60
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-SQLITE_VERSION=3.6.22
-else
SQLITE_VERSION=3.6.23.1
-fi
MSMANIFEST_TOOL=
dnl Set various checks
dnl ========================================================
AC_PROG_AWK
dnl Initialize the Pthread test variables early so they can be
@@ -216,17 +194,17 @@ then
***
EOF
exit 1
break
fi
fi
MOZ_BUILD_ROOT=`pwd`
-dnl Default to MSVC for win32 and gcc-4.2 for darwin (on !MOZILLA_1_9_2_BRANCH)
+dnl Default to MSVC for win32 and gcc-4.2 for darwin
dnl ==============================================================
if test -z "$CROSS_COMPILE"; then
case "$target" in
*-cygwin*|*-mingw*|*-msvc*|*-mks*)
if test -z "$CC"; then CC=cl; fi
if test -z "$CXX"; then CXX=cl; fi
if test -z "$CPP"; then CPP="cl -E -nologo"; fi
if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; ac_cv_prog_CXXCPP="$CXXCPP"; fi
@@ -239,20 +217,18 @@ case "$target" in
x86_64)
AS=ml64
;;
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
;;
*-darwin*)
- if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
if test -z "$CC"; then CC=gcc-4.2; fi
if test -z "$CXX"; then CXX=g++-4.2; fi
- fi
;;
esac
fi
COMPILE_ENVIRONMENT=1
MOZ_ARG_DISABLE_BOOL(compile-environment,
[ --disable-compile-environment
Disable compiler/library checks.],
@@ -389,25 +365,18 @@ if test -n "$CROSS_COMPILE" && test "$ta
powerpc-apple-darwin8*:i?86-apple-darwin*)
dnl The Darwin cross compiler doesn't necessarily point itself at a
dnl root that has libraries for the proper architecture, it defaults
dnl to the system root. The libraries in the system root on current
dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
dnl checks will fail. Fake a working SDK in that case.
_SAVE_CFLAGS=$CFLAGS
_SAVE_CXXFLAGS=$CXXLAGS
- dnl 1.9.2 support 10.4, 1.9.3 and later don't.
- if test "$MOZILLA_1_9_2_BRANCH" = "1";
- then
- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
- CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
- else
CFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CFLAGS"
CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk $CXXFLAGS"
- fi
;;
esac
AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
unset ac_cv_prog_CC
AC_PROG_CC
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
unset ac_cv_prog_CXX
@@ -507,26 +476,17 @@ fi
dnl Special win32 checks
dnl ========================================================
case "$target" in
*-wince|*-winmo)
WINVER=500
;;
*)
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- if test -n "$GNU_CC"; then
- WINVER=501
- else
- WINVER=500
- fi
-else
WINVER=502
-fi
-
;;
esac
dnl Target the Windows 7 SDK by default
WINSDK_TARGETVER=601
MOZ_ARG_WITH_STRING(windows-version,
[ --with-windows-version=WINSDK_TARGETVER
@@ -1018,50 +978,31 @@ AC_SUBST(HAS_XCODE_2_1)
dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
dnl that a universal binary is being produced.
AC_SUBST(UNIVERSAL_BINARY)
dnl ========================================================
dnl Check for MacOS deployment target version
dnl ========================================================
-dnl 1.9.2 support 10.4, 1.9.3 and later don't.
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-MOZ_ARG_ENABLE_STRING(macos-target,
- [ --enable-macos-target=VER (default=10.4)
- Set the minimum MacOS version needed at runtime],
- [_MACOSX_DEPLOYMENT_TARGET=$enableval])
-else
MOZ_ARG_ENABLE_STRING(macos-target,
[ --enable-macos-target=VER (default=10.5)
Set the minimum MacOS version needed at runtime],
[_MACOSX_DEPLOYMENT_TARGET=$enableval])
-fi
case "$target" in
*-darwin*)
if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
dnl Use the specified value
export MACOSX_DEPLOYMENT_TARGET=$_MACOSX_DEPLOYMENT_TARGET
AC_DEFINE_UNQUOTED(__ENVIRONMENT_MAC_OS_X_VERION_MIN_REQUIRED__,$_MACOSX_DEPLOYMENT_TARGET)
elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
dnl No value specified on the command line or in the environment,
dnl use architecture minimum.
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- case "${target_cpu}" in
- x86_64)
- export MACOSX_DEPLOYMENT_TARGET=10.5
- ;;
- *)
- export MACOSX_DEPLOYMENT_TARGET=10.4
- ;;
- esac
- else
export MACOSX_DEPLOYMENT_TARGET=10.5
- fi
fi
;;
esac
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
dnl ========================================================
dnl = Mac OS X SDK support
@@ -1159,34 +1100,23 @@ MOZ_USER_DIR=".mozilla"
MOZ_JPEG_CFLAGS=
MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)'
MOZ_ZLIB_CFLAGS=
MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
MOZ_BZ2_CFLAGS=
MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)'
MOZ_PNG_CFLAGS=
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/mozilla/modules/libimg/png)'
-
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core '
- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:/lib -Wl,-rpath-link,$(prefix)/lib'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
- XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
-else
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:/lib -Wl,-rpath-link,$(prefix)/lib'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
- XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
-fi
+MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:/lib -Wl,-rpath-link,$(prefix)/lib'
+XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
+LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
+XPCOM_STANDALONE_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
MOZ_FS_LAYOUT=unix
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
USE_DEPENDENT_LIBS=1
_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
@@ -1800,18 +1730,17 @@ case "$host" in
fi
HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11"
HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
HOST_BIN_SUFFIX=.exe
case "$host" in
*mingw*)
dnl MinGW/MSYS does not need CYGWIN_WRAPPER
- dnl use MOZILLA_SRCDIR when we drop support for MOZILLA_1_9_2_BRANCH
- PERL="/bin/sh ${_topsrcdir}/build/msys-perl-wrapper"
+ PERL="/bin/sh ${MOZILLA_SRCDIR}/build/msys-perl-wrapper"
;;
*)
CYGWIN_WRAPPER="${srcdir}/build/cygwin-wrapper"
if test "`echo ${srcdir} | grep -c ^/ 2>/dev/null`" = 0; then
_pwd=`pwd`
CYGWIN_WRAPPER="${_pwd}/${srcdir}/build/cygwin-wrapper"
fi
if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" = 0; then
@@ -2108,21 +2037,17 @@ case "$target" in
MOZ_DEBUG_FLAGS="-g -fno-inline"
elif test "$GNU_CC" || test "$GNU_CXX"; then
GCC_VERSION=`$CC -v 2>&1 | awk '/^gcc version/ { print $3 }'`
case $GCC_VERSION in
4.1.*|4.2.*)
# -Os is broken on gcc 4.1.x and 4.2.x, we need to tweak it to get good results.
MOZ_OPTIMIZE_SIZE_TWEAK="-finline-limit=50"
esac
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_SIZE_TWEAK"
- else
MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fomit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
- fi
MOZ_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb,
# and that combo is not yet good at
# debugging inlined functions (even
# when using DWARF2 as the debugging
# format)
fi
TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
@@ -2179,58 +2104,41 @@ case "$target" in
MOZ_OPTIMIZE_FLAGS='-Ox'
AR_FLAGS='-NOLOGO -OUT:"$@"'
ASM_SUFFIX=asm
CFLAGS="$CFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
DLL_PREFIX=
DOXYGEN=:
DSO_LDOPTS=-SUBSYSTEM:WINDOWSCE
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
-else
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-fi
GARBAGE=
IMPORT_LIB_SUFFIX=lib
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- LIBS="$LIBS"
- LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
-else
dnl Need to force-link against mozalloc because it's used in the shunt
LIBS="$LIBS \$(LIBXUL_DIST)/lib/mozalloc.lib"
LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-fi
LIB_PREFIX=
LIB_SUFFIX=lib
MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)'
MKSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ $(DSO_LDOPTS)'
MKSHLIB_FORCE_ALL=
MKSHLIB_UNFORCE_ALL=
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
MOZ_DEBUG_FLAGS='-Zi'
MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
MOZ_FIX_LINK_PATHS=
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/js32$(VERSION_NUMBER).lib'
- else
- MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib'
- fi
+ MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib'
OBJ_SUFFIX=obj
RANLIB='echo not_ranlib'
STRIP='echo not_strip'
TARGET_NSPR_MDCPUCFG='\"md/_wince.cfg\"'
UNZIP=unzip
XARGS=xargs
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib'
-else
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom.lib'
-fi
ZIP=zip
MOZ_TREE_FREETYPE=1
AC_DEFINE(HAVE_SNPRINTF)
AC_DEFINE(_WINDOWS)
AC_DEFINE(WIN32)
AC_DEFINE(XP_WIN)
AC_DEFINE(XP_WIN32)
@@ -2271,30 +2179,20 @@ fi
CXXFLAGS="$CXXFLAGS -mms-bitfields"
DSO_LDOPTS='-shared'
MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
RC='$(WINDRES)'
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
# mingw doesn't require kernel32, user32, and advapi32 explicitly
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/lib -ljs32$(VERSION_NUMBER)'
-else
LIBS="$LIBS -luuid -lgdi32 -lwinmm -lwsock32"
-fi
MOZ_FIX_LINK_PATHS=
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom'
-else
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc'
-fi
DLL_PREFIX=
IMPORT_LIB_SUFFIX=dll.a
else
TARGET_COMPILER_ABI=msvc
HOST_CC='$(CC)'
HOST_CXX='$(CXX)'
HOST_LD='$(LD)'
if test "$AS_BIN"; then
@@ -2325,31 +2223,21 @@ fi
_DEFINES_CXXFLAGS='-FI $(DEPTH)/comm-config.h -DMOZILLA_CLIENT'
CFLAGS="$CFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
CXXFLAGS="$CXXFLAGS -W3 -Gy -Fd\$(COMPILE_PDBFILE)"
LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib"
MOZ_DEBUG_FLAGS='-Zi'
MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
WARNINGS_AS_ERRORS='-WX'
MOZ_OPTIMIZE_FLAGS='-O1'
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/js32$(VERSION_NUMBER).lib'
- else
- MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib'
- fi
+ MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib'
MOZ_FIX_LINK_PATHS=
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib'
- XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib'
- LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
-else
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
XPCOM_FROZEN_LDOPTS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
-fi
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
if test $_MSC_VER -ge 1400; then
LDFLAGS="$LDFLAGS -NXCOMPAT"
dnl For profile-guided optimization
PROFILE_GEN_CFLAGS="-GL"
PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT"
dnl XXX: PGO builds can fail with warnings treated as errors,
dnl specifically "no profile data available" appears to be
@@ -2604,23 +2492,18 @@ fi
BIN_FLAGS='-Zlinker /ST:0x100000'
IMPLIB='emximp -o'
FILTER='emxexp -o'
LDFLAGS='-Zmap'
WARNINGS_AS_ERRORS='-Werror'
MOZ_DEBUG_FLAGS="-g -fno-inline"
MOZ_OPTIMIZE_FLAGS="-O2"
MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
- LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
- else
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
- LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
- fi
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcom_core.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
+ LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
TARGET_MD_ARCH=os2
_PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
RC=rc.exe
RCFLAGS='-n'
MOZ_USER_DIR="Mozilla"
if test "$MOZTOOLS"; then
MOZ_TOOLS_DIR=`echo $MOZTOOLS | sed -e 's|\\\\|/|g'`
@@ -4281,21 +4164,17 @@ fi # SKIP_COMPILER_CHECKS
dnl ========================================================
dnl =
dnl = Check for external package dependencies
dnl =
dnl ========================================================
MOZ_ARG_HEADER(External Packages)
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-MOZ_ENABLE_LIBXUL=
-else
MOZ_ENABLE_LIBXUL=1
-fi
MOZ_ARG_WITH_STRING(libxul-sdk,
[ --with-libxul-sdk=PFX Use the libXUL SDK at <PFX>],
LIBXUL_SDK_DIR=$withval)
if test "$LIBXUL_SDK_DIR" = "yes"; then
AC_MSG_ERROR([--with-libxul-sdk must specify a path])
elif test -n "$LIBXUL_SDK_DIR" -a "$LIBXUL_SDK_DIR" != "no"; then
@@ -4385,31 +4264,22 @@ else
NSS_DEP_LIBS="\
\$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)ssl$NSS_VERSION\$(DLL_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nss$NSS_VERSION\$(DLL_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)nssutil$NSS_VERSION\$(DLL_SUFFIX)"
if test -z "$GNU_CC" && test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "WINCE" -o "$OS_ARCH" = "OS2"; then
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- NSS_LIBS="\
- \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
- \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)smime$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
- \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)ssl$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
- \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nss$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \
- \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(IMPORT_LIB_SUFFIX)"
-else
NSS_LIBS="\
\$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)smime$NSS_VERSION.\$(LIB_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)ssl$NSS_VERSION.\$(LIB_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nss$NSS_VERSION.\$(LIB_SUFFIX) \
\$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(LIB_SUFFIX)"
-fi
else
NSS_LIBS='$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION"
fi
fi
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
@@ -4606,66 +4476,57 @@ MOZ_ARG_HEADER(Application)
BUILD_STATIC_LIBS=
ENABLE_TESTS=1
MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
MOZ_CALENDAR=
MOZ_DBGRINFO_MODULES=
MOZ_FEEDS=1
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
MOZ_IPC=1
-fi
MOZ_JSDEBUGGER=1
MOZ_JSLOADER=1
MOZ_LDAP_XPCOM=
MOZ_MAIL_NEWS=
MOZ_MORK=
MOZ_MORKREADER=1
MOZ_AUTH_EXTENSION=1
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_NO_INSPECTOR_APIS=
MOZ_NO_FAST_LOAD=
MOZ_OGG=1
MOZ_SYDNEYAUDIO=
MOZ_WAVE=1
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
MOZ_PANGO=1
-fi
MOZ_PERMISSIONS=1
MOZ_PLACES=1
MOZ_PLAINTEXT_EDITOR_ONLY=
MOZ_PLUGINS=1
MOZ_PREF_EXTENSIONS=1
MOZ_PROFILELOCKING=1
MOZ_PSM=1
MOZ_RDF=1
MOZ_SAFE_BROWSING=
MOZ_FASTSTART=
MOZ_HELP_VIEWER=
MOZ_SPELLCHECK=1
MOZ_STATIC_MAIL_BUILD=
MOZ_STORAGE=1
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-MOZ_SVG=1
-fi
MOZ_TIMELINE=
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
MOZ_URL_CLASSIFIER=
MOZ_USE_NATIVE_UCONV=
MOZ_VIEW_SOURCE=1
MOZ_XSLT_STANDALONE=
MOZ_XTF=1
MOZ_XUL=1
MOZ_ZIPWRITER=1
NS_PRINTING=1
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
BUILD_CTYPES=1
-fi
case "$target_os" in
darwin*)
ACCESSIBILITY=
;;
*)
ACCESSIBILITY=1
@@ -4696,82 +4557,64 @@ MOZ_ARG_WITH_STRING(embedding-profile,
case "$MOZ_EMBEDDING_PROFILE" in
default)
;;
basic)
ENABLE_TESTS=
MOZ_COMPOSER=
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_ENABLE_CANVAS=
- fi
MOZ_INSTALLER=
MOZ_JSDEBUGGER=
MOZ_LDAP_XPCOM=
MOZ_MAIL_NEWS=
MOZ_AUTH_EXTENSION=
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_NO_INSPECTOR_APIS=1
MOZ_NO_FAST_LOAD=1
MOZ_PLAINTEXT_EDITOR_ONLY=1
# MOZ_PLUGINS=
MOZ_PREF_EXTENSIONS=
MOZ_PROFILELOCKING=
MOZ_SPELLCHECK=
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_SVG=
- fi
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=
MOZ_VIEW_SOURCE=
MOZ_XTF=
MOZ_ZIPWRITER=
NS_DISABLE_LOGGING=1
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- NS_PRINTING=
- fi
;;
minimal)
ENABLE_TESTS=
MOZ_COMPOSER=
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_ENABLE_CANVAS=
- fi
MOZ_INSTALLER=
MOZ_JSDEBUGGER=
MOZ_LDAP_XPCOM=
MOZ_MAIL_NEWS=
MOZ_AUTH_EXTENSION=
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_NO_INSPECTOR_APIS=1
MOZ_NO_FAST_LOAD=1
MOZ_PLAINTEXT_EDITOR_ONLY=1
MOZ_PLUGINS=
MOZ_PREF_EXTENSIONS=
MOZ_PROFILELOCKING=
MOZ_SPELLCHECK=
MOZ_STORAGE=1
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_SVG=
- fi
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=1
MOZ_VIEW_SOURCE=
MOZ_XTF=
MOZ_XUL=
MOZ_ZIPWRITER=
MOZ_RDF=
NS_DISABLE_LOGGING=1
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- NS_PRINTING=
- fi
;;
*)
AC_MSG_ERROR([Unrecognized value: --with-embedding-profile=$MOZ_EMBEDDING_PROFILE])
;;
esac
MOZ_ARG_WITH_STRING(xulrunner-stub-name,
@@ -4809,19 +4652,16 @@ else
AC_MSG_RESULT([no])
fi
# Special cases where we need to AC_DEFINE something. Also a holdover for apps
# that haven't made a confvars.sh yet. Don't add new stuff here, use
# MOZ_BUILD_APP.
case "$MOZ_BUILD_APP" in
suite)
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- AC_MSG_ERROR([Building SeaMonkey with mozilla1.9.2 is not supported.])
- fi
AC_DEFINE(MOZ_SUITE)
;;
mail)
AC_DEFINE(MOZ_THUNDERBIRD)
;;
calendar)
@@ -4944,34 +4784,22 @@ cairo-os2)
TK_LIBS='$(MOZ_CAIRO_LIBS)'
;;
cairo-cocoa)
MOZ_WIDGET_TOOLKIT=cocoa
AC_DEFINE(MOZ_WIDGET_COCOA)
MOZ_USER_DIR="Mozilla"
AC_DEFINE(XP_MACOSX)
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- TK_LIBS='-framework Carbon -framework AddressBook'
- else
TK_LIBS='-framework QuartzCore -framework Carbon -framework AddressBook'
- fi
TK_CFLAGS="-DNO_X11"
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- LDFLAGS="$LDFLAGS -framework Cocoa"
- else
LDFLAGS="$LDFLAGS -framework Cocoa -lobjc"
- fi
CFLAGS="$CFLAGS $TK_CFLAGS"
CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
- else
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
- fi
MOZ_FS_LAYOUT=bundle
;;
esac
if test "$COMPILE_ENVIRONMENT"; then
if test "$MOZ_ENABLE_GTK2"; then
if test "$MOZ_X11"; then
GDK_PACKAGES=gdk-x11-2.0
@@ -5022,21 +4850,17 @@ AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION
AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS)
AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS)
dnl ========================================================
dnl = QT support
dnl ========================================================
if test "$MOZ_ENABLE_QT"
then
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- PKG_CHECK_MODULES(MOZ_QT, QtGui QtNetwork QtUiTools QtCore)
- else
PKG_CHECK_MODULES(MOZ_QT, QtGui QtNetwork QtCore QtOpenGL)
- fi
fi
AC_SUBST(GTK_CONFIG)
AC_SUBST(TK_CFLAGS)
AC_SUBST(TK_LIBS)
AC_SUBST(MOZ_ENABLE_GTK2)
AC_SUBST(MOZ_GTK2_CFLAGS)
@@ -5137,52 +4961,48 @@ MOZ_ARG_WITH_STRING(distribution-id,
if test -z "$MOZ_DISTRIBUTION_ID"; then
MOZ_DISTRIBUTION_ID="org.mozilla"
fi
AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
AC_SUBST(MOZ_DISTRIBUTION_ID)
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
dnl ========================================================
dnl complex text support off by default
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(pango,
[ --disable-pango Disable usage of Pango ],
MOZ_PANGO=,
MOZ_PANGO=1)
-fi # ! MOZILLA_1_9_2_BRANCH
dnl ========================================================
dnl = Pango
dnl ========================================================
if test "$MOZ_ENABLE_GTK2"
then
PKG_CHECK_MODULES(MOZ_PANGO, pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION)
AC_SUBST(MOZ_PANGO_LIBS)
fi
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
if test "$MOZ_ENABLE_QT"
then
if test "$MOZ_PANGO"
then
PKG_CHECK_MODULES(MOZ_PANGO, [pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION],
[
AC_SUBST(MOZ_PANGO_LIBS)
true # Needed not to have an empty block.
],
[
echo "Pango library not found, will use FT2 font engine"
MOZ_PANGO=
])
fi
fi
-fi # ! MOZILLA_1_9_2_BRANCH
dnl ========================================================
dnl = GnomeVFS support module
dnl ========================================================
if test "$MOZ_X11"
then
dnl build the gnomevfs extension by default only when the
@@ -5227,20 +5047,16 @@ then
if test "$MOZ_ENABLE_GCONF"; then
AC_DEFINE(MOZ_ENABLE_GCONF)
fi
AC_SUBST(MOZ_ENABLE_GCONF)
AC_SUBST(MOZ_GCONF_CFLAGS)
AC_SUBST(MOZ_GCONF_LIBS)
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- MOZ_ENABLE_GIO=
- else
-
dnl ========================================================
dnl = GIO support module
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(gio,
[ --enable-gio Enable GIO support (default: disabled)],
MOZ_ENABLE_GIO=force,
MOZ_ENABLE_GIO=)
@@ -5251,19 +5067,16 @@ then
],[
if test "$MOZ_ENABLE_GIO" = "force"
then
AC_MSG_ERROR([* * * Could not find gio-2.0 >= $GIO_VERSION])
fi
MOZ_ENABLE_GIO=
])
fi
-
- dnl ! MOZILLA_1_9_2_BRANCH
- fi
fi
if test "$MOZ_ENABLE_GTK2"
then
# The GNOME component is built if gtk2, gconf and gnome-vfs
# are all available.
if test "$MOZ_ENABLE_GTK2" -a "$MOZ_ENABLE_GCONF" && \
@@ -5309,17 +5122,16 @@ MOZ_ARG_DISABLE_BOOL(crypto,
dnl ========================================================
dnl = JS Debugger XPCOM component (js/jsd)
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(jsd,
[ --disable-jsd Disable JavaScript debug library],
MOZ_JSDEBUGGER=,
MOZ_JSDEBUGGER=1)
-if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
dnl ========================================================
dnl = Disable IPC support for tabs and plugins
dnl ========================================================
case "${target}" in
powerpc-apple-darwin*)
MOZ_IPC=
;;
*-wince*)
@@ -5332,17 +5144,16 @@ MOZ_ARG_DISABLE_BOOL(ipc,
MOZ_IPC=,
MOZ_IPC=1)
if test -n "$MOZ_IPC"; then
AC_DEFINE(MOZ_IPC)
fi
AC_SUBST(MOZ_IPC)
-fi # ! MOZILLA_1_9_2_BRANCH
dnl ========================================================
dnl = Disable plugin support
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(plugins,
[ --disable-plugins Disable plugins support],
MOZ_PLUGINS=,
MOZ_PLUGINS=1)
@@ -5569,70 +5380,42 @@ MOZ_ARG_DISABLE_BOOL(crashreporter,
if test -n "$MOZ_CRASHREPORTER"; then
AC_DEFINE(MOZ_CRASHREPORTER)
fi
dnl ========================================================
dnl SVG
dnl ========================================================
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-
-MOZ_ARG_DISABLE_BOOL(svg,
-[ --disable-svg Disable SVG support (NB: unsupported option in comm-central)],
- MOZ_SVG=,
- MOZ_SVG=1 )
-if test -z "$MOZ_SVG"; then
- AC_MSG_ERROR([comm-central does not support disabling SVG.])
-fi
-
-else
-
MOZ_ARG_DISABLE_BOOL(svg,
[ --disable-svg Disable SVG support (NB: unsupported option in comm-central)],
AC_MSG_ERROR([comm-central does not support disabling SVG.]))
-fi
-
dnl ========================================================
dnl SMIL
dnl ========================================================
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-
-MOZ_ARG_ENABLE_BOOL(smil,
-[ --enable-smil Enable SMIL animation support],
- MOZ_SMIL=1,
- MOZ_SMIL= )
-
-else
-
MOZ_SMIL=1
MOZ_ARG_DISABLE_BOOL(smil,
[ --disable-smil Disable SMIL animation support],
MOZ_SMIL=,
MOZ_SMIL=1 )
-fi
if test -n "$MOZ_SMIL"; then
AC_DEFINE(MOZ_SMIL)
fi
dnl ========================================================
dnl Build Freetype in the tree
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(tree-freetype,
[ --enable-tree-freetype Enable Tree FreeType],
MOZ_TREE_FREETYPE=1,
MOZ_TREE_FREETYPE= )
if test -n "$MOZ_TREE_FREETYPE"; then
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
- else
CAIRO_FT_LIBS='$(call EXPAND_LIBNAME_PATH,freetype2,$(LIBXUL_DIST)/lib)'
- fi
fi
dnl ========================================================
dnl experimental ldap features
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(ldap-experimental,
[ --enable-ldap-experimental
Enable LDAP experimental features],
@@ -5783,21 +5566,17 @@ MOZ_NATIVE_SQLITE=
MOZ_ARG_ENABLE_BOOL(system-sqlite,
[ --enable-system-sqlite Use system sqlite (located with pkgconfig)],
MOZ_NATIVE_SQLITE=1,
MOZ_NATIVE_SQLITE= )
if test -z "$MOZ_NATIVE_SQLITE"
then
SQLITE_CFLAGS=
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
- else
SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)'
- fi
else
PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
fi
AC_SUBST(MOZ_NATIVE_SQLITE)
dnl = Enable help viewer (off by default)
dnl ========================================================
@@ -6661,28 +6440,18 @@ if test -n "$INTEL_CC"; then
PROFILE_USE_CFLAGS="-prof-use -prof-dir ."
PROFILE_USE_LDFLAGS=
fi
dnl Sun Studio on Solaris
if test "$SOLARIS_SUNPRO_CC"; then
PROFILE_GEN_CFLAGS="-xprofile=collect:$_objdir/$enable_application"
PROFILE_GEN_LDFLAGS="-xprofile=collect:$_objdir/$enable_application"
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- if test "$CPU_ARCH" != "sparc"; then
- PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
- PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
- else
- PROFILE_USE_CFLAGS="-xlinkopt=2 -xprofile=use:$_objdir/$enable_application"
- PROFILE_USE_LDFLAGS="-xlinkopt=2 -xprofile=use:$_objdir/$enable_application"
- fi
- else
PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
- fi
fi
AC_SUBST(PROFILE_GEN_CFLAGS)
AC_SUBST(PROFILE_GEN_LDFLAGS)
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
AC_LANG_CPLUSPLUS
@@ -6898,23 +6667,16 @@ dnl =
dnl ========================================================
MOZ_ARG_HEADER(Static build options)
MOZ_ARG_ENABLE_BOOL(static,
[ --enable-static Enable building of internal static libs],
BUILD_STATIC_LIBS=1,
BUILD_STATIC_LIBS=)
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-dnl Disable libxul in debug builds.
-if test -n "$MOZ_DEBUG"; then
- MOZ_ENABLE_LIBXUL=
-fi
-fi
-
MOZ_ARG_ENABLE_BOOL(libxul,
[ --enable-libxul Enable building of libxul],
MOZ_ENABLE_LIBXUL=1,
MOZ_ENABLE_LIBXUL=)
if test -n "$MOZ_STATIC_BUILD_UNSUPPORTED" -a -n "$BUILD_STATIC_LIBS"; then
AC_MSG_ERROR([--enable-static is not supported for building $MOZ_APP_NAME. You probably want --enable-libxul.])
fi
@@ -7017,21 +6779,17 @@ if test "$MOZ_TREE_CAIRO"; then
else
MOZ_CAIRO_LIBS='$(DEPTH)/mozilla/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) $(DEPTH)/mozilla/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX)'" $CAIRO_FT_LIBS"
if test "$MOZ_X11"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig"
fi
fi
else
- if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
- PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
- else
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig)
- fi
MOZ_CAIRO_LIBS=$CAIRO_LIBS
if test "$MOZ_X11"; then
PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION)
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS $CAIRO_XRENDER_LIBS"
fi
fi
AC_SUBST(MOZ_CAIRO_LIBS)
@@ -7074,29 +6832,16 @@ MOZ_ARG_DISABLE_BOOL(rdf,
[ --disable-rdf Disable RDF],
MOZ_RDF= )
if test "$MOZ_RDF"; then
AC_DEFINE(MOZ_RDF)
fi
AC_SUBST(MOZ_RDF)
-if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
-
-dnl
-dnl Build jsctypes on the platforms we can.
-dnl
-AC_SUBST(BUILD_CTYPES)
-if test "$OS_ARCH" != "WINCE" -o `echo $OS_TEST | grep -ic arm` != 1; then
- BUILD_CTYPES=1
- AC_DEFINE(BUILD_CTYPES)
-fi
-
-else
-
dnl
dnl Build jsctypes on the platforms we can, unless it's explicitly disabled.
dnl
MOZ_ARG_DISABLE_BOOL(ctypes,
[ --disable-ctypes Disable js-ctypes],
BUILD_CTYPES=,
BUILD_CTYPES=1)
AC_SUBST(BUILD_CTYPES)
@@ -7104,18 +6849,16 @@ if test "$BUILD_CTYPES"; then
if test "$OS_ARCH" = "WINCE" -a `echo $OS_TEST | grep -ic arm` = 1; then
# Disable ctypes for arm/wince.
BUILD_CTYPES=
else
AC_DEFINE(BUILD_CTYPES)
fi
fi
-fi # ! MOZILLA_1_9_2_BRANCH
-
dnl Only build Mork if it's required
AC_SUBST(MOZ_MORK)
if test "$MOZ_MORK"; then
AC_DEFINE(MOZ_MORK)
fi
dnl Build the lightweight Mork reader if required
AC_SUBST(MOZ_MORKREADER)