From 46ca396f8c58ce6c0c95bc6ac09134ec9adc9cae Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 3 Jan 2021 23:40:35 -0500
Subject: Issue #61 - Add configure option for non-windows platforms

Windows will ALWAYS have this enabled but we eventually want all target operating systems to use this as well but that will require more work
---
 old-configure.in | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'old-configure.in')

diff --git a/old-configure.in b/old-configure.in
index 07b8535c8..33b808973 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -4614,19 +4614,31 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Static build options)
 
+# 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
-if test -n "$JS_SHARED_LIBRARY" -o "$GKMEDIAS_SHARED_LIBRARY"; then
-  ZLIB_IN_MOZGLUE=1
-  AC_DEFINE(ZLIB_IN_MOZGLUE)
-fi
+  # 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)
-- 
cgit v1.2.3