Permalink
Browse files

Bug 397796 - "Allow XULRunner apps to specify the name of xulrunner-s…

…tub via configure". r+a=luser.
  • Loading branch information...
bent.mozilla@gmail.com
bent.mozilla@gmail.com committed Oct 11, 2007
1 parent 8d0f396 commit 4a7c18d4348837aedf91c30628b88d90ca3cd91b
Showing with 22 additions and 9 deletions.
  1. +2 −0 config/autoconf.mk.in
  2. +15 −0 configure.in
  3. +5 −9 xulrunner/stub/Makefile.in
View
@@ -76,6 +76,8 @@ else
LIBXUL_DIST = $(DIST)
endif
XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@
MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
View
@@ -4366,6 +4366,21 @@ AC_SUBST(MOZ_EMBEDDING_LEVEL_DEFAULT)
AC_SUBST(MOZ_EMBEDDING_LEVEL_BASIC)
AC_SUBST(MOZ_EMBEDDING_LEVEL_MINIMAL)
MOZ_ARG_WITH_STRING(xulrunner-stub-name,
[ --with-xulrunner-stub-name=appname Create the xulrunner stub with the given name],
XULRUNNER_STUB_NAME=$withval)
if test -z "$XULRUNNER_STUB_NAME"; then
case "$target_os" in
darwin*)
XULRUNNER_STUB_NAME=xulrunner
;;
*)
XULRUNNER_STUB_NAME=xulrunner-stub
esac
fi
AC_SUBST(XULRUNNER_STUB_NAME)
if test -z "$MOZ_BUILD_APP"; then
AC_MSG_ERROR([--enable-application=APP was not specified and is required.])
else
View
@@ -51,15 +51,11 @@ CPPSRCS = nsXULStub.cpp
# Statically link the CRT when possible
USE_STATIC_LIBS = 1
ifeq ($(OS_ARCH),Darwin)
PROGRAM = xulrunner$(BIN_SUFFIX)
else
PROGRAM = xulrunner-stub$(BIN_SUFFIX)
endif # OS_ARCH
# The value of XULRUNNER_STUB_NAME is generated by configure to allow XULRunner
# apps to override it using the --with-xulrunner-stub-name=<appname> argument.
# If this configure argument is not present then the default name is 'xulrunner'
# for Mac OS X and 'xulrunner-stub' for all other platforms.
PROGRAM = $(XULRUNNER_STUB_NAME)$(BIN_SUFFIX)
LOCAL_INCLUDES = -I$(topsrcdir)/xpcom/build

0 comments on commit 4a7c18d

Please sign in to comment.