mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
b=713802 default enable GIO support and disable GnomeVFS r=glandium
--HG-- extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20
This commit is contained in:
parent
c7c5c44e78
commit
26debe74af
@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1
|
||||
MOZ_SERVICES_NOTIFICATIONS=1
|
||||
MOZ_SERVICES_SYNC=1
|
||||
MOZ_APP_VERSION=$FIREFOX_VERSION
|
||||
MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
|
||||
MOZ_EXTENSIONS_DEFAULT=" gio"
|
||||
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
|
||||
# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
|
||||
# because branding dependencies are broken.
|
||||
|
20
configure.in
20
configure.in
@ -4846,21 +4846,21 @@ dnl ========================================================
|
||||
|
||||
if test "$MOZ_X11"
|
||||
then
|
||||
dnl build the gnomevfs extension by default only when the
|
||||
dnl build the GIO extension by default only when the
|
||||
dnl GTK2 toolkit is in use.
|
||||
if test "$MOZ_ENABLE_GTK2"
|
||||
then
|
||||
MOZ_ENABLE_GNOMEVFS=1
|
||||
MOZ_ENABLE_GIO=1
|
||||
MOZ_ENABLE_GCONF=1
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = GnomeVFS support module
|
||||
dnl ========================================================
|
||||
MOZ_ARG_DISABLE_BOOL(gnomevfs,
|
||||
[ --disable-gnomevfs Disable GnomeVFS support ],
|
||||
MOZ_ENABLE_GNOMEVFS=,
|
||||
MOZ_ENABLE_GNOMEVFS=force)
|
||||
MOZ_ARG_ENABLE_BOOL(gnomevfs,
|
||||
[ --enable-gnomevfs Enable GnomeVFS support (default: disabled)],
|
||||
MOZ_ENABLE_GNOMEVFS=force,
|
||||
MOZ_ENABLE_GNOMEVFS=)
|
||||
|
||||
if test "$MOZ_ENABLE_GNOMEVFS"
|
||||
then
|
||||
@ -4884,10 +4884,10 @@ then
|
||||
dnl ========================================================
|
||||
dnl = GIO support module
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(gio,
|
||||
[ --enable-gio Enable GIO support (default: disabled)],
|
||||
MOZ_ENABLE_GIO=force,
|
||||
MOZ_ENABLE_GIO=)
|
||||
MOZ_ARG_DISABLE_BOOL(gio,
|
||||
[ --disable-gio Disable GIO support],
|
||||
MOZ_ENABLE_GIO=,
|
||||
MOZ_ENABLE_GIO=force)
|
||||
|
||||
if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2"
|
||||
then
|
||||
|
@ -10,5 +10,5 @@ MOZ_XULRUNNER=1
|
||||
MOZ_CHROME_FILE_FORMAT=omni
|
||||
MOZ_APP_VERSION=$MOZILLA_VERSION
|
||||
MOZ_PLACES=1
|
||||
MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
|
||||
MOZ_EXTENSIONS_DEFAULT=" gio"
|
||||
MOZ_URL_CLASSIFIER=1
|
||||
|
Loading…
Reference in New Issue
Block a user