Take the following project_flags out of moz.configure: and put them back into old-configure

MOZ_PLACES
MOZ_SOCIAL
MOZ_SERVICES_HEALTHREPORT
MOZ_SERVICES_SYNC
MOZ_SERVICES_CLOUDSYNC
pull/1/head
NTD 4 years ago committed by Roy Tam
parent c8f4fb3b7d
commit e035963fa2
  1. 2
      application/palemoon/confvars.sh
  2. 5
      application/palemoon/moz.configure
  3. 3
      browser/confvars.sh
  4. 5
      browser/moz.configure
  5. 42
      old-configure.in
  6. 24
      toolkit/moz.configure

@ -70,8 +70,6 @@ MOZ_PHOENIX_EXTENSIONS=1
# Platform Feature: Sync Service
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_FXACCOUNTS=1
MOZ_SERVICES_CRYPTO=1
# Platform Feature: JS based Downloads Manager
MOZ_JSDOWNLOADS=1

@ -4,9 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option('MOZ_PLACES', True)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_SERVICES_SYNC', True)
imply_option('MOZ_SERVICES_CLOUDSYNC', True)
include('../../toolkit/moz.configure')

@ -56,6 +56,9 @@ MOZ_JSDOWNLOADS=1
MOZ_WEBRTC=1
MOZ_WEBEXTENSIONS=1
MOZ_DEVTOOLS=1
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_HEALTHREPORT=1
# Disable checking that add-ons are signed by the trusted root
MOZ_ADDON_SIGNING=0

@ -4,9 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
imply_option('MOZ_PLACES', True)
imply_option('MOZ_SERVICES_HEALTHREPORT', True)
imply_option('MOZ_SERVICES_SYNC', True)
imply_option('MOZ_SERVICES_CLOUDSYNC', True)
include('../toolkit/moz.configure')

@ -2317,6 +2317,11 @@ MOZ_BINARY_EXTENSIONS=
MOZ_JETPACK=1
MOZ_DEVTOOLS_SERVER=1
MOZ_DEVTOOLS=
MOZ_PLACES=1
MOZ_SOCIAL=1
MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_SYNC=1
MOZ_SERVICES_CLOUDSYNC=1
case "$target_os" in
mingw*)
@ -5274,6 +5279,43 @@ if test "$ENABLE_MARIONETTE"; then
AC_DEFINE(ENABLE_MARIONETTE)
fi
dnl ========================================================
dnl =
dnl = Miscellaneous (former toolkit/moz.configure)
dnl =
dnl ========================================================
dnl Build Places if required
AC_SUBST(MOZ_PLACES)
if test "$MOZ_PLACES"; then
AC_DEFINE(MOZ_PLACES)
fi
dnl Build SocialAPI if required
AC_SUBST(MOZ_SOCIAL)
if test "$MOZ_SOCIAL"; then
AC_DEFINE(MOZ_SOCIAL)
fi
dnl Build Firefox Health Reporter Service
AC_SUBST(MOZ_SERVICES_HEALTHREPORT)
if test -n "$MOZ_SERVICES_HEALTHREPORT"; then
AC_DEFINE(MOZ_SERVICES_HEALTHREPORT)
fi
dnl Build Sync Services if required
AC_SUBST(MOZ_SERVICES_SYNC)
if test -n "$MOZ_SERVICES_SYNC"; then
AC_DEFINE(MOZ_SERVICES_SYNC)
fi
dnl Build Services/CloudSync if required
AC_SUBST(MOZ_SERVICES_CLOUDSYNC)
if test -n "$MOZ_SERVICES_CLOUDSYNC"; then
AC_DEFINE(MOZ_SERVICES_CLOUDSYNC)
fi
dnl ========================================================
if test "$MOZ_DEBUG" -o "$MOZ_DMD"; then
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=

@ -444,34 +444,10 @@ def omnijar_name(toolkit):
set_config('OMNIJAR_NAME', omnijar_name)
project_flag('MOZ_PLACES',
help='Build Places if required',
set_as_define=True)
project_flag('MOZ_SOCIAL',
help='Build SocialAPI if required',
default=True)
project_flag('MOZ_SERVICES_HEALTHREPORT',
help='Build Firefox Health Reporter Service',
set_for_old_configure=True,
set_as_define=True)
project_flag('MOZ_SERVICES_SYNC',
help='Build Sync Services if required')
project_flag('MOZ_SERVICES_CLOUDSYNC',
help='Build Services/CloudSync if required')
project_flag('MOZ_ANDROID_HISTORY',
help='Enable Android History instead of Places',
set_as_define=True)
@depends('MOZ_PLACES', 'MOZ_ANDROID_HISTORY')
def check_places_and_android_history(places, android_history):
if places and android_history:
die('Cannot use MOZ_ANDROID_HISTORY alongside MOZ_PLACES.')
# Permissions system
# ==============================================================
option(name='--disable-permissions',

Loading…
Cancel
Save