From 4b74339c6fada3443e102d28f168d5ce66209b8f Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us" <benjamin%smedbergs.us>
Date: Tue, 29 Aug 2006 16:53:40 +0000
Subject: [PATCH] Bug 350211 - Allow arbitrary build-system extension, parts 2
& 3 $(MOZ_BUILD_APP)/build.mk, r=mento
---
Makefile.in | 501 +----------------------------
allmakefiles.sh | 2 +-
js/Makefile.in => browser/build.mk | 45 +--
calendar/build.mk | 46 +++
camino/build.mk | 56 ++++
camino/config/mozconfig | 4 +-
client.mk | 11 +-
config/Makefile.in | 23 --
config/nspr/Makefile.in | 80 +++++
config/nspr/build.mk | 48 +++
config/rules.mk | 1 +
configure | 362 ++++++++++-----------
configure.in | 8 +-
content/xslt/build.mk | 47 +++
content/xslt/src/base/Makefile.in | 1 +
embedding/config/Makefile.in | 12 +-
js/src/build.mk | 44 +++
mail/build.mk | 57 ++++
minimo/build.mk | 51 +++
suite/build.mk | 73 +++++
toolkit/toolkit-tiers.mk | 303 +++++++++++++++++
tools/update-packaging/build.mk | 47 +++
xpcom/build.mk | 41 +++
23 files changed, 1130 insertions(+), 733 deletions(-)
rename js/Makefile.in => browser/build.mk (61%)
create mode 100644 calendar/build.mk
create mode 100644 camino/build.mk
create mode 100644 config/nspr/Makefile.in
create mode 100644 config/nspr/build.mk
create mode 100644 content/xslt/build.mk
create mode 100644 js/src/build.mk
create mode 100644 mail/build.mk
create mode 100644 minimo/build.mk
create mode 100644 suite/build.mk
create mode 100644 toolkit/toolkit-tiers.mk
create mode 100644 tools/update-packaging/build.mk
create mode 100644 xpcom/build.mk
diff --git a/Makefile.in b/Makefile.in
index e78132d57943a..40bcca39f9344 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,480 +46,29 @@ include $(topsrcdir)/build/unix/modules.mk
include $(topsrcdir)/config/config.mk
-ifneq ($(MOZ_STANDALONE_BUILD),1) # {
-#
-# And now for something completely different...
-# Divide the default build into tiers.
-# Tiers must be defined on module boundaries
-#
-
-ifndef LIBXUL_SDK
-TIERS += nspr
-endif
-
-TIERS += 0
-
-ifndef LIBXUL_SDK
-TIERS += \
- 1 \
- 2 \
- 9 \
- 50 \
- $(NULL)
-endif
-
-TIERS += \
- 99 \
- $(NULL)
-
-#
-# tier NSPR
-#
-
-ifdef GC_LEAK_DETECTOR
-tier_nspr_staticdirs = gc/boehm
-endif
-
-ifndef MOZ_NATIVE_NSPR
-tier_nspr_staticdirs += nsprpub
-endif
-
-#
-# tier 0 - base build config dirs
-#
-tier_0_dirs = \
- config \
- build \
- $(NULL)
-
-#
-# tier 1 - 3rd party individual libraries
-#
-
-ifndef MOZ_NATIVE_JPEG
-tier_1_dirs += jpeg
-endif
-
-ifndef MOZ_NATIVE_ZLIB
-tier_1_dirs += modules/zlib
-endif
-
-# Installer needs standalone libjar, hence standalone zlib
-ifdef MOZ_INSTALLER
-tier_1_dirs += modules/zlib/standalone
-endif
-
-ifdef MOZ_UPDATER
-tier_1_dirs += modules/libbz2
-tier_1_dirs += modules/libmar
-endif
-
-#
-# tier 2 - base libraries
-#
-tier_2_dirs = \
- js \
- xpcom \
- $(NULL)
-
-ifneq (,$(MOZ_NO_XPCOM_OBSOLETE)$(MOZ_XPINSTALL))
-tier_2_dirs += modules/libreg
-endif
-
-ifndef MOZ_NO_XPCOM_OBSOLETE
-tier_2_dirs += xpcom/obsolete
-endif
-
-ifdef NS_TRACE_MALLOC
-tier_2_dirs += tools/trace-malloc/lib
-endif
-
-#
-# tier 9 - core components (necko,gecko)
-#
-
-tier_9_dirs += \
- js/src/xpconnect \
- intl \
- $(NULL)
-
-ifdef MOZ_ENABLE_XLIB
-tier_9_dirs += gfx/src/xlibrgb widget/src/xlibxtbin
-endif
-
-ifdef MOZ_ENABLE_GTK
-tier_9_dirs += widget/src/gtksuperwin widget/src/gtkxtbin
-endif
-
-ifdef MOZ_ENABLE_GTK2
-tier_9_dirs += widget/src/gtkxtbin
-endif
-
-ifdef MOZ_IPCD
-tier_9_dirs += ipc/ipcd
-endif
-
-tier_9_dirs += \
- modules/libutil \
- netwerk \
- modules/libjar \
- db \
- $(NULL)
-
-ifdef MOZ_PERMISSIONS
-tier_9_dirs += \
- extensions/cookie \
- extensions/permissions \
- $(NULL)
-endif
-
-ifdef MOZ_STORAGE
-tier_9_dirs += storage
-endif
-
-ifdef MOZ_XUL
-tier_9_dirs += rdf
-endif
-
-ifdef MOZ_JSDEBUGGER
-tier_9_dirs += js/jsd
-endif
-
-tier_9_dirs += \
- uriloader \
- modules/libpref \
- modules/libimg \
- caps \
- parser/expat \
- parser/xml \
- parser/htmlparser \
- gfx \
- modules/libpr0n \
- sun-java \
- modules/plugin \
- dom \
- view \
- widget \
- content \
- layout \
- docshell \
- webshell \
- embedding \
- editor \
- xpfe/appshell \
- $(NULL)
-
-ifdef MOZ_AUTH_EXTENSION
-tier_9_dirs += extensions/auth
-endif
-
-ifdef MOZ_XMLEXTRAS
-tier_9_dirs += extensions/xmlextras
-endif
-
-ifdef MOZ_WEBSERVICES
-tier_9_dirs += extensions/webservices
-endif
-
-ifdef MOZ_UNIVERSALCHARDET
-tier_9_dirs += extensions/universalchardet
-endif
-
-ifdef MOZ_OJI
-tier_9_dirs += \
- js/src/liveconnect \
- modules/oji \
- $(NULL)
-endif
-
-ifdef ACCESSIBILITY
-tier_9_dirs += accessible
-endif
-
-#
-# tier 50 - xpfe & toolkit
-#
-
-ifdef MOZ_XUL_APP
-tier_50_dirs += chrome
-else
-ifdef MOZ_XUL
-tier_50_dirs += rdf/chrome
-else
-tier_50_dirs += embedding/minimo/chromelite
-endif
-endif
-
-tier_50_dirs += profile
-
-# This must preceed xpfe
-ifdef MOZ_JPROF
-tier_50_dirs += tools/jprof
-endif
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-tier_50_dirs += xpfe/bootstrap/appleevents
-endif
-
-tier_50_dirs += \
- xpfe \
- toolkit/components \
- $(NULL)
-
-ifndef MOZ_XUL_APP
-tier_50_dirs += themes
-endif
-
-ifdef MOZ_ENABLE_XREMOTE
-tier_50_dirs += widget/src/xremoteclient
-endif
-
-ifdef MOZ_SPELLCHECK
-tier_50_dirs += extensions/spellcheck
-endif
-
-ifdef MOZ_XUL_APP
-tier_50_dirs += toolkit
-endif
-
-ifdef MOZ_XPINSTALL
-tier_50_dirs += xpinstall
-endif
-
-ifdef MOZ_PSM
-tier_50_dirs += security/manager
-else
-tier_50_dirs += security/manager/boot/public security/manager/ssl/public
-endif
-
-ifdef MOZ_PREF_EXTENSIONS
-tier_50_dirs += extensions/pref
-endif
-
-ifdef MOZ_JAVAXPCOM
-tier_50_dirs += extensions/java
-endif
-
-ifndef BUILD_STATIC_LIBS
-ifdef MOZ_XUL_APP
-ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2))
-tier_50_dirs += embedding/browser/gtk
-endif
-endif
-endif
-
-ifdef MOZ_XUL_APP
-ifndef BUILD_STATIC_LIBS
-tier_50_dirs += toolkit/library
-endif
-endif
-
-ifdef MOZ_ENABLE_LIBXUL
-tier_50_dirs += xpcom/stub
-endif
-
-ifdef NS_TRACE_MALLOC
-tier_50_dirs += tools/trace-malloc
-endif
-
-ifdef MOZ_LDAP_XPCOM
-tier_50_staticdirs += directory/c-sdk
-tier_50_dirs += directory/xpcom
-endif
-
-ifndef MINIMO
-ifdef MOZ_XUL_APP
-ifdef MOZ_ENABLE_GTK2
-tier_50_dirs += toolkit/components/gnome
-endif
-endif
-endif
-
-ifdef MOZ_LEAKY
-tier_50_dirs += tools/leaky
-endif
-
-ifdef MOZ_MAPINFO
-tier_50_dirs += tools/codesighs
-endif
-
-#
-# tier 99 - application binaries
-#
-
-ifdef MOZ_MAIL_NEWS
-tier_99_dirs += mailnews
-endif
-
-ifdef MOZ_CALENDAR
-tier_99_dirs += calendar
-endif
-
-ifdef MOZ_EXTENSIONS
-tier_99_dirs += extensions
-endif
-
-# axcontrol
-ifndef LIBXUL_SDK
-ifeq ($(OS_ARCH),WINNT)
-ifndef MOZ_NO_ACTIVEX_SUPPORT
-tier_99_dirs += \
- embedding/browser/activex/src/control \
- embedding/browser/activex/src/control_kicker \
- $(NULL)
-endif # MOZ_NO_ACTIVEX_SUPPORT
-endif # WINNT
-endif # LIBXUL_SDK
-
-# Java Embedding Plugin
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-tier_99_dirs += plugin/oji/JEP
-endif
-
-ifdef MOZ_BRANDING_DIRECTORY
-tier_99_dirs += $(MOZ_BRANDING_DIRECTORY)
-endif
-
-ifdef MOZ_PHOENIX
-tier_99_dirs += browser xpfe/bootstrap/init.d
-endif
-
-ifdef MOZ_XULRUNNER
-tier_99_dirs += xulrunner
-endif
-
-ifdef MOZ_COMPOSER
-tier_99_dirs += editor/ui
-endif
-
-ifdef MOZ_THUNDERBIRD
-tier_99_dirs += mail xpfe/bootstrap/init.d
-endif
-
-ifdef MOZ_STANDALONE_COMPOSER
-tier_99_dirs += composer
-endif
-
-ifdef MOZ_SUNBIRD
-tier_99_dirs += calendar/sunbird
-endif
-
-ifdef MOZ_SUITE
-tier_99_dirs += \
- xpfe/components/search \
- xpfe/components/bookmarks \
- $(NULL)
-
-# When Suite becomes a full MOZ_XUL_APP we can remove this ifdef
-ifdef MOZ_XUL_APP
-tier_99_dirs += themes
-endif
-tier_99_dirs += suite
-endif
-
-ifdef MINIMO
-tier_99_dirs += minimo
-endif
-
-ifdef MOZ_XUL_APP
-# XXX SUITE doesn't want to build the toolkit installer yet
-ifndef MOZ_SUITE
-ifdef MOZ_INSTALLER
-tier_99_dirs += toolkit/mozapps/installer
-endif
-endif # MOZ_SUITE
-else
-ifneq (,$(MOZ_XPFE_COMPONENTS)$(MOZ_XUL))
-ifndef MINIMO
-tier_99_dirs += xpfe/bootstrap
-endif
-endif
-endif
-
-ifndef LIBXUL_SDK
-
-# winembed, mfcembed
-ifeq ($(OS_ARCH),WINNT)
-ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))
-tier_99_dirs += embedding/tests
-endif
-endif
-
-# os2embed
-ifeq ($(OS_ARCH),OS2)
-ifdef ENABLE_TESTS
-tier_99_dirs += embedding/tests
-endif
-endif
-
-endif # LIBXUL_SDK
-
-ifeq ($(MOZ_BUILD_APP),macbrowser)
-tier_99_dirs += \
- embedding/config \
- camino \
- $(NULL)
-endif
-
-# test harnesses
-ifdef ENABLE_TESTS
-tier_99_dirs += tools/test-harness
-endif
-
-# This should be built last, after all IDL files in the tree have been processed
-ifdef MOZ_JAVAXPCOM
-tier_99_dirs += extensions/java/xpcom/interfaces
-endif
-
default alldep all::
$(RM) -rf $(DIST)/sdk
$(RM) -rf $(DIST)/include
$(MAKE) -C config export
-else # } { MOZ_STANDALONE_BUILD
-
-# Standalone build
+TIERS += base
-ifeq ($(MOZ_BUILD_APP),content/xslt) # {
-DIRS = \
- xpcom/typelib \
- xpcom \
- parser/expat \
- content/xslt/src \
- $(NULL)
-
-SUBMAKEFILES = xpcom/typelib/Makefile
-
-endif # } MOZ_BUILD_APP == content/xslt
-
-ifeq ($(MOZ_BUILD_APP),tools/update-packaging) # {
-DIRS = \
+#
+# tier "base" - basic setup
+#
+tier_base_dirs = \
config \
build \
- modules/libbz2 \
- modules/libmar \
- other-licenses/bsdiff \
$(NULL)
-endif # } MOZ_BUILD_APP == tools/update-packaging
+include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
-ifeq ($(MOZ_BUILD_APP),standalone) # {
-DIRS = $(BUILD_MODULE_DIRS)
+TIERS += testharness
-# Hack to generate xpidl Makefile
-ifneq ($(BUILD_MODULES),all)
-ifneq (,$(findstring xpcom, $(BUILD_MODULE_DIRS)))
-DIRS := xpcom/typelib $(DIRS)
-SUBMAKEFILES := xpcom/typelib/Makefile
-endif
+# test harnesses
+ifdef ENABLE_TESTS
+tier_testharness_dirs += tools/test-harness
endif
-endif # } MOZ_BUILD_APP == standalone
-
-default:: $(SUBMAKEFILES)
- $(MAKE) export
- $(MAKE) libs
-
-endif # } BUILD_MODULES == all or MOZ_STANDALONE
GARBAGE_DIRS += dist
DIST_GARBAGE = config.cache config.log config.status config-defs.h \
@@ -533,39 +82,19 @@ export::
$(RM) -rf $(DIST)/sdk
$(MAKE) -C config export
$(MAKE) tier_nspr
-ifneq ($(BUILD_MODULES),all)
-ifneq (,$(findstring xpcom, $(BUILD_MODULE_DIRS)))
- $(MAKE) -C xpcom/typelib
- $(MAKE) export-idl
-endif
-endif
install::
-ifndef MOZ_NATIVE_NSPR
- $(MAKE) -C nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
- $(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
- $(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
-endif
ifdef MOZ_LDAP_XPCOM
$(MAKE) -C directory/c-sdk real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/ldap
endif
include $(topsrcdir)/config/rules.mk
-# After we build tier 50, go back and build the tools from previous dirs
-tier_50::
- $(MAKE) tools_tier_2
- $(MAKE) tools_tier_9
- $(MAKE) tools_tier_50
-
-# Clean up after pseudo-external modules
-clean clobber realclean clobber_all distclean::
-ifneq (,$(MOZ_NATIVE_NSPR)$(LIBXUL_SDK))
- $(MAKE) -C nsprpub $@
-endif
-ifdef MOZ_LDAP_XPCOM
- $(MAKE) -C directory/c-sdk $@
-endif
+# After we build tier toolki, go back and build the tools from previous dirs
+tier_toolkit::
+ $(MAKE) tools_tier_core
+ $(MAKE) tools_tier_gecko
+ $(MAKE) tools_tier_toolkit
distclean::
cat unallmakefiles | $(XARGS) rm -f
diff --git a/allmakefiles.sh b/allmakefiles.sh
index c5018559278be..d45fdc7ec8e48 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -1678,7 +1678,7 @@ if test -n "$MOZ_SUNBIRD"; then
add_makefiles "$MAKEFILES_sunbird"
fi
-if test "$MOZ_BUILD_APP" = "macbrowser"; then
+if test "$MOZ_BUILD_APP" = "camino"; then
add_makefiles "$MAKEFILES_macbrowser"
fi
diff --git a/js/Makefile.in b/browser/build.mk
similarity index 61%
rename from js/Makefile.in
rename to browser/build.mk
index 7b852f4e0a542..a81af8e711818 100644
--- a/js/Makefile.in
+++ b/browser/build.mk
@@ -1,4 +1,3 @@
-#
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
@@ -12,14 +11,16 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Original Code is mozilla.org code.
+# The Original Code is the Mozilla build system.
#
# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,32 +36,18 @@
#
# ***** END LICENSE BLOCK *****
-DEPTH = ..
-topsrcdir = @top_srcdir@
-VPATH = @srcdir@
-srcdir = @srcdir@
+ifndef LIBXUL_SDK
+include $(topsrcdir)/toolkit/toolkit-tiers.mk
+endif
-include $(DEPTH)/config/autoconf.mk
+TIERS += app
-#
-# Normally DIRS should contain all sub-dirs, but this
-# directory was built to organize code rather than to
-# reflect build order.
-#
-# Thus on the first pass we build the core classes and the
-# top-level Makefile will control the order of subsequent
-# directories by going directly into the specific directories
-#
-# The proper way to do this would be to introduce different
-# stages into the java code build cycle, but that has the
-# potential to introduce too many changes
-#
-# This is necessary to break circular dependencies the logical
-# tree directory structure would otherwise introduce.
-#
-# See top-level makefile for details
-#
+ifdef MOZ_EXTENSIONS
+tier_app_dirs += extensions
+endif
-DIRS = src/fdlibm src
+ifdef MOZ_BRANDING_DIRECTORY
+tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+endif
-include $(topsrcdir)/config/rules.mk
+tier_app_dirs += browser
diff --git a/calendar/build.mk b/calendar/build.mk
new file mode 100644
index 0000000000000..1042cd1e72e42
--- /dev/null
+++ b/calendar/build.mk
@@ -0,0 +1,46 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+ifdef MOZ_BRANDING_DIRECTORY
+tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+endif
+
+tier_app_dirs += \
+ calendar \
+ calendar\sunbird \
+ $(NULL)
diff --git a/camino/build.mk b/camino/build.mk
new file mode 100644
index 0000000000000..7ae397ddaff8f
--- /dev/null
+++ b/camino/build.mk
@@ -0,0 +1,56 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+ifndef LIBXUL_SDK
+include $(topsrcdir)/toolkit/toolkit-tiers.mk
+endif
+
+TIERS += app
+
+ifdef MOZ_EXTENSIONS
+tier_app_dirs += extensions
+endif
+
+ifdef MOZ_BRANDING_DIRECTORY
+tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+endif
+
+tier_app_dirs += \
+ embedding/config \
+ camino \
+ $(NULL)
diff --git a/camino/config/mozconfig b/camino/config/mozconfig
index 955c900a9b759..3dfc45a94ad60 100644
--- a/camino/config/mozconfig
+++ b/camino/config/mozconfig
@@ -1,5 +1,5 @@
-mk_add_options MOZ_CO_PROJECT=macbrowser
-ac_add_options --enable-application=macbrowser
+mk_add_options MOZ_CO_PROJECT=camino
+ac_add_options --enable-application=camino
# Pick the right SDK depending on the CPU. This doesn't even pretend to be
# cross-friendly, but neither do other parts of the Camino build, and it's
diff --git a/client.mk b/client.mk
index 2170bf5949f39..c5ddeb6fbac1e 100644
--- a/client.mk
+++ b/client.mk
@@ -64,7 +64,7 @@
# composer (standalone composer, aka NVU)
# calendar (aka Sunbird, use this to build the calendar extensions also)
# xulrunner
-# macbrowser (aka Camino)
+# camino
#
# Other common MOZ_CO_MODULE options include the following:
# mozilla/other-licenses/libart_lgpl
@@ -111,7 +111,7 @@ AVAILABLE_PROJECTS = \
composer \
calendar \
xulrunner \
- macbrowser \
+ camino \
$(NULL)
# Trailing / on top-level mozilla dir required to stop fast-update thinking
@@ -352,17 +352,17 @@ BOOTSTRAP_xulrunner := \
mozilla/xulrunner/config/mozconfig \
$(NULL)
-MODULES_NS_macbrowser := \
+MODULES_NS_camino := \
$(MODULES_NS_toolkit) \
$(NULL)
-MODULES_macbrowser := \
+MODULES_camino := \
$(MODULES_core) \
mozilla/camino \
mozilla/themes \
$(NULL)
-BOOTSTRAP_macbrowser := \
+BOOTSTRAP_camino := \
$(BOOTSTRAP_toolkit) \
mozilla/camino/config/mozconfig \
$(NULL)
@@ -486,6 +486,7 @@ include $(TOPSRCDIR)/build/unix/modules.mk
# Options that may come from mozconfig
MOZ_PROJECT_LIST := $(subst $(comma), ,$(MOZ_CO_PROJECT))
+MOZ_PROJECT_LIST := $(subst macbrowser,camino,$(MOZ_PROJECT_LIST))
ifneq (,$(filter-out $(AVAILABLE_PROJECTS),$(MOZ_PROJECT_LIST)))
$(error MOZ_CO_PROJECT contains an unrecognized project.)
diff --git a/config/Makefile.in b/config/Makefile.in
index d3ef9057e5a52..744d2e3128cbb 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -110,29 +110,6 @@ ifdef HOST_PROGRAM
$(INSTALL) $(HOST_PROGRAM) $(DIST)/bin
endif
-
-# Copy NSPR to the SDK
-ifndef LIBXUL_SDK
-ifndef MOZ_NATIVE_NSPR
-ABS_DIST = cd $(DIST) && pwd
-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
-ifdef CYGDRIVE_MOUNT
-ABS_DIST = cygpath -w $(DIST) | sed -e 's|\\\\|/|g'
-endif
-endif
-libs::
- _ABS_DIST=`$(ABS_DIST)`; \
- $(MAKE) -C $(DEPTH)/nsprpub install prefix=$$_ABS_DIST/sdk exec_prefix=$$_ABS_DIST/sdk bindir=$$_ABS_DIST/sdk/dummy includedir=$$_ABS_DIST/sdk/include libdir=$$_ABS_DIST/sdk/lib datadir=$$_ABS_DIST/sdk/dummy DESTDIR=
- $(RM) -rf $(DIST)/sdk/dummy
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
- $(RM) -f $(DIST)/sdk/lib/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plds4$(DLL_SUFFIX)
- $(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4_s.$(LIB_SUFFIX)
-else
- $(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX)
-endif
-endif # MOZ_NATIVE_NSPR
-endif # LIBXUL_SDK
-
ifdef WRAP_SYSTEM_INCLUDES
export::
if test ! -d system_wrappers; then mkdir system_wrappers; fi
diff --git a/config/nspr/Makefile.in b/config/nspr/Makefile.in
new file mode 100644
index 0000000000000..face2c7c0eb42
--- /dev/null
+++ b/config/nspr/Makefile.in
@@ -0,0 +1,80 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code. This file was copied from parts of
+# mozilla/config/Makefile.in
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Robert Ginda <rginda@netscape.com>
+# John Taylor <jtaylor@netscape.com>
+# Benjamin Smedberg <benjamin@smedbergs.us>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+ifdef LIBXUL_SDK
+$(error config/nspr/Makefile.in is not compatible with --enable-libxul-sdk=)
+endif
+ifdef MOZ_NATIVE_NSPR
+$(error config/nspr/Makefile.in is not compatible with MOZ_NATIVE_NSPR)
+endif
+
+# Copy NSPR to the SDK
+ABS_DIST = cd $(DIST) && pwd
+ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) # {
+ifdef CYGDRIVE_MOUNT # {
+ABS_DIST = cygpath -w $(DIST) | sed -e 's|\\\\|/|g'
+endif # }
+endif # }
+
+libs::
+ _ABS_DIST=`$(ABS_DIST)`; \
+ $(MAKE) -C $(DEPTH)/nsprpub install prefix=$$_ABS_DIST/sdk exec_prefix=$$_ABS_DIST/sdk bindir=$$_ABS_DIST/sdk/dummy includedir=$$_ABS_DIST/sdk/include libdir=$$_ABS_DIST/sdk/lib datadir=$$_ABS_DIST/sdk/dummy DESTDIR=
+ $(RM) -rf $(DIST)/sdk/dummy
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) # {
+ $(RM) -f $(DIST)/sdk/lib/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plds4$(DLL_SUFFIX)
+ $(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4_s.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4_s.$(LIB_SUFFIX)
+else # } {
+ $(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX)
+endif # }
+
+install::
+ $(MAKE) -C $(DEPTH)/nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
+ $(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
+ $(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
diff --git a/config/nspr/build.mk b/config/nspr/build.mk
new file mode 100644
index 0000000000000..41d46695dd78c
--- /dev/null
+++ b/config/nspr/build.mk
@@ -0,0 +1,48 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+TIERS += nspr
+
+ifdef GC_LEAK_DETECTOR
+tier_nspr_staticdirs = gc/boehm
+endif
+
+ifndef MOZ_NATIVE_NSPR
+tier_nspr_staticdirs += nsprpub
+tier_nspr_dirs += config/nspr
+endif
diff --git a/config/rules.mk b/config/rules.mk
index 6edd8be6f44c5..2911894d17c63 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -800,6 +800,7 @@ run_viewer: $(FINAL_TARGET)/viewer
clean clobber realclean clobber_all:: $(SUBMAKEFILES)
-rm -f $(ALL_TRASH)
-rm -rf $(ALL_TRASH_DIRS)
+ $(foreach dir,$(STATIC_DIRS),make -C $(dir) $@)
+$(LOOP_OVER_DIRS)
+$(LOOP_OVER_TOOL_DIRS)
diff --git a/configure b/configure
index 156f2b72a3d7b..bcfd93781921c 100755
--- a/configure
+++ b/configure
@@ -80,7 +80,7 @@ ac_help="$ac_help
composer
calendar (Sunbird)
xulrunner
- macbrowser (Camino)
+ camino
content/xslt (Standalone Transformiix XSLT)
tools/update-packaging (AUS-related packaging tools)
standalone (use this for standalone
@@ -12305,6 +12305,10 @@ if test "${enable_application+set}" = set; then
fi
+if test "$MOZ_BUILD_APP" == "macbrowser"; then
+ MOZ_BUILD_APP=camino
+fi
+
case "$MOZ_BUILD_APP" in
minimo)
MOZ_EMBEDDING_PROFILE=basic
@@ -12602,7 +12606,7 @@ EOF
fi
;;
-macbrowser)
+camino)
MOZ_APP_NAME=mozilla
_PLATFORM_DEFAULT_TOOLKIT=cocoa
ENABLE_TESTS=
@@ -12941,7 +12945,7 @@ fi
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12945: checking for $ac_word" >&5
+echo "configure:12949: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -12976,7 +12980,7 @@ fi
min_gtk_version=$GTK_VERSION
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12980: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12984: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
@@ -12999,7 +13003,7 @@ echo "configure:12980: checking for GTK - version >= $min_gtk_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 13003 "configure"
+#line 13007 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -13077,7 +13081,7 @@ main ()
}
EOF
-if { (eval echo configure:13081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -13112,7 +13116,7 @@ fi
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13116 "configure"
+#line 13120 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -13122,7 +13126,7 @@ int main() {
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
-if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -13173,7 +13177,7 @@ then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13177: checking for $ac_word" >&5
+echo "configure:13181: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13217,19 +13221,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6
-echo "configure:13221: checking for gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5
+echo "configure:13225: checking for gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5
if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
-echo "configure:13228: checking MOZ_GTK2_CFLAGS" >&5
+echo "configure:13232: checking MOZ_GTK2_CFLAGS" >&5
MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0"`
echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
-echo "configure:13233: checking MOZ_GTK2_LIBS" >&5
+echo "configure:13237: checking MOZ_GTK2_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
@@ -13293,7 +13297,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13297: checking for $ac_word" >&5
+echo "configure:13301: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13345,7 +13349,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
-echo "configure:13349: checking for main in -lqt" >&5
+echo "configure:13353: checking for main in -lqt" >&5
ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -13353,14 +13357,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lqt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13357 "configure"
+#line 13361 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:13364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13379,7 +13383,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
-echo "configure:13383: checking for main in -lqt-mt" >&5
+echo "configure:13387: checking for main in -lqt-mt" >&5
ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -13387,14 +13391,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lqt-mt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13391 "configure"
+#line 13395 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:13398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -13430,9 +13434,9 @@ fi
LIBS="$LIBS $QT_LIBS"
echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
-echo "configure:13434: checking Qt - version >= $QT_VERSION" >&5
+echo "configure:13438: checking Qt - version >= $QT_VERSION" >&5
cat > conftest.$ac_ext <<EOF
-#line 13436 "configure"
+#line 13440 "configure"
#include "confdefs.h"
#include <qglobal.h>
int main() {
@@ -13443,7 +13447,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:13447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes"
else
@@ -13728,7 +13732,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13732: checking for $ac_word" >&5
+echo "configure:13736: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13772,19 +13776,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for xft""... $ac_c" 1>&6
-echo "configure:13776: checking for xft" >&5
+echo "configure:13780: checking for xft" >&5
if $PKG_CONFIG --exists "xft" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
-echo "configure:13783: checking MOZ_XFT_CFLAGS" >&5
+echo "configure:13787: checking MOZ_XFT_CFLAGS" >&5
MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
-echo "configure:13788: checking MOZ_XFT_LIBS" >&5
+echo "configure:13792: checking MOZ_XFT_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
@@ -13817,7 +13821,7 @@ echo "configure:13788: checking MOZ_XFT_LIBS" >&5
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13821: checking for $ac_word" >&5
+echo "configure:13825: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13861,19 +13865,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6
-echo "configure:13865: checking for pango >= 1.1.0" >&5
+echo "configure:13869: checking for pango >= 1.1.0" >&5
if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
-echo "configure:13872: checking _PANGOCHK_CFLAGS" >&5
+echo "configure:13876: checking _PANGOCHK_CFLAGS" >&5
_PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
-echo "configure:13877: checking _PANGOCHK_LIBS" >&5
+echo "configure:13881: checking _PANGOCHK_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
_PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= 1.1.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
@@ -13931,7 +13935,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13935: checking for $ac_word" >&5
+echo "configure:13939: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -13975,19 +13979,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6
-echo "configure:13979: checking for pangoxft >= 1.6.0" >&5
+echo "configure:13983: checking for pangoxft >= 1.6.0" >&5
if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
-echo "configure:13986: checking MOZ_PANGO_CFLAGS" >&5
+echo "configure:13990: checking MOZ_PANGO_CFLAGS" >&5
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"`
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
-echo "configure:13991: checking MOZ_PANGO_LIBS" >&5
+echo "configure:13995: checking MOZ_PANGO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pangoxft >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
@@ -14043,7 +14047,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14047: checking for $ac_word" >&5
+echo "configure:14051: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14087,19 +14091,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0""... $ac_c" 1>&6
-echo "configure:14091: checking for pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" >&5
+echo "configure:14095: checking for pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" >&5
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
-echo "configure:14098: checking MOZ_PANGO_CFLAGS" >&5
+echo "configure:14102: checking MOZ_PANGO_CFLAGS" >&5
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0"`
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
-echo "configure:14103: checking MOZ_PANGO_LIBS" >&5
+echo "configure:14107: checking MOZ_PANGO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
@@ -14133,7 +14137,7 @@ echo "configure:14103: checking MOZ_PANGO_LIBS" >&5
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14137: checking for $ac_word" >&5
+echo "configure:14141: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14177,19 +14181,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
-echo "configure:14181: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
+echo "configure:14185: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
-echo "configure:14188: checking MOZ_PANGO_CFLAGS" >&5
+echo "configure:14192: checking MOZ_PANGO_CFLAGS" >&5
MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
-echo "configure:14193: checking MOZ_PANGO_LIBS" >&5
+echo "configure:14197: checking MOZ_PANGO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
@@ -14257,7 +14261,7 @@ then
_SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$XLDFLAGS $LDFLAGS"
echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
-echo "configure:14261: checking for XpGetPrinterList in -lXp" >&5
+echo "configure:14265: checking for XpGetPrinterList in -lXp" >&5
ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -14265,7 +14269,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14269 "configure"
+#line 14273 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14276,7 +14280,7 @@ int main() {
XpGetPrinterList()
; return 0; }
EOF
-if { (eval echo configure:14280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14348,7 +14352,7 @@ fi
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14352: checking for $ac_word" >&5
+echo "configure:14356: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14392,19 +14396,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
-echo "configure:14396: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
+echo "configure:14400: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6
-echo "configure:14403: checking MOZ_GNOMEVFS_CFLAGS" >&5
+echo "configure:14407: checking MOZ_GNOMEVFS_CFLAGS" >&5
MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`
echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6
-echo "configure:14408: checking MOZ_GNOMEVFS_LIBS" >&5
+echo "configure:14412: checking MOZ_GNOMEVFS_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6
@@ -14453,7 +14457,7 @@ echo "configure:14408: checking MOZ_GNOMEVFS_LIBS" >&5
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14457: checking for $ac_word" >&5
+echo "configure:14461: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14497,19 +14501,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
-echo "configure:14501: checking for gconf-2.0 >= $GCONF_VERSION" >&5
+echo "configure:14505: checking for gconf-2.0 >= $GCONF_VERSION" >&5
if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
-echo "configure:14508: checking MOZ_GCONF_CFLAGS" >&5
+echo "configure:14512: checking MOZ_GCONF_CFLAGS" >&5
MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`
echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
-echo "configure:14513: checking MOZ_GCONF_LIBS" >&5
+echo "configure:14517: checking MOZ_GCONF_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6
@@ -14554,7 +14558,7 @@ echo "configure:14513: checking MOZ_GCONF_LIBS" >&5
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14558: checking for $ac_word" >&5
+echo "configure:14562: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14598,19 +14602,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
-echo "configure:14602: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
+echo "configure:14606: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6
-echo "configure:14609: checking MOZ_LIBGNOME_CFLAGS" >&5
+echo "configure:14613: checking MOZ_LIBGNOME_CFLAGS" >&5
MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`
echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6
echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6
-echo "configure:14614: checking MOZ_LIBGNOME_LIBS" >&5
+echo "configure:14618: checking MOZ_LIBGNOME_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6
@@ -14686,7 +14690,7 @@ fi
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14690: checking for $ac_word" >&5
+echo "configure:14694: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -14730,19 +14734,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
-echo "configure:14734: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
+echo "configure:14738: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6
-echo "configure:14741: checking MOZ_GNOMEUI_CFLAGS" >&5
+echo "configure:14745: checking MOZ_GNOMEUI_CFLAGS" >&5
MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`
echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6
echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6
-echo "configure:14746: checking MOZ_GNOMEUI_LIBS" >&5
+echo "configure:14750: checking MOZ_GNOMEUI_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6
@@ -15294,7 +15298,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then
# Extract the first word of "javac", so it can be a program name with args.
set dummy javac; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15298: checking for $ac_word" >&5
+echo "configure:15302: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15330,7 +15334,7 @@ fi
# Extract the first word of "jar", so it can be a program name with args.
set dummy jar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15334: checking for $ac_word" >&5
+echo "configure:15338: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15659,13 +15663,13 @@ fi
echo $ac_n "checking for tar archiver""... $ac_c" 1>&6
-echo "configure:15663: checking for tar archiver" >&5
+echo "configure:15667: checking for tar archiver" >&5
for ac_prog in gnutar gtar tar
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15669: checking for $ac_word" >&5
+echo "configure:15673: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -15720,13 +15724,13 @@ case "$target_os" in
msvc*|mks*|cygwin*|mingw*|wince*)
if test -n "$MOZ_UPDATER"; then
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:15724: checking for iconv" >&5
+echo "configure:15728: checking for iconv" >&5
for ac_prog in $HOST_ICONV "iconv"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15730: checking for $ac_word" >&5
+echo "configure:15734: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -16088,18 +16092,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED"
if test -n "$MOZ_DEBUG"; then
echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
-echo "configure:16092: checking for valid debug flags" >&5
+echo "configure:16096: checking for valid debug flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
cat > conftest.$ac_ext <<EOF
-#line 16096 "configure"
+#line 16100 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:16103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -16140,18 +16144,18 @@ fi
if test "$COMPILE_ENVIRONMENT"; then
if test -n "$MOZ_OPTIMIZE"; then
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
-echo "configure:16144: checking for valid optimization flags" >&5
+echo "configure:16148: checking for valid optimization flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
cat > conftest.$ac_ext <<EOF
-#line 16148 "configure"
+#line 16152 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:16155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -16304,7 +16308,7 @@ fi
if test -n "$_ENABLE_EFENCE"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
-echo "configure:16308: checking for malloc in -lefence" >&5
+echo "configure:16312: checking for malloc in -lefence" >&5
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -16312,7 +16316,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16316 "configure"
+#line 16320 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -16323,7 +16327,7 @@ int main() {
malloc()
; return 0; }
EOF
-if { (eval echo configure:16327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -16424,12 +16428,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16428: checking for $ac_func" >&5
+echo "configure:16432: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16433 "configure"
+#line 16437 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -16455,7 +16459,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:16459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -16698,12 +16702,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
for ac_func in __cxa_demangle
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16702: checking for $ac_func" >&5
+echo "configure:16706: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 16707 "configure"
+#line 16711 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -16729,7 +16733,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:16733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -16867,7 +16871,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
# Compiler Options
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
-echo "configure:16871: checking for gcc -pipe support" >&5
+echo "configure:16875: checking for gcc -pipe support" >&5
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
echo '#include <stdio.h>' > dummy-hello.c
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
@@ -16882,14 +16886,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -pipe"
cat > conftest.$ac_ext <<EOF
-#line 16886 "configure"
+#line 16890 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
-if { (eval echo configure:16893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_res_gcc_pipe="yes"
else
@@ -16931,16 +16935,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
-echo "configure:16935: checking whether compiler supports -Wno-long-long" >&5
+echo "configure:16939: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF
-#line 16937 "configure"
+#line 16941 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
-if { (eval echo configure:16944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@@ -16961,16 +16965,16 @@ _SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fprofile-generate"
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
-echo "configure:16965: checking whether C compiler supports -fprofile-generate" >&5
+echo "configure:16969: checking whether C compiler supports -fprofile-generate" >&5
cat > conftest.$ac_ext <<EOF
-#line 16967 "configure"
+#line 16971 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:16974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-generate"
result="yes"
@@ -16988,16 +16992,16 @@ if test $result = "yes"; then
else
CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
-echo "configure:16992: checking whether C compiler supports -fprofile-arcs" >&5
+echo "configure:16996: checking whether C compiler supports -fprofile-arcs" >&5
cat > conftest.$ac_ext <<EOF
-#line 16994 "configure"
+#line 16998 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
-if { (eval echo configure:17001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-arcs"
result="yes"
@@ -17043,18 +17047,18 @@ if test "$_PEDANTIC"; then
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
-echo "configure:17047: checking whether C++ compiler has -pedantic long long bug" >&5
+echo "configure:17051: checking whether C++ compiler has -pedantic long long bug" >&5
if test "$cross_compiling" = yes; then
result="maybe"
else
cat > conftest.$ac_ext <<EOF
-#line 17052 "configure"
+#line 17056 "configure"
#include "confdefs.h"
int main () {
if (sizeof(long long) != 8) { return 1; }
return 0; }
EOF
-if { (eval echo configure:17058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="no"
else
@@ -17084,12 +17088,12 @@ fi
fi
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
-echo "configure:17088: checking for correct temporary object destruction order" >&5
+echo "configure:17092: checking for correct temporary object destruction order" >&5
if test "$cross_compiling" = yes; then
result="maybe"
else
cat > conftest.$ac_ext <<EOF
-#line 17093 "configure"
+#line 17097 "configure"
#include "confdefs.h"
class A {
public: A(int& x) : mValue(x) {}
@@ -17109,7 +17113,7 @@ else
}
EOF
-if { (eval echo configure:17113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="yes"
else
@@ -17130,12 +17134,12 @@ fi
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
-echo "configure:17134: checking for correct overload resolution with const and templates" >&5
+echo "configure:17138: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 17139 "configure"
+#line 17143 "configure"
#include "confdefs.h"
template <class T>
@@ -17165,7 +17169,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:17169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@@ -17440,7 +17444,7 @@ then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17444: checking for $ac_word" >&5
+echo "configure:17448: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17484,19 +17488,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6
-echo "configure:17488: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
+echo "configure:17492: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
-echo "configure:17495: checking LIBIDL_CFLAGS" >&5
+echo "configure:17499: checking LIBIDL_CFLAGS" >&5
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"`
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
-echo "configure:17500: checking LIBIDL_LIBS" >&5
+echo "configure:17504: checking LIBIDL_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$LIBIDL_LIBS" 1>&6
@@ -17618,7 +17622,7 @@ fi
# Extract the first word of "glib-config", so it can be a program name with args.
set dummy glib-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17622: checking for $ac_word" >&5
+echo "configure:17626: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17653,7 +17657,7 @@ fi
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:17657: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:17661: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -17676,7 +17680,7 @@ echo "configure:17657: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 17680 "configure"
+#line 17684 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -17752,7 +17756,7 @@ main ()
}
EOF
-if { (eval echo configure:17756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17786,7 +17790,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 17790 "configure"
+#line 17794 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -17796,7 +17800,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
-if { (eval echo configure:17800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -17840,7 +17844,7 @@ rm -f conftest*
# Extract the first word of "libIDL-config", so it can be a program name with args.
set dummy libIDL-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:17844: checking for $ac_word" >&5
+echo "configure:17848: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -17875,7 +17879,7 @@ fi
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
-echo "configure:17879: checking for libIDL - version >= $min_libIDL_version" >&5
+echo "configure:17883: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@@ -17902,7 +17906,7 @@ echo "configure:17879: checking for libIDL - version >= $min_libIDL_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 17906 "configure"
+#line 17910 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17988,7 +17992,7 @@ main ()
}
EOF
-if { (eval echo configure:17992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -18022,7 +18026,7 @@ fi
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 18026 "configure"
+#line 18030 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -18033,7 +18037,7 @@ int main() {
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
-if { (eval echo configure:18037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
@@ -18161,7 +18165,7 @@ fi
# Extract the first word of "glib-config", so it can be a program name with args.
set dummy glib-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18165: checking for $ac_word" >&5
+echo "configure:18169: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18196,7 +18200,7 @@ fi
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:18200: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:18204: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -18219,7 +18223,7 @@ echo "configure:18200: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 18223 "configure"
+#line 18227 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -18295,7 +18299,7 @@ main ()
}
EOF
-if { (eval echo configure:18299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -18329,7 +18333,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 18333 "configure"
+#line 18337 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -18339,7 +18343,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
-if { (eval echo configure:18343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -18383,7 +18387,7 @@ rm -f conftest*
# Extract the first word of "libIDL-config", so it can be a program name with args.
set dummy libIDL-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18387: checking for $ac_word" >&5
+echo "configure:18391: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18418,7 +18422,7 @@ fi
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
-echo "configure:18422: checking for libIDL - version >= $min_libIDL_version" >&5
+echo "configure:18426: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@@ -18445,7 +18449,7 @@ echo "configure:18422: checking for libIDL - version >= $min_libIDL_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 18449 "configure"
+#line 18453 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -18531,7 +18535,7 @@ main ()
}
EOF
-if { (eval echo configure:18535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -18565,7 +18569,7 @@ fi
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 18569 "configure"
+#line 18573 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -18576,7 +18580,7 @@ int main() {
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
-if { (eval echo configure:18580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
@@ -18616,7 +18620,7 @@ rm -f conftest*
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18620: checking for $ac_word" >&5
+echo "configure:18624: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18660,19 +18664,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
-echo "configure:18664: checking for libIDL-2.0 >= 0.8.0" >&5
+echo "configure:18668: checking for libIDL-2.0 >= 0.8.0" >&5
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
-echo "configure:18671: checking LIBIDL_CFLAGS" >&5
+echo "configure:18675: checking LIBIDL_CFLAGS" >&5
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
-echo "configure:18676: checking LIBIDL_LIBS" >&5
+echo "configure:18680: checking LIBIDL_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$LIBIDL_LIBS" 1>&6
@@ -18707,7 +18711,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18711: checking for $ac_word" >&5
+echo "configure:18715: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18744,7 +18748,7 @@ done
if test -n "$ORBIT_CONFIG"; then
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
-echo "configure:18748: checking for ORBit libIDL usability" >&5
+echo "configure:18752: checking for ORBit libIDL usability" >&5
_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
_ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
_ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
@@ -18761,7 +18765,7 @@ echo "configure:18748: checking for ORBit libIDL usability" >&5
result="maybe"
else
cat > conftest.$ac_ext <<EOF
-#line 18765 "configure"
+#line 18769 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -18776,7 +18780,7 @@ int main() {
}
EOF
-if { (eval echo configure:18780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
_LIBIDL_FOUND=1
result="yes"
@@ -18832,7 +18836,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18836: checking for $ac_word" >&5
+echo "configure:18840: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -18876,19 +18880,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6
-echo "configure:18880: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
+echo "configure:18884: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
-echo "configure:18887: checking GLIB_CFLAGS" >&5
+echo "configure:18891: checking GLIB_CFLAGS" >&5
GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"`
echo "$ac_t""$GLIB_CFLAGS" 1>&6
echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
-echo "configure:18892: checking GLIB_LIBS" >&5
+echo "configure:18896: checking GLIB_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$GLIB_LIBS" 1>&6
@@ -18971,7 +18975,7 @@ fi
# Extract the first word of "glib-config", so it can be a program name with args.
set dummy glib-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18975: checking for $ac_word" >&5
+echo "configure:18979: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19006,7 +19010,7 @@ fi
min_glib_version=${GLIB_VERSION}
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:19010: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:19014: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -19029,7 +19033,7 @@ echo "configure:19010: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 19033 "configure"
+#line 19037 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -19105,7 +19109,7 @@ main ()
}
EOF
-if { (eval echo configure:19109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:19113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -19139,7 +19143,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 19143 "configure"
+#line 19147 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -19149,7 +19153,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
-if { (eval echo configure:19153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -19229,19 +19233,19 @@ mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl" 1>&2; exit 1; }
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:19233: checking for working alloca.h" >&5
+echo "configure:19237: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19238 "configure"
+#line 19242 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:19245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -19262,12 +19266,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:19266: checking for alloca" >&5
+echo "configure:19270: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19271 "configure"
+#line 19275 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -19295,7 +19299,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:19299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -19327,12 +19331,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:19331: checking whether alloca needs Cray hooks" >&5
+echo "configure:19335: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19336 "configure"
+#line 19340 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -19357,12 +19361,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19361: checking for $ac_func" >&5
+echo "configure:19365: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19366 "configure"
+#line 19370 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -19385,7 +19389,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:19389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -19412,7 +19416,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:19416: checking stack direction for C alloca" >&5
+echo "configure:19420: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19420,7 +19424,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 19424 "configure"
+#line 19428 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -19439,7 +19443,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:19443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:19447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -19488,17 +19492,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:19492: checking for $ac_hdr" >&5
+echo "configure:19496: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 19497 "configure"
+#line 19501 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:19506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -19567,7 +19571,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:19571: checking for $ac_word" >&5
+echo "configure:19575: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19611,19 +19615,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for fontconfig freetype2""... $ac_c" 1>&6
-echo "configure:19615: checking for fontconfig freetype2" >&5
+echo "configure:19619: checking for fontconfig freetype2" >&5
if $PKG_CONFIG --exists "fontconfig freetype2" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6
-echo "configure:19622: checking CAIRO_FT_CFLAGS" >&5
+echo "configure:19626: checking CAIRO_FT_CFLAGS" >&5
CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"`
echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6
-echo "configure:19627: checking CAIRO_FT_LIBS" >&5
+echo "configure:19631: checking CAIRO_FT_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$CAIRO_FT_LIBS" 1>&6
@@ -19711,7 +19715,7 @@ echo "configure:19627: checking CAIRO_FT_LIBS" >&5
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:19715: checking for $ac_word" >&5
+echo "configure:19719: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -19755,19 +19759,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo >= $CAIRO_VERSION freetype2 fontconfig""... $ac_c" 1>&6
-echo "configure:19759: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
+echo "configure:19763: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then
echo "$ac_t""yes" 1>&6
succeeded=yes
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
-echo "configure:19766: checking CAIRO_CFLAGS" >&5
+echo "configure:19770: checking CAIRO_CFLAGS" >&5
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"`
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
-echo "configure:19771: checking CAIRO_LIBS" >&5
+echo "configure:19775: checking CAIRO_LIBS" >&5
## Remove evil flags like -Wl,--export-dynamic
CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`"
echo "$ac_t""$CAIRO_LIBS" 1>&6
@@ -19831,7 +19835,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python` -ne 0; then
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:19835: checking for $ac_word" >&5
+echo "configure:19839: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -20158,14 +20162,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 20162 "configure"
+#line 20166 "configure"
#include "confdefs.h"
#include <gmodule.h>
int main() {
int x = 1; x++;
; return 0; }
EOF
-if { (eval echo configure:20169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -20474,7 +20478,7 @@ if test "$MOZ_X11"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 20478 "configure"
+#line 20482 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -20491,7 +20495,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:20495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
diff --git a/configure.in b/configure.in
index 83ede515de8b2..9acbef7735b3d 100644
--- a/configure.in
+++ b/configure.in
@@ -4103,13 +4103,17 @@ MOZ_ARG_ENABLE_STRING(application,
composer
calendar (Sunbird)
xulrunner
- macbrowser (Camino)
+ camino
content/xslt (Standalone Transformiix XSLT)
tools/update-packaging (AUS-related packaging tools)
standalone (use this for standalone
xpcom/xpconnect or to manually drive a build)],
[ MOZ_BUILD_APP=$enableval ] )
+if test "$MOZ_BUILD_APP" == "macbrowser"; then
+ MOZ_BUILD_APP=camino
+fi
+
case "$MOZ_BUILD_APP" in
minimo)
MOZ_EMBEDDING_PROFILE=basic
@@ -4366,7 +4370,7 @@ xulrunner)
fi
;;
-macbrowser)
+camino)
MOZ_APP_NAME=mozilla
_PLATFORM_DEFAULT_TOOLKIT=cocoa
ENABLE_TESTS=
diff --git a/content/xslt/build.mk b/content/xslt/build.mk
new file mode 100644
index 0000000000000..b224599fb9510
--- /dev/null
+++ b/content/xslt/build.mk
@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+include $(topsrcdir)/config/nspr/build.mk
+include $(topsrcdir)/xpcom/build.mk
+
+TIERS += app
+
+tier_app_dirs += \
+ parser/expat \
+ content/xslt/src \
+ $(NULL)
diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in
index bc994b5e622ea..be2f886099305 100644
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -84,6 +84,7 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
INCLUDES += \
+ -I$(srcdir)/../../public \
-I$(srcdir) \
-I$(srcdir)/../xml \
-I$(srcdir)/../xpath \
diff --git a/embedding/config/Makefile.in b/embedding/config/Makefile.in
index 72a82400b29eb..04805598d1420 100644
--- a/embedding/config/Makefile.in
+++ b/embedding/config/Makefile.in
@@ -71,9 +71,9 @@ endif
embed_chrome: embed-jar.mn
ifneq (jar,$(MOZ_CHROME_FILE_FORMAT))
- $(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/bin/chrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/chrome < $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
- -$(RM) -f $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
+ $(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/bin/chrome > embed-tmp.mn
+ $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/chrome < embed-tmp.mn
+ -$(RM) -f embed-tmp.mn
else
-$(RM) -rf $(DIST)/Embed/tmpchrome
for f in $(DIST)/bin/chrome/*.jar; do \
@@ -82,9 +82,9 @@ else
$(NSINSTALL) -D $(DIST)/Embed/tmpchrome/$$b ;\
$(UNZIP) -q -o -d $(DIST)/Embed/tmpchrome/$$b $$f ; \
done
- $(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/Embed/tmpchrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
- $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/Embed/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
- -$(RM) -f $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
+ $(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/Embed/tmpchrome > embed-tmp.mn
+ $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/Embed/tmpchrome -z $(ZIP) < embed-tmp.mn
+ -$(RM) -f embed-tmp.mn
-$(RM) -rf $(DIST)/Embed/tmpchrome
endif
diff --git a/js/src/build.mk b/js/src/build.mk
new file mode 100644
index 0000000000000..4ebd83fdd1aa3
--- /dev/null
+++ b/js/src/build.mk
@@ -0,0 +1,44 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+TIERS += js
+
+tier_js_dirs += \
+ js/src/fdlibm \
+ js/src \
+ $(NULL)
diff --git a/mail/build.mk b/mail/build.mk
new file mode 100644
index 0000000000000..514747c84c1fa
--- /dev/null
+++ b/mail/build.mk
@@ -0,0 +1,57 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+ifndef LIBXUL_SDK
+include $(topsrcdir)/toolkit/toolkit-tiers.mk
+endif
+
+TIERS += app
+
+ifdef MOZ_EXTENSIONS
+tier_app_dirs += extensions
+endif
+
+ifdef MOZ_BRANDING_DIRECTORY
+tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+endif
+
+tier_app_dirs += \
+ editor/ui \
+ mailnews \
+ mail \
+ $(NULL)
diff --git a/minimo/build.mk b/minimo/build.mk
new file mode 100644
index 0000000000000..fbe5cc9b4e6af
--- /dev/null
+++ b/minimo/build.mk
@@ -0,0 +1,51 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+ifndef LIBXUL_SDK
+include $(topsrcdir)/toolkit/toolkit-tiers.mk
+endif
+
+TIERS += app
+
+ifdef MOZ_EXTENSIONS
+tier_app_dirs += extensions
+endif
+
+tier_app_dirs += \
+ minimo \
+ $(NULL)
diff --git a/suite/build.mk b/suite/build.mk
new file mode 100644
index 0000000000000..15e10cb4df8f3
--- /dev/null
+++ b/suite/build.mk
@@ -0,0 +1,73 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+ifndef LIBXUL_SDK
+include $(topsrcdir)/toolkit/toolkit-tiers.mk
+endif
+
+TIERS += app
+
+ifdef MOZ_EXTENSIONS
+tier_app_dirs += extensions
+endif
+
+ifdef MOZ_BRANDING_DIRECTORY
+tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+endif
+
+ifdef MOZ_MAIL_NEWS
+tier_app_dirs += mailnews
+endif
+
+ifdef MOZ_COMPOSER
+tier_app_dirs += editor/ui
+endif
+
+tier_app_dirs += \
+ xpfe/components/search \
+ xpfe/components/bookmarks \
+ $(NULL)
+
+# When Suite becomes a full MOZ_XUL_APP we can remove this ifdef
+ifdef MOZ_XUL_APP
+tier_app_dirs += themes
+else
+tier_app_dirs += suite
+endif
+
+tier_app_dirs += xpfe/bootstrap
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
new file mode 100644
index 0000000000000..ce8336600e5ec
--- /dev/null
+++ b/toolkit/toolkit-tiers.mk
@@ -0,0 +1,303 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+ifdef LIBXUL_SDK
+$(error toolkit-tiers.mk is not compatible with --enable-libxul-sdk=)
+endif
+
+include $(topsrcdir)/config/nspr/build.mk
+include $(topsrcdir)/js/src/build.mk
+include $(topsrcdir)/xpcom/build.mk
+
+TIERS += \
+ external \
+ gecko \
+ toolkit \
+ $(NULL)
+
+#
+# tier "external" - 3rd party individual libraries
+#
+
+ifndef MOZ_NATIVE_JPEG
+tier_external_dirs += jpeg
+endif
+
+ifndef MOZ_NATIVE_ZLIB
+tier_external_dirs += modules/zlib
+endif
+
+# Installer needs standalone libjar, hence standalone zlib
+ifdef MOZ_INSTALLER
+tier_external_dirs += modules/zlib/standalone
+endif
+
+ifdef MOZ_UPDATER
+tier_external_dirs += modules/libbz2
+tier_external_dirs += modules/libmar
+endif
+
+#
+# tier "gecko" - core components (necko,gecko)
+#
+
+ifneq (,$(MOZ_NO_XPCOM_OBSOLETE)$(MOZ_XPINSTALL))
+tier_gecko_dirs += modules/libreg
+endif
+
+ifndef MOZ_NO_XPCOM_OBSOLETE
+tier_gecko_dirs += xpcom/obsolete
+endif
+
+ifdef NS_TRACE_MALLOC
+tier_gecko_dirs += tools/trace-malloc/lib
+endif
+
+tier_gecko_dirs += \
+ js/src/xpconnect \
+ intl \
+ $(NULL)
+
+ifdef MOZ_ENABLE_XLIB
+tier_gecko_dirs += gfx/src/xlibrgb widget/src/xlibxtbin
+endif
+
+ifdef MOZ_ENABLE_GTK
+tier_gecko_dirs += widget/src/gtksuperwin widget/src/gtkxtbin
+endif
+
+ifdef MOZ_ENABLE_GTK2
+tier_gecko_dirs += widget/src/gtkxtbin
+endif
+
+ifdef MOZ_IPCD
+tier_gecko_dirs += ipc/ipcd
+endif
+
+tier_gecko_dirs += \
+ modules/libutil \
+ netwerk \
+ modules/libjar \
+ db \
+ $(NULL)
+
+ifdef MOZ_PERMISSIONS
+tier_gecko_dirs += \
+ extensions/cookie \
+ extensions/permissions \
+ $(NULL)
+endif
+
+ifdef MOZ_STORAGE
+tier_gecko_dirs += storage
+endif
+
+ifdef MOZ_XUL
+tier_gecko_dirs += rdf
+endif
+
+ifdef MOZ_JSDEBUGGER
+tier_gecko_dirs += js/jsd
+endif
+
+tier_gecko_dirs += \
+ uriloader \
+ modules/libpref \
+ modules/libimg \
+ caps \
+ parser/expat \
+ parser/xml \
+ parser/htmlparser \
+ gfx \
+ modules/libpr0n \
+ sun-java \
+ modules/plugin \
+ dom \
+ view \
+ widget \
+ content \
+ layout \
+ docshell \
+ webshell \
+ embedding \
+ editor \
+ xpfe/appshell \
+ $(NULL)
+
+# Java Embedding Plugin
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+tier_gecko_dirs += plugin/oji/JEP
+endif
+
+ifdef MOZ_AUTH_EXTENSION
+tier_gecko_dirs += extensions/auth
+endif
+
+ifdef MOZ_XMLEXTRAS
+tier_gecko_dirs += extensions/xmlextras
+endif
+
+ifdef MOZ_WEBSERVICES
+tier_gecko_dirs += extensions/webservices
+endif
+
+ifdef MOZ_UNIVERSALCHARDET
+tier_gecko_dirs += extensions/universalchardet
+endif
+
+ifdef MOZ_OJI
+tier_gecko_dirs += \
+ js/src/liveconnect \
+ modules/oji \
+ $(NULL)
+endif
+
+ifdef ACCESSIBILITY
+tier_gecko_dirs += accessible
+endif
+
+#
+# tier "toolkit" - xpfe & toolkit
+#
+# The division of "gecko" and "toolkit" is somewhat arbitrary, and related
+# to history where "gecko" wasn't forked between seamonkey/firefox but
+# "toolkit" was.
+#
+
+ifdef MOZ_XUL_APP
+tier_toolkit_dirs += chrome
+else
+ifdef MOZ_XUL
+tier_toolkit_dirs += rdf/chrome
+else
+tier_toolkit_dirs += embedding/minimo/chromelite
+endif
+endif
+
+tier_toolkit_dirs += profile
+
+# This must preceed xpfe
+ifdef MOZ_JPROF
+tier_toolkit_dirs += tools/jprof
+endif
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+tier_toolkit_dirs += xpfe/bootstrap/appleevents
+endif
+
+tier_toolkit_dirs += \
+ xpfe \
+ toolkit/components \
+ $(NULL)
+
+ifndef MOZ_XUL_APP
+tier_toolkit_dirs += themes
+endif
+
+ifdef MOZ_ENABLE_XREMOTE
+tier_toolkit_dirs += widget/src/xremoteclient
+endif
+
+ifdef MOZ_SPELLCHECK
+tier_toolkit_dirs += extensions/spellcheck
+endif
+
+ifdef MOZ_XUL_APP
+tier_toolkit_dirs += toolkit
+endif
+
+ifdef MOZ_XPINSTALL
+tier_toolkit_dirs += xpinstall
+endif
+
+ifdef MOZ_PSM
+tier_toolkit_dirs += security/manager
+else
+tier_toolkit_dirs += security/manager/boot/public security/manager/ssl/public
+endif
+
+ifdef MOZ_PREF_EXTENSIONS
+tier_toolkit_dirs += extensions/pref
+endif
+
+ifdef MOZ_JAVAXPCOM
+tier_toolkit_dirs += extensions/java
+endif
+
+ifndef BUILD_STATIC_LIBS
+ifdef MOZ_XUL_APP
+ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2))
+tier_toolkit_dirs += embedding/browser/gtk
+endif
+endif
+endif
+
+ifdef MOZ_XUL_APP
+ifndef BUILD_STATIC_LIBS
+tier_toolkit_dirs += toolkit/library
+endif
+endif
+
+ifdef MOZ_ENABLE_LIBXUL
+tier_toolkit_dirs += xpcom/stub
+endif
+
+ifdef NS_TRACE_MALLOC
+tier_toolkit_dirs += tools/trace-malloc
+endif
+
+ifdef MOZ_LDAP_XPCOM
+tier_toolkit_staticdirs += directory/c-sdk
+tier_toolkit_dirs += directory/xpcom
+endif
+
+ifndef MINIMO
+ifdef MOZ_XUL_APP
+ifdef MOZ_ENABLE_GTK2
+tier_toolkit_dirs += toolkit/components/gnome
+endif
+endif
+endif
+
+ifdef MOZ_LEAKY
+tier_toolkit_dirs += tools/leaky
+endif
+
+ifdef MOZ_MAPINFO
+tier_toolkit_dirs += tools/codesighs
+endif
diff --git a/tools/update-packaging/build.mk b/tools/update-packaging/build.mk
new file mode 100644
index 0000000000000..a3b6e9722fa8f
--- /dev/null
+++ b/tools/update-packaging/build.mk
@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+include $(topsrcdir)/config/nspr/build.mk
+
+TIERS += app
+
+tier_app_dirs += \
+ modules/libbz2 \
+ modules/libmar \
+ other-licenses/bsdiff \
+ $(NULL)
diff --git a/xpcom/build.mk b/xpcom/build.mk
new file mode 100644
index 0000000000000..d943ce98243c3
--- /dev/null
+++ b/xpcom/build.mk
@@ -0,0 +1,41 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+TIERS += xpcom
+
+tier_xpcom_dirs = xpcom
--
GitLab