зеркало из https://github.com/mozilla/gecko-dev.git
Conditionally adding PICS (extensions/pics/) to the unix build. Use --enable-pics with configure to turn it on and build it. Not called anywhere yet. Neeti is aware that I was doing this.
This commit is contained in:
Родитель
226595ee86
Коммит
7b87f8884c
|
@ -91,6 +91,10 @@ extensions/wallet/Makefile
|
|||
extensions/wallet/public/Makefile
|
||||
extensions/wallet/src/Makefile
|
||||
# extensions/wallet/module/Makefile
|
||||
extensions/pics/Makefile
|
||||
extensions/pics/public/Makefile
|
||||
extensions/pics/src/Makefile
|
||||
extensions/pics/tests/Makefile
|
||||
gfx/Makefile
|
||||
gfx/public/Makefile
|
||||
gfx/src/Makefile
|
||||
|
|
|
@ -42,6 +42,7 @@ NO_NETSCAPE_SHARED = @NO_SHARED_LIB@
|
|||
NO_STATIC_LIB = @NO_STATIC_LIB@
|
||||
NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
|
||||
ENABLE_TESTS = @ENABLE_TESTS@
|
||||
ENABLE_PICS = @ENABLE_PICS@
|
||||
DOM = @MOZ_DOM@
|
||||
MOZ_MAIL_COMPOSE = @MOZ_MAIL_COMPOSE@
|
||||
NO_UNIX_LDAP = @NO_UNIX_LDAP@
|
||||
|
|
|
@ -1226,6 +1226,13 @@ MOZ_ARG_ENABLE_BOOL(tests,
|
|||
[ --enable-tests Enable test stubs],
|
||||
ENABLE_TESTS=1)
|
||||
|
||||
dnl Build PICS (mozilla/extensions/pics) code
|
||||
MOZ_ARG_ENABLE_BOOL(pics,
|
||||
[ --enable-pics Enable PICS code],
|
||||
ENABLE_PICS=1)
|
||||
|
||||
AC_DEFINE(ENABLE_PICS)
|
||||
|
||||
dnl Build browsing profile by default
|
||||
MOZ_BRPROF=1
|
||||
MOZ_ARG_DISABLE_BOOL(brprof,
|
||||
|
@ -1538,6 +1545,7 @@ AC_SUBST(NO_UNIX_ASYNC_DNS)
|
|||
AC_SUBST(NO_SHARED_LIB)
|
||||
AC_SUBST(NO_STATIC_LIB)
|
||||
AC_SUBST(ENABLE_TESTS)
|
||||
AC_SUBST(ENABLE_PICS)
|
||||
AC_SUBST(MOZ_USER_DIR)
|
||||
dnl AC_SUBST(MOZ_SMART_MAIL)
|
||||
AC_SUBST(MOZ_DOM)
|
||||
|
|
|
@ -20,9 +20,14 @@ topsrcdir = @top_srcdir@
|
|||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS=wallet
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
ifdef ENABLE_PICS
|
||||
DIRS += pics
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -22,7 +22,11 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = public admin src
|
||||
DIRS = public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче