Bug 1491419 - move MOZ_{SCTP,SRTP} to moz.configure; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Mon, 01 Oct 2018 14:51:27 -0400
changeset 497457 d7ba9ef59ccef7f46b1b5ed2f183b2ac469def3a
parent 497456 7e51843db3f235723117a2e1ccf149995dbbd642
child 497458 362984e9cc333ae8ce0bc49c0822bfc66ac726c5
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1491419
milestone64.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 1491419 - move MOZ_{SCTP,SRTP} to moz.configure; r=nalexander These settings are just dependent on WebRTC being enabled.
build/moz.configure/old.configure
old-configure.in
toolkit/moz.configure
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -175,17 +175,16 @@ def old_configure_options(*options):
     '--enable-cpp-rtti',
     '--enable-crashreporter',
     '--enable-dbus',
     '--enable-debug-js-modules',
     '--enable-directshow',
     '--enable-dtrace',
     '--enable-dump-painting',
     '--enable-extensions',
-    '--enable-faststripe',
     '--enable-feeds',
     '--enable-gconf',
     '--enable-hardware-aec-ns',
     '--enable-icf',
     '--enable-install-strip',
     '--enable-ios-target',
     '--enable-libjpeg-turbo',
     '--enable-libproxy',
--- a/old-configure.in
+++ b/old-configure.in
@@ -1898,19 +1898,17 @@ ENABLE_SYSTEM_EXTENSION_DIRS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_FEEDS=1
 MOZ_AUTH_EXTENSION=1
 if test "$MOZ_IOS"; then
    MOZ_AUTH_EXTENSION=
 fi
 MOZ_RAW=
-MOZ_SRTP=
 MOZ_WEBRTC_HARDWARE_AEC_NS=
-MOZ_SCTP=
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PREF_EXTENSIONS=1
@@ -2337,20 +2335,16 @@ fi
 AC_TRY_COMPILE([#include <linux/ethtool.h>],
                [ struct ethtool_cmd cmd; cmd.speed_hi = 0; ],
                MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI=1)
 
 AC_SUBST(MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI)
 
 if test -n "$MOZ_WEBRTC"; then
     MOZ_RAW=1
-    MOZ_SCTP=1
-    MOZ_SRTP=1
-    AC_DEFINE(MOZ_SCTP)
-    AC_DEFINE(MOZ_SRTP)
     if test -n "$MOZ_X11"; then
       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
     fi
 fi
 
 dnl ========================================================
 dnl = Force hardware AEC, disable webrtc.org AEC
 dnl ========================================================
@@ -2359,18 +2353,16 @@ MOZ_ARG_ENABLE_BOOL(hardware-aec-ns,
     MOZ_WEBRTC_HARDWARE_AEC_NS=1,
     MOZ_WEBRTC_HARDWARE_AEC_NS=)
 
 if test -n "$MOZ_WEBRTC_HARDWARE_AEC_NS"; then
     AC_DEFINE(MOZ_WEBRTC_HARDWARE_AEC_NS)
 fi
 
 AC_SUBST(MOZ_WEBRTC_HARDWARE_AEC_NS)
-AC_SUBST(MOZ_SCTP)
-AC_SUBST(MOZ_SRTP)
 AC_SUBST_LIST(MOZ_WEBRTC_X11_LIBS)
 
 dnl ========================================================
 dnl = Enable Raw Codecs
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(raw,
 [  --enable-raw           Enable support for RAW media],
     MOZ_RAW=1,
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -965,16 +965,20 @@ option('--disable-webrtc', default=webrt
 @depends('--disable-webrtc')
 def webrtc(enabled):
     if enabled:
         return True
 
 set_config('MOZ_WEBRTC', webrtc)
 set_define('MOZ_WEBRTC', webrtc)
 add_old_configure_assignment('MOZ_WEBRTC', webrtc)
+set_config('MOZ_SCTP', webrtc)
+set_define('MOZ_SCTP', webrtc)
+set_config('MOZ_SRTP', webrtc)
+set_define('MOZ_SRTP', webrtc)
 set_config('MOZ_WEBRTC_SIGNALING', webrtc)
 set_define('MOZ_WEBRTC_SIGNALING', webrtc)
 set_config('MOZ_PEERCONNECTION', webrtc)
 set_define('MOZ_PEERCONNECTION', webrtc)
 # MOZ_WEBRTC_ASSERT_ALWAYS turns on a number of safety asserts in
 # opt/production builds (via MOZ_CRASH())
 set_config('MOZ_WEBRTC_ASSERT_ALWAYS', webrtc)
 set_define('MOZ_WEBRTC_ASSERT_ALWAYS', webrtc)