Bug 545055, Port |Bug 460913 - Installer shouldn't copy xulrunner files into Firefox install directory| to comm-central. r+=KaiRo.
authorJustin Wood <Callek@gmail.com>
Mon, 29 Mar 2010 22:54:50 -0400
changeset 5318 1dfde698a59b6669a3ab5e021789457a5946aac3
parent 5317 d64392a6e23fdae02e9f6392de3b863a7aa21739
child 5319 f29f7dfd4b5a72701000a644c60a24d6327a1dbf
push idunknown
push userunknown
push dateunknown
bugs545055, 460913
Bug 545055, Port |Bug 460913 - Installer shouldn't copy xulrunner files into Firefox install directory| to comm-central. r+=KaiRo.
config/autoconf.mk.in
config/rules.mk
configure.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -71,16 +71,17 @@ sdkdir		= $(libdir)/$(MOZ_APP_NAME)-deve
 
 MOZDEPTH	= $(DEPTH)/mozilla
 DIST		= $(MOZDEPTH)/dist
 LIBXUL_SDK      = @LIBXUL_SDK@
 
 L10NBASEDIR     = @L10NBASEDIR@
 
 LIBXUL_DIST	= @LIBXUL_DIST@
+SYSTEM_LIBXUL   = @SYSTEM_LIBXUL@
 
 XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
 
 MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
 
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
 MOZ_DFB			= @MOZ_DFB@
 MOZ_X11			= @MOZ_X11@
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -57,16 +57,21 @@ endif
 REPORT_BUILD = @echo $(notdir $<)
 
 ifeq ($(OS_ARCH),OS2)
 EXEC			=
 else
 EXEC			= exec
 endif
 
+# Don't copy xulrunner files at install time, when using system xulrunner
+ifdef SYSTEM_LIBXUL
+  SKIP_COPY_XULRUNNER=1
+endif
+
 # ELOG prints out failed command when building silently (gmake -s).
 ifneq (,$(findstring -s,$(MAKEFLAGS)))
   ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
 else
   ELOG :=
 endif
 
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
--- a/configure.in
+++ b/configure.in
@@ -4226,16 +4226,26 @@ AC_SUBST(LIBXUL_SDK)
 
 if test -n "$LIBXUL_SDK"; then
     LIBXUL_DIST="$LIBXUL_SDK"
 else
     LIBXUL_DIST="$MOZ_BUILD_ROOT/mozilla/dist"
 fi
 AC_SUBST(LIBXUL_DIST)
 
+SYSTEM_LIBXUL=
+
+MOZ_ARG_WITH_BOOL(system-libxul,
+[  --with-system-libxul   Use system installed libxul SDK],
+    SYSTEM_LIBXUL=1)
+
+if test -n "$SYSTEM_LIBXUL" && test -z "$MOZ_ENABLE_LIBXUL"; then
+    AC_MSG_ERROR([--with-system-libxul needs --with-libxul-sdk])
+fi
+
 dnl ========================================================
 dnl = If NSPR was not detected in the system, 
 dnl = use the one in the source tree (mozilla/nsprpub)
 dnl ========================================================
 MOZ_ARG_WITH_BOOL(system-nspr,
 [  --with-system-nspr      Use system installed NSPR],
     _USE_SYSTEM_NSPR=1 )
 
@@ -7180,16 +7190,17 @@ COMPILE_CFLAGS=`echo \
     $COMPILE_CFLAGS`
 
 COMPILE_CXXFLAGS=`echo \
     $_DEFINES_CXXFLAGS \
 	$_DEPEND_CFLAGS \
     $COMPILE_CXXFLAGS`
 
 AC_SUBST(SYSTEM_MAKEDEPEND)
+AC_SUBST(SYSTEM_LIBXUL)
 AC_SUBST(SYSTEM_JPEG)
 AC_SUBST(SYSTEM_PNG)
 AC_SUBST(SYSTEM_ZLIB)
 AC_SUBST(SYSTEM_BZ2)
 
 AC_SUBST(JPEG_CFLAGS)
 AC_SUBST(JPEG_LIBS)
 AC_SUBST(ZLIB_CFLAGS)