зеркало из https://github.com/mozilla/gecko-dev.git
Moving JS_STATIC_BUILD option below where we set BUILD_STATIC_LIBS so that it can be picked up. It also places this option with the reset of the static config options
This commit is contained in:
Родитель
76cffc6e09
Коммит
4dc2bfbcee
39
configure.in
39
configure.in
|
@ -5305,26 +5305,6 @@ if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \
|
|||
fi
|
||||
AC_SUBST(JS_ULTRASPARC_OPTS)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Force JS to be a static lib
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(js-static-build,
|
||||
[ --enable-js-static-build Force js to be a static lib],
|
||||
JS_STATIC_BUILD=1,
|
||||
JS_STATIC_BUILD= )
|
||||
|
||||
AC_SUBST(JS_STATIC_BUILD)
|
||||
|
||||
if test -n "$JS_STATIC_BUILD"; then
|
||||
AC_DEFINE(EXPORT_JS_API)
|
||||
|
||||
if test -z "$BUILD_STATIC_LIBS"; then
|
||||
AC_MSG_ERROR([--enable-js-static-build is only compatible with --enable-static])
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Feature options that require extra sources to be pulled
|
||||
|
@ -6208,6 +6188,25 @@ else
|
|||
XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS"
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Force JS to be a static lib
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(js-static-build,
|
||||
[ --enable-js-static-build Force js to be a static lib],
|
||||
JS_STATIC_BUILD=1,
|
||||
JS_STATIC_BUILD= )
|
||||
|
||||
AC_SUBST(JS_STATIC_BUILD)
|
||||
|
||||
if test -n "$JS_STATIC_BUILD"; then
|
||||
AC_DEFINE(EXPORT_JS_API)
|
||||
|
||||
if test -z "$BUILD_STATIC_LIBS"; then
|
||||
AC_MSG_ERROR([--enable-js-static-build is only compatible with --enable-static])
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Standalone module options
|
||||
|
|
Загрузка…
Ссылка в новой задаче