Skip to content

Commit

Permalink
Bug 460913 - "Installer shouldn't copy xulrunner files into Firefox i…
Browse files Browse the repository at this point in the history
…nstall directory" [r=bsmedberg]
  • Loading branch information
fta1 committed Jan 27, 2009
1 parent 2eff523 commit c68bc89
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
5 changes: 5 additions & 0 deletions config/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ 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
Expand Down
11 changes: 11 additions & 0 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -4038,6 +4038,16 @@ else
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)
Expand Down Expand Up @@ -7933,6 +7943,7 @@ COMPILE_CXXFLAGS=`echo \
$COMPILE_CXXFLAGS`

AC_SUBST(SYSTEM_MAKEDEPEND)
AC_SUBST(SYSTEM_LIBXUL)
AC_SUBST(SYSTEM_JPEG)
AC_SUBST(SYSTEM_PNG)
AC_SUBST(SYSTEM_ZLIB)
Expand Down

0 comments on commit c68bc89

Please sign in to comment.