Bug 970757 - Fixup MOZ_JS_LIBS after bug 969164. r=gps

--HG--
extra : amend_source : 8b56fb4e59fb59fc483bd1339782c111ae90ee29
This commit is contained in:
Mike Hommey 2014-02-11 14:09:33 +09:00
parent fcdbc60cd4
commit 393ad9ee79

View File

@ -7689,14 +7689,6 @@ dnl =
dnl ========================================================
MOZ_ARG_HEADER(Static build options)
if test -n "$JS_SHARED_LIBRARY"; then
MOZ_JS_LIBS="$MOZ_JS_SHARED_LIBS"
else
MOZ_JS_LIBS="$MOZ_JS_STATIC_LIBS"
AC_DEFINE(MOZ_STATIC_JS)
fi
AC_SUBST(JS_SHARED_LIBRARY)
AC_SUBST(LIBXUL_LIBS)
XPCOM_LIBS="$LIBXUL_LIBS"
@ -8752,6 +8744,14 @@ if test -n "$MOZ_NATIVE_ICU"; then
MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
fi
if test -n "$JS_SHARED_LIBRARY"; then
MOZ_JS_LIBS="$MOZ_JS_SHARED_LIBS"
else
MOZ_JS_LIBS="$MOZ_JS_STATIC_LIBS"
AC_DEFINE(MOZ_STATIC_JS)
fi
AC_SUBST(JS_SHARED_LIBRARY)
MOZ_CREATE_CONFIG_STATUS()
# No need to run subconfigures when building with LIBXUL_SDK_DIR