Commit f094186c authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747501 - Move ZLIB_IN_MOZGLUE to python configure. r=firefox-build-system-reviewers,andi 

Differential Revision: https://phabricator.services.mozilla.com/D134643
parent 9ea3f97b

js/moz.configure

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ def shared_js(shared_js, export_js): 




set_config("JS_SHARED_LIBRARY", shared_js)

add_old_configure_assignment("JS_SHARED_LIBRARY", shared_js)





@depends(shared_js, "--disable-export-js", when=js_standalone)

js/src/old-configure.in

+0 −5
Original line number Diff line number Diff line
@@ -967,11 +967,6 @@ dnl = 
dnl ========================================================

MOZ_ARG_HEADER(External Packages)



if test -n "$ZLIB_IN_MOZGLUE"; then

    AC_DEFINE(ZLIB_IN_MOZGLUE)

fi

AC_SUBST(ZLIB_IN_MOZGLUE)



dnl ========================================================

dnl =

dnl = Application

js/sub.configure

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ def old_js_configure_env(substs, mozconfig): 
    for var in (

        "MOZ_DEV_EDITION",

        "STLPORT_LIBS",

        "ZLIB_IN_MOZGLUE",

        "RANLIB",

    ):

        if var in substs:

moz.configure

+12 −1
Original line number Diff line number Diff line
@@ -331,6 +331,8 @@ set_config("WASM_OBJ_SUFFIX", "wasm") 
profiling = dependable(False)

# Same for js_standalone

js_standalone = dependable(False)

js_shared = dependable(False)

moz_linker = dependable(False)

# Same for fold_libs

fold_libs = dependable(False)
@@ -922,7 +924,16 @@ def deprecated_system_zlib_path(value): 
pkg_check_modules("MOZ_ZLIB", "zlib >= 1.2.3", when="--with-system-zlib")



set_config("MOZ_SYSTEM_ZLIB", True, when="--with-system-zlib")

add_old_configure_assignment("MOZ_SYSTEM_ZLIB", True, when="--with-system-zlib")





@depends("--with-system-zlib", js_shared, moz_linker, target.os)

def zlib_in_mozglue(system_zlib, js_shared, linker, os):

    if not system_zlib and (js_shared or linker or os == "Android"):

        return True





set_config("ZLIB_IN_MOZGLUE", zlib_in_mozglue)

set_define("ZLIB_IN_MOZGLUE", zlib_in_mozglue)





# Please do not add configure checks from here on.

old-configure.in

+0 −9
Original line number Diff line number Diff line
@@ -1402,15 +1402,6 @@ dnl = 
dnl ========================================================

MOZ_ARG_HEADER(Static build options)



if test -z "$MOZ_SYSTEM_ZLIB"; then

if test -n "$JS_SHARED_LIBRARY" -o -n "$MOZ_LINKER" -o "$MOZ_WIDGET_TOOLKIT" = android; then

  ZLIB_IN_MOZGLUE=1

  AC_DEFINE(ZLIB_IN_MOZGLUE)

fi

fi



AC_SUBST(ZLIB_IN_MOZGLUE)



dnl ========================================================

dnl =

dnl = Standalone module options