Bug 1491419 - move --enable-maintenance-service to moz.configure; r=nalexander

browser/confvars.sh

@@ -14,7 +14,6 @@ if test "$OS_ARCH" = "WINNT" -o \
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
-  MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "nightly-try" -o \

build/moz.configure/old.configure

@@ -193,7 +193,6 @@ def old_configure_options(*options):
     '--enable-libproxy',
     '--enable-llvm-hacks',
     '--enable-logrefcnt',
-    '--enable-maintenance-service',
     '--enable-memory-sanitizer',
     '--enable-mobile-optimize',
     '--enable-necko-wifi',

old-configure.in

@@ -3002,23 +3002,6 @@ fi
 AC_CHECK_PROGS(WGET, wget, "")
 AC_SUBST(WGET)
 
-dnl ========================================================
-dnl Maintenance Service
-dnl ========================================================
-
-MOZ_ARG_ENABLE_BOOL(maintenance-service,
-[  --enable-maintenance-service       Enable building of maintenanceservice],
-    MOZ_MAINTENANCE_SERVICE=1,
-    MOZ_MAINTENANCE_SERVICE= )
-
-if test -n "$MOZ_MAINTENANCE_SERVICE"; then
-  if test "$OS_ARCH" = "WINNT"; then
-    AC_DEFINE(MOZ_MAINTENANCE_SERVICE)
-  else
-    AC_MSG_ERROR([Can only build with --enable-maintenance-service with a Windows target])
-  fi
-fi
-
 dnl ========================================================
 dnl Bundled fonts on desktop platforms
 dnl ========================================================
@@ -4053,7 +4036,6 @@ AC_SUBST(MOZ_SPELLCHECK)
 AC_SUBST(MOZ_ANDROID_ANR_REPORTER)
 AC_SUBST(MOZ_CRASHREPORTER)
 AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
-AC_SUBST(MOZ_MAINTENANCE_SERVICE)
 AC_SUBST(MOZ_STUB_INSTALLER)
 AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
 AC_SUBST(MOZ_ENABLE_SIGNMAR)

toolkit/moz.configure

@@ -1085,3 +1085,15 @@ def libprio(info):
 
 set_config('MOZ_LIBPRIO', libprio)
 
+# Maintenance service (Windows only)
+# ==============================================================
+
+option('--enable-maintenance-service', help='Enable building of maintenance service',
+       when=target_is_windows, default=target_is_windows)
+
+set_define('MOZ_MAINTENANCE_SERVICE',
+           depends_if('--enable-maintenance-service',
+                      when=target_is_windows)(lambda _: True))
+set_config('MOZ_MAINTENANCE_SERVICE',
+           depends_if('--enable-maintenance-service',
+                      when=target_is_windows)(lambda _: True))