Bug 1257326 - Move MOZ_SOCIAL to Python configure. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Thu, 12 May 2016 11:55:59 -0700
changeset 336237 9b16825bf53c240edc679efa5c501406ec2b7a0d
parent 336236 82e8c5f0da4929e41ef874c8d482a986287e4c66
child 336238 86c89e604e9b78cf269a8095f45f8054326ffff2
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1257326
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1257326 - Move MOZ_SOCIAL to Python configure. r=glandium MozReview-Commit-ID: 3svSks12hTk
mobile/android/confvars.sh
mobile/android/moz.configure
old-configure.in
toolkit/moz.configure
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -26,17 +26,16 @@ MOZ_ANDROID_SEARCH_INTENT_CLASS=org.mozi
 MOZ_SAFE_BROWSING=1
 
 MOZ_NO_SMART_CARDS=1
 
 MOZ_XULRUNNER=
 
 MOZ_CAPTURE=1
 MOZ_RAW=1
-MOZ_SOCIAL=
 MOZ_ANDROID_HISTORY=1
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
 MOZ_APP_STATIC_INI=1
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -47,16 +47,18 @@ project_flag('MOZ_SWITCHBOARD',
 option('--disable-android-apz', env='MOZ_ANDROID_APZ',
        help='Disable the C++ async pan/zoom code and use the Java version instead')
 
 android_apz = depends_if('--disable-android-apz')(lambda _: True)
 
 set_config('MOZ_ANDROID_APZ', android_apz)
 set_define('MOZ_ANDROID_APZ', android_apz)
 
+imply_option('MOZ_SOCIAL', False)
+
 @depends(target)
 def check_target(target):
     if target.os != 'Android':
         log.error('You must specify --target=arm-linux-androideabi (or some '
                   'other valid Android target) when building mobile/android.')
         die('See https://developer.mozilla.org/docs/Mozilla/Developer_guide/'
             'Build_Instructions/Simple_Firefox_for_Android_build '
             'for more information about the necessary options.')
--- a/old-configure.in
+++ b/old-configure.in
@@ -2677,17 +2677,16 @@ MOZ_WEBSPEECH_TEST_BACKEND=1
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PERMISSIONS=1
-MOZ_SOCIAL=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
@@ -6549,21 +6548,16 @@ MOZ_ARG_DISABLE_BOOL(ctypes,
 [  --disable-ctypes        Disable js-ctypes],
     BUILD_CTYPES=,
     BUILD_CTYPES=1)
 AC_SUBST(BUILD_CTYPES)
 if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
 fi
 
-dnl Build SocialAPI if required
-if test "$MOZ_SOCIAL"; then
-  AC_DEFINE(MOZ_SOCIAL)
-fi
-
 dnl Build Common JS modules provided by services.
 AC_SUBST(MOZ_SERVICES_COMMON)
 if test -n "$MOZ_SERVICES_COMMON"; then
   AC_DEFINE(MOZ_SERVICES_COMMON)
 fi
 
 dnl Build Services crypto component (used by Sync)
 AC_SUBST(MOZ_SERVICES_CRYPTO)
@@ -6623,17 +6617,16 @@ AC_SUBST(BIN_FLAGS)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_PREF_EXTENSIONS)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST_SET(MOZ_EXTENSIONS)
 AC_SUBST(LIBICONV)
-AC_SUBST(MOZ_SOCIAL)
 AC_SUBST(MOZ_TOOLKIT_SEARCH)
 AC_SUBST(MOZ_FEEDS)
 AC_SUBST(NS_PRINTING)
 AC_SUBST(MOZ_HELP_VIEWER)
 
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -395,14 +395,18 @@ def omnijar_name(toolkit):
 
 set_config('OMNIJAR_NAME', omnijar_name)
 
 project_flag('MOZ_PLACES',
              help='Build Places if required',
              set_for_old_configure=True,
              set_as_define=True)
 
+project_flag('MOZ_SOCIAL',
+             help='Build SocialAPI if required',
+             default=True)
+
 # Miscellaneous programs
 # ==============================================================
 
 check_prog('TAR', ('gnutar', 'gtar', 'tar'))
 check_prog('UNZIP', ('unzip',))
 check_prog('ZIP', ('zip',))