diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 3186c2c76a..7953ac6232 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -226,6 +226,7 @@ def old_configure_options(*options):
     '--enable-safe-browsing',
     '--enable-sandbox',
     '--enable-security-sqlstore',
+    '--enable-shared-media',
     '--enable-signmar',
     '--enable-simulator',
     '--enable-small-chunk-size',
diff --git a/old-configure.in b/old-configure.in
index a018fb29f7..aaabbba288 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -4566,19 +4566,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)