mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Moved the handling of extensions into configure.in.
Changed allmakefiles.sh to only generate Makefiles for extensions directories that are specified. Added support for --with-extensions=none & --without-extensions The following options have been superceded by --with-extensions: --disable-cookie-management --disable-client-wallet --disable-single-signon
This commit is contained in:
parent
e04050e411
commit
d30bb6ea81
@ -106,22 +106,6 @@ expat/Makefile
|
|||||||
expat/xmlparse/Makefile
|
expat/xmlparse/Makefile
|
||||||
expat/xmltok/Makefile
|
expat/xmltok/Makefile
|
||||||
extensions/Makefile
|
extensions/Makefile
|
||||||
extensions/cookie/Makefile
|
|
||||||
extensions/cookie/tests/Makefile
|
|
||||||
extensions/irc/Makefile
|
|
||||||
extensions/irc/libbs/Makefile
|
|
||||||
extensions/wallet/Makefile
|
|
||||||
extensions/wallet/public/Makefile
|
|
||||||
extensions/wallet/src/Makefile
|
|
||||||
extensions/wallet/editor/Makefile
|
|
||||||
extensions/wallet/cookieviewer/Makefile
|
|
||||||
extensions/wallet/signonviewer/Makefile
|
|
||||||
extensions/wallet/walletpreview/Makefile
|
|
||||||
extensions/wallet/build/Makefile
|
|
||||||
extensions/pics/Makefile
|
|
||||||
extensions/pics/public/Makefile
|
|
||||||
extensions/pics/src/Makefile
|
|
||||||
extensions/pics/tests/Makefile
|
|
||||||
gfx/Makefile
|
gfx/Makefile
|
||||||
gfx/idl/Makefile
|
gfx/idl/Makefile
|
||||||
gfx/public/Makefile
|
gfx/public/Makefile
|
||||||
@ -686,3 +670,39 @@ if [ "$MOZ_MATHML" ]; then
|
|||||||
layout/mathml/content/src/Makefile
|
layout/mathml/content/src/Makefile
|
||||||
END_MATHML_MAKEFILES
|
END_MATHML_MAKEFILES
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ `echo "$MOZ_EXTENSIONS" | grep -c cookie` != 0 ]; then
|
||||||
|
add_makefiles <<END_EXTENSIONS_COOKIE_MAKEFILES
|
||||||
|
extensions/cookie/Makefile
|
||||||
|
extensions/cookie/tests/Makefile
|
||||||
|
END_EXTENSIONS_COOKIE_MAKEFILES
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ `echo "$MOZ_EXTENSIONS" | grep -c irc` != 0 ]; then
|
||||||
|
add_makefiles <<END_EXTENSIONS_IRC_MAKEFILES
|
||||||
|
extensions/irc/Makefile
|
||||||
|
extensions/irc/libbs/Makefile
|
||||||
|
END_EXTENSIONS_IRC_MAKEFILES
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ `echo "$MOZ_EXTENSIONS" | grep -c wallet` != 0 ]; then
|
||||||
|
add_makefiles <<END_EXTENSIONS_WALLET_MAKEFILES
|
||||||
|
extensions/wallet/Makefile
|
||||||
|
extensions/wallet/public/Makefile
|
||||||
|
extensions/wallet/src/Makefile
|
||||||
|
extensions/wallet/editor/Makefile
|
||||||
|
extensions/wallet/cookieviewer/Makefile
|
||||||
|
extensions/wallet/signonviewer/Makefile
|
||||||
|
extensions/wallet/walletpreview/Makefile
|
||||||
|
extensions/wallet/build/Makefile
|
||||||
|
END_EXTENSIONS_WALLET_MAKEFILES
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ `echo "$MOZ_EXTENSIONS" | grep -c pics` != 0 ]; then
|
||||||
|
add_makefiles <<END_EXTENSIONS_PICS_MAKEFILES
|
||||||
|
extensions/pics/Makefile
|
||||||
|
extensions/pics/public/Makefile
|
||||||
|
extensions/pics/src/Makefile
|
||||||
|
extensions/pics/tests/Makefile
|
||||||
|
END_EXTENSIONS_PICS_MAKEFILES
|
||||||
|
fi
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
USE_AUTOCONF = 1
|
USE_AUTOCONF = 1
|
||||||
MOZILLA_CLIENT = 1
|
MOZILLA_CLIENT = 1
|
||||||
NO_MDUPDATE = 1
|
NO_MDUPDATE = 1
|
||||||
NECKO = 1
|
|
||||||
|
|
||||||
DIST = $(DEPTH)/dist
|
DIST = $(DEPTH)/dist
|
||||||
|
|
||||||
@ -72,9 +71,9 @@ USE_IMPLICIT_ARCHIVE = @USE_IMPLICIT_ARCHIVE@
|
|||||||
|
|
||||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
|
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@
|
||||||
|
|
||||||
ClientWallet=@ClientWallet@
|
ClientWallet=1
|
||||||
CookieManagement=@CookieManagement@
|
CookieManagement=1
|
||||||
SingleSignon=@SingleSignon@
|
SingleSignon=1
|
||||||
|
|
||||||
MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
|
MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
|
||||||
MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
|
MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
|
||||||
|
53
configure.in
53
configure.in
@ -2281,48 +2281,6 @@ then
|
|||||||
DSO_PIC_CFLAGS=""
|
DSO_PIC_CFLAGS=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl ========================================================
|
|
||||||
dnl =
|
|
||||||
dnl = ClientWallet, CookieManagement, SingleSignon hacks
|
|
||||||
dnl =
|
|
||||||
dnl = Dont ask why these variables are named this way.
|
|
||||||
dnl =
|
|
||||||
dnl ========================================================
|
|
||||||
ClientWallet=1
|
|
||||||
CookieManagement=1
|
|
||||||
SingleSignon=1
|
|
||||||
|
|
||||||
MOZ_ARG_DISABLE_BOOL(client-wallet,
|
|
||||||
[ --disable-client-wallet Disable ClientWallet],
|
|
||||||
ClientWallet= )
|
|
||||||
|
|
||||||
MOZ_ARG_DISABLE_BOOL(cookie-management,
|
|
||||||
[ --disable-cookie-management
|
|
||||||
Disable CookieManagement],
|
|
||||||
CookieManagement= )
|
|
||||||
|
|
||||||
MOZ_ARG_DISABLE_BOOL(single-signon,
|
|
||||||
[ --disable-single-signon Disable SingleSignon],
|
|
||||||
SingleSignon= )
|
|
||||||
|
|
||||||
if test "$ClientWallet"
|
|
||||||
then
|
|
||||||
AC_DEFINE(ClientWallet)
|
|
||||||
|
|
||||||
# I guess one depends on the other
|
|
||||||
SingleSignon=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$CookieManagement"
|
|
||||||
then
|
|
||||||
AC_DEFINE(CookieManagement)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$SingleSignon"
|
|
||||||
then
|
|
||||||
AC_DEFINE(SingleSignon)
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl =
|
dnl =
|
||||||
dnl = Compiler Options
|
dnl = Compiler Options
|
||||||
@ -2448,12 +2406,19 @@ dnl ========================================================
|
|||||||
dnl =
|
dnl =
|
||||||
dnl = --with-extensions=extension1,extension2,
|
dnl = --with-extensions=extension1,extension2,
|
||||||
dnl =
|
dnl =
|
||||||
dnl = Enable debug for specific modules only
|
dnl = Enable compilation of specific extension modules
|
||||||
dnl =
|
dnl =
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
MOZ_EXTENSIONS="cookie wallet"
|
||||||
MOZ_ARG_WITH_STRING(extensions,
|
MOZ_ARG_WITH_STRING(extensions,
|
||||||
[ --with-extensions Enable extensions (dirs in extensions/)],
|
[ --with-extensions Enable extensions (dirs in extensions/)],
|
||||||
[ MOZ_EXTENSIONS=`echo $withval | sed 's/,/ /g'` ] )
|
[ if test "$withval" = "yes" || test "$withval" = "all"; then
|
||||||
|
MOZ_EXTENSIONS="cookie irc wallet"
|
||||||
|
elif test "$withval" = "no" || test "$withval" = "none"; then
|
||||||
|
MOZ_EXTENSIONS=""
|
||||||
|
elif "$withval" != ""; then
|
||||||
|
MOZ_EXTENSIONS=`echo $withval | sed 's/,/ /g'`
|
||||||
|
fi ] )
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
|
||||||
_cpp_md_flag=
|
_cpp_md_flag=
|
||||||
|
@ -26,14 +26,6 @@ VPATH = @srcdir@
|
|||||||
|
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
DIRS = cookie wallet
|
DIRS = $(MOZ_EXTENSIONS)
|
||||||
|
|
||||||
ifdef MOZ_EXTENSIONS
|
|
||||||
ifneq (, $(filter all yes, $(MOZ_EXTENSIONS)))
|
|
||||||
DIRS += irc
|
|
||||||
else
|
|
||||||
DIRS += $(MOZ_EXTENSIONS)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
Loading…
Reference in New Issue
Block a user