bug 748379 - xulrunner builds broken by 'webapprt: No such file or directory'; r=mossop, a=lsblakk
authorMyk Melez <myk@mozilla.org>
Tue, 01 May 2012 15:26:39 -0700
changeset 94090 ef9cb1276f4c8c2508fa2ab46638dc80d5317b44
parent 94089 d77293605e32bde23d7c42b422b6f852fe7c699d
child 94091 2cd2fbbd988e6a5f62f92b9c5b247e56eb57e0ed
push idunknown
push userunknown
push dateunknown
reviewersmossop, lsblakk
bugs748379
milestone14.0a2
bug 748379 - xulrunner builds broken by 'webapprt: No such file or directory'; r=mossop, a=lsblakk
browser/confvars.sh
configure.in
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -43,16 +43,20 @@ MOZ_PHOENIX=1
 
 if test "$OS_ARCH" = "WINNT"; then
   if ! test "$HAVE_64BIT_OS"; then
     MOZ_VERIFY_MAR_SIGNATURE=1
     MOZ_MAINTENANCE_SERVICE=1
   fi
 fi
 
+if (test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"); then
+  MOZ_WEBAPP_RUNTIME=1
+fi
+
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
 # because branding dependencies are broken.
--- a/configure.in
+++ b/configure.in
@@ -4555,28 +4555,26 @@ BUILD_CTYPES=1
 MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_ANDROID_HISTORY=
 MOZ_WEBSMS_BACKEND=
 MOZ_GRAPHITE=1
 
 case "${target}" in
 *darwin*)
     ACCESSIBILITY=
-    MOZ_WEBAPP_RUNTIME=1
     ;;
 *)
     ACCESSIBILITY=1
     ;;
 esac
 
 case "$target_os" in
     mingw*)
         NS_ENABLE_TSF=1
         AC_DEFINE(NS_ENABLE_TSF)
-        MOZ_WEBAPP_RUNTIME=1
         ;;
 esac
 
 case "${target}" in
     *-android*|*-linuxandroid*)
         if test "$CPU_ARCH" = "arm" ; then
           USE_ARM_KUSER=1
         fi