Port bug 1491419 - Changes to confvars.sh (maintenance service and bundled fonts). r=jorgk DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Tue, 02 Oct 2018 10:31:41 +0200
changeset 33284 cc2807a09902b25cf0a964faf4e422397ecf05c7
parent 33283 826d121902902c7bed5b17bde052be850cbbb739
child 33285 a98e917dba66d20511b82098de5b47fb3d310ca5
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1491419
Port bug 1491419 - Changes to confvars.sh (maintenance service and bundled fonts). r=jorgk DONTBUILD
mail/confvars.sh
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -14,23 +14,17 @@ m4 "${srcdir}/build/autoconf/subconfigur
    "${srcdir}/${MOZ_BUILD_APP}/configure.in" > $tmpscript
 . $tmpscript
 rm -f $tmpscript
 
 MOZ_APP_BASENAME=Thunderbird
 MOZ_APP_NAME=thunderbird
 MOZ_UPDATER=1
 
-if test "$OS_ARCH" = "WINNT" -o \
-        "$OS_ARCH" = "Linux"; then
-  MOZ_BUNDLED_FONTS=1
-fi
-
 if test "$OS_ARCH" = "WINNT"; then
-  MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     MOZ_VERIFY_MAR_SIGNATURE=1
   fi
 fi
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt