diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-01-04 11:29:47 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-01-04 11:29:47 +0000 |
| commit | 5af0c434b97770f38c505f03a085229a12c277d4 (patch) | |
| tree | 1c4335d2d2a2e6369b042d70c6fa4db91d9b5519 /old-configure.in | |
| parent | a625decfc91a0e973392c6d4f3339ff6b0615741 (diff) | |
| parent | 1a4abb5d974997db97c1534dd1f36d70788b6562 (diff) | |
| download | UXP-5af0c434b97770f38c505f03a085229a12c277d4.tar UXP-5af0c434b97770f38c505f03a085229a12c277d4.tar.gz UXP-5af0c434b97770f38c505f03a085229a12c277d4.tar.lz UXP-5af0c434b97770f38c505f03a085229a12c277d4.tar.xz UXP-5af0c434b97770f38c505f03a085229a12c277d4.zip | |
Merge branch '61'
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/old-configure.in b/old-configure.in index c06687f14..004ae6c96 100644 --- a/old-configure.in +++ b/old-configure.in @@ -4569,11 +4569,31 @@ dnl = dnl ======================================================== MOZ_ARG_HEADER(Static build options) -if test -z "$MOZ_SYSTEM_ZLIB"; then -if test -n "$JS_SHARED_LIBRARY"; then - ZLIB_IN_MOZGLUE=1 - AC_DEFINE(ZLIB_IN_MOZGLUE) +# Option to enable shared gkmedias on other target operating systems. +# This is overriden for Windows regardless if it is set or not. +MOZ_ARG_ENABLE_BOOL(shared-media, +[ --enable-shared-media Build GKMedias as a shared lib], + GKMEDIAS_SHARED_LIBRARY=1, + GKMEDIAS_SHARED_LIBRARY=) + +# We want gkmedias always be enabled on Windows regardless of the enable bool. +if test "$OS_ARCH" = "WINNT"; then + GKMEDIAS_SHARED_LIBRARY=1 +fi + +if test -n "$GKMEDIAS_SHARED_LIBRARY"; then + AC_DEFINE(GKMEDIAS_SHARED_LIBRARY) fi + +AC_SUBST(GKMEDIAS_SHARED_LIBRARY) + +# Shared JS or gkmedias needs zlib in mozglue +if test -z "$MOZ_SYSTEM_ZLIB"; then + # XXX: Currently JS_SHARED_LIBRARY lives in mozconfigure + if test -n "$JS_SHARED_LIBRARY" -o "$GKMEDIAS_SHARED_LIBRARY"; then + ZLIB_IN_MOZGLUE=1 + AC_DEFINE(ZLIB_IN_MOZGLUE) + fi fi AC_SUBST(ZLIB_IN_MOZGLUE) |