summaryrefslogtreecommitdiffstats
path: root/js/src/old-configure.in
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 21:49:04 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 21:49:04 +0200
commit39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch)
tree52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /js/src/old-configure.in
parenta1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff)
parentc2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff)
downloadUXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar
UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz
UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz
UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz
UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'js/src/old-configure.in')
-rw-r--r--js/src/old-configure.in16
1 files changed, 15 insertions, 1 deletions
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 6566ce05e..dc3d7da04 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -435,6 +435,7 @@ LIB_SUFFIX=a
IMPORT_LIB_SUFFIX=
DIRENT_INO=d_ino
MOZ_USER_DIR=".mozilla"
+MOZ_DEVTOOLS_SERVER=1
MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
@@ -1905,6 +1906,20 @@ dnl =
dnl ========================================================
MOZ_ARG_HEADER(Misc. Options)
+dnl ========================================================
+dnl = Disable Mozilla Developer Tools (server)
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(devtools-server,
+[ --disable-devtools-server Disable Mozilla Developer Tools (server)],
+ MOZ_DEVTOOLS_SERVER=,
+ MOZ_DEVTOOLS_SERVER=1)
+
+if test -n "$MOZ_DEVTOOLS_SERVER"; then
+ AC_DEFINE(MOZ_DEVTOOLS_SERVER)
+fi
+
+AC_SUBST(MOZ_DEVTOOLS_SERVER)
+
if test -z "$SKIP_COMPILER_CHECKS"; then
dnl ========================================================
dnl =
@@ -2157,7 +2172,6 @@ HOST_CXXFLAGS=`echo \
$HOST_CXXFLAGS`
AC_SUBST(_DEPEND_CFLAGS)
-AC_SUBST(MOZ_SYSTEM_NSPR)
OS_CFLAGS="$CFLAGS"
OS_CXXFLAGS="$CXXFLAGS"