diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-11 17:45:54 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-11 17:45:54 +0200 |
| commit | c2a7164c52e0f1ea24eef8357cf28a191e3911d9 (patch) | |
| tree | 6adbe3cfb37ec4fca51003633bea9334f4822be5 /old-configure.in | |
| parent | 66b05e93d3de1082c2f7d441e055dbc3e0e65191 (diff) | |
| parent | 7004dcab622e9e7b7141df22c7b035b25380f365 (diff) | |
| download | uxp-c2a7164c52e0f1ea24eef8357cf28a191e3911d9.tar.gz | |
Rebase on master
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/old-configure.in b/old-configure.in index 6b43cb1ad9..2a9e2c65f6 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2271,7 +2271,7 @@ MOZ_TREMOR= MOZ_SAMPLE_TYPE_FLOAT32= MOZ_SAMPLE_TYPE_S16= MOZ_DIRECTSHOW= -MOZ_WEBRTC=1 +MOZ_WEBRTC= MOZ_PEERCONNECTION= MOZ_SRTP= MOZ_WEBRTC_SIGNALING= @@ -2312,6 +2312,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*) @@ -5192,6 +5197,43 @@ if test "$ENABLE_MARIONETTE"; then 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= fi @@ -5714,6 +5756,7 @@ MOZ_BRANDING_DIRECTORY=$MOZ_BRANDING_DIRECTORY MC_BASILISK=$MC_BASILISK MC_PALEMOON=$MC_PALEMOON MOZ_SANDBOX=$MOZ_SANDBOX +MOZ_EME=$MOZ_EME MOZ_WEBRTC=$MOZ_WEBRTC MOZ_SYSTEM_LIBEVENT=$MOZ_SYSTEM_LIBEVENT MOZ_SYSTEM_NSS=$MOZ_SYSTEM_NSS |