Bug 1077212 - Move MOZ_FOLD_LIBS to configure. r=mshal

Setting MOZ_FOLD_LIBS should stop being an opt-in for individual applications,
which also makes them responsible for doing the right thing, which happens not
to be the case for B2G Desktop Linux builds.

Enforcing MOZ_FOLD_LIBS to be set on the relevant platforms in configure ensures
everything is setup up correctly, and also allows to stop caring about supporting
now hypothetical e.g. MSVC builds without MOZ_FOLD_LIBS (which require to pass
DLLFLAGS down to the nspr build system to make nspr built against mozglue which
would now be unnecessary)
This commit is contained in:
Mike Hommey 2014-10-04 10:33:46 +09:00
parent 38cd110ce5
commit 3b917517d3
5 changed files with 9 additions and 9 deletions

View File

@ -60,7 +60,6 @@ if test "$OS_TARGET" = "Android"; then
MOZ_NUWA_PROCESS=1
MOZ_B2G_LOADER=1
fi
MOZ_FOLD_LIBS=1
MOZ_JSDOWNLOADS=1

View File

@ -55,9 +55,6 @@ MOZ_PROFILE_MIGRATOR=1
MOZ_APP_STATIC_INI=1
MOZ_WEBAPP_RUNTIME=1
MOZ_MEDIA_NAVIGATOR=1
if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
MOZ_FOLD_LIBS=1
fi
MOZ_WEBGL_CONFORMANT=1
# Enable navigator.mozPay
MOZ_PAY=1

View File

@ -4100,6 +4100,15 @@ AC_SUBST(MOZ_B2G_VERSION)
AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
case "$OS_TARGET" in
WINNT|Darwin|Android)
MOZ_FOLD_LIBS=1
;;
*)
MOZ_FOLD_LIBS=
;;
esac
dnl ========================================================
dnl Check Android SDK version depending on mobile target.
dnl ========================================================

View File

@ -49,8 +49,6 @@ MOZ_APP_STATIC_INI=1
# Enable on-demand decompression
MOZ_ENABLE_SZIP=1
MOZ_FOLD_LIBS=1
# Enable navigator.mozPay
MOZ_PAY=1

View File

@ -17,7 +17,4 @@ MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_METRICS=1
MOZ_SERVICES_SYNC=1
MOZ_MEDIA_NAVIGATOR=1
if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
MOZ_FOLD_LIBS=1
fi
MOZ_SERVICES_HEALTHREPORT=1