Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-10 09:58:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 327188 - enable places by default, r=bryner

Browse Source
This commit is contained in:
benjamin%smedbergs.us 2006-02-15 18:46:10 +00:00
parent f9b4f7509f
commit c028f45f24
8 changed files with 684 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -282,6 +282,10 @@ endif
endif endif
endif endif
ifdef MOZ_STORAGE
tier_50_dirs += storage
endif
ifdef MOZ_XUL_APP ifdef MOZ_XUL_APP
ifndef BUILD_STATIC_LIBS ifndef BUILD_STATIC_LIBS
tier_50_dirs += toolkit/library tier_50_dirs += toolkit/library
@ -296,10 +300,6 @@ ifdef NS_TRACE_MALLOC
tier_50_dirs += tools/trace-malloc tier_50_dirs += tools/trace-malloc
endif endif
ifdef MOZ_STORAGE
tier_50_dirs += storage
endif
ifdef MOZ_LDAP_XPCOM ifdef MOZ_LDAP_XPCOM
tier_50_dirs += directory/xpcom tier_50_dirs += directory/xpcom
endif endif

1411
configure vendored
View File

File diff suppressed because it is too large Load Diff

3
configure.in
View File

@ -4189,6 +4189,7 @@ MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_NO_XPCOM_OBSOLETE= MOZ_NO_XPCOM_OBSOLETE=
MOZ_NO_FAST_LOAD= MOZ_NO_FAST_LOAD=
MOZ_OJI=1 MOZ_OJI=1
MOZ_PLACES=
MOZ_PLAINTEXT_EDITOR_ONLY= MOZ_PLAINTEXT_EDITOR_ONLY=
MOZ_PLUGINS=1 MOZ_PLUGINS=1
MOZ_PREF_EXTENSIONS=1 MOZ_PREF_EXTENSIONS=1
@ -4275,6 +4276,7 @@ browser)
MOZ_XUL_APP=1 MOZ_XUL_APP=1
MOZ_UPDATER=1 MOZ_UPDATER=1
MOZ_PHOENIX=1 MOZ_PHOENIX=1
MOZ_PLACES=1
MOZ_APP_VERSION=$FIREFOX_VERSION MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc inspector gnomevfs permissions reporter" MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc inspector gnomevfs permissions reporter"
AC_DEFINE(MOZ_PHOENIX) AC_DEFINE(MOZ_PHOENIX)
@ -4383,6 +4385,7 @@ xulrunner)
MOZ_ENABLE_LIBXUL=1 MOZ_ENABLE_LIBXUL=1
MOZ_APP_VERSION=$MOZILLA_VERSION MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_JAVAXPCOM=1 MOZ_JAVAXPCOM=1
MOZ_PLACES=1
MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs" MOZ_EXTENSIONS_DEFAULT=" xml-rpc gnomevfs"
AC_DEFINE(MOZ_XULRUNNER) AC_DEFINE(MOZ_XULRUNNER)
;; ;;

2
db/morkreader/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = morkreader MODULE = morkreader
LIBRARY_NAME = morkreader_s LIBRARY_NAME = morkreader_s
MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1

2
storage/build/Makefile.in
View File

@ -49,7 +49,7 @@ SHORT_LIBNAME = strgcmps
EXPORT_LIBRARY = 1 EXPORT_LIBRARY = 1
IS_COMPONENT = 1 IS_COMPONENT = 1
MODULE_NAME = mozStorageModule MODULE_NAME = mozStorageModule
MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1
REQUIRES = \ REQUIRES = \
storage \ storage \

2
storage/src/Makefile.in
View File

@ -48,7 +48,7 @@ LIBRARY_NAME = storage_s
MODULE_NAME = mozStorageModule MODULE_NAME = mozStorageModule
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1
GRE_MODULE = 1 GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1 LIBXUL_LIBRARY = 1
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \

12
toolkit/library/libxul-config.mk
View File

@ -101,7 +101,6 @@ COMPONENT_LIBS += \
txmgr \ txmgr \
composer \ composer \
chrome \ chrome \
mork \
mozfind \ mozfind \
appcomps \ appcomps \
commandlines \ commandlines \
@ -113,10 +112,19 @@ COMPONENT_LIBS += \
autoconfig \ autoconfig \
$(NULL) $(NULL)
ifdef MOZ_PLACES
COMPONENT_LIBS += storagecomps
STATIC_LIBS += morkreader_s
else
COMPONENT_LIBS += \
mork \
tkhstory \
$(NULL)
endif
ifdef MOZ_XUL ifdef MOZ_XUL
COMPONENT_LIBS += \ COMPONENT_LIBS += \
tkautocomplete \ tkautocomplete \
tkhstory \
satchel \ satchel \
pippki \ pippki \
$(NULL) $(NULL)

12
toolkit/library/nsStaticXULComponents.cpp
View File

@ -151,10 +151,18 @@
#define SYSTEMPREF_MODULES #define SYSTEMPREF_MODULES
#endif #endif
#ifdef MOZ_PLACES
#define PLACES_MODULES \
MODULE(mozStorageModule)
#else
#define PLACES_MODULES \
MODULE(nsMorkModule) \
MODULE(nsToolkitHistory)
#endif
#ifdef MOZ_XUL #ifdef MOZ_XUL
#define XULENABLED_MODULES \ #define XULENABLED_MODULES \
MODULE(tkAutoCompleteModule) \ MODULE(tkAutoCompleteModule) \
MODULE(nsToolkitHistory) \
MODULE(satchel) \ MODULE(satchel) \
MODULE(PKI) MODULE(PKI)
#else #else
@ -196,11 +204,11 @@
MODULE(nsTransactionManagerModule) \ MODULE(nsTransactionManagerModule) \
MODULE(nsComposerModule) \ MODULE(nsComposerModule) \
MODULE(nsChromeModule) \ MODULE(nsChromeModule) \
MODULE(nsMorkModule) \
MODULE(nsFindComponent) \ MODULE(nsFindComponent) \
MODULE(application) \ MODULE(application) \
MODULE(Apprunner) \ MODULE(Apprunner) \
MODULE(CommandLineModule) \ MODULE(CommandLineModule) \
PLACES_MODULES \
XULENABLED_MODULES \ XULENABLED_MODULES \
MODULE(nsToolkitCompsModule) \ MODULE(nsToolkitCompsModule) \
XREMOTE_MODULES \ XREMOTE_MODULES \