diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 14:09:31 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 14:09:31 -0500 |
| commit | 9dcf77e4c67b159040f1f07aca9a8cad8008a914 (patch) | |
| tree | 5b05a1773a34812c5dcbcb257a245fd189518c5a /old-configure.in | |
| parent | f28984b853667da9f9841e9fa090162e4a3af499 (diff) | |
| download | uxp-9dcf77e4c67b159040f1f07aca9a8cad8008a914.tar.gz | |
Split MOZ_DEVTOOLS into MOZ_DEVTOOLS (client) and MOZ_DEVTOOLS_SERVER (backend) and make both optional
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/old-configure.in b/old-configure.in index 0b78f2b232..f9e76e727c 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2314,8 +2314,9 @@ MOZ_CONTENT_SANDBOX= MOZ_GMP_SANDBOX= MOZ_SANDBOX=1 MOZ_BINARY_EXTENSIONS= -MOZ_DEVTOOLS=server MOZ_JETPACK=1 +MOZ_DEVTOOLS_SERVER=1 +MOZ_DEVTOOLS= case "$target_os" in mingw*) @@ -4807,6 +4808,44 @@ fi AC_SUBST(MOZ_JETPACK) 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 + if test ! -n "$MOZ_JETPACK"; then + AC_MSG_ERROR("Jetpack is required to include the Developer Tools Server") + fi + + AC_DEFINE(MOZ_DEVTOOLS_SERVER) +fi + +AC_SUBST(MOZ_DEVTOOLS_SERVER) + +dnl ======================================================== +dnl = Enable Mozilla Developer Tools (client) +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(devtools, +[ --enable-devtools Enable Mozilla Developer Tools (client)], + MOZ_DEVTOOLS=1, + MOZ_DEVTOOLS=) + +if test -n "$MOZ_DEVTOOLS"; then + if test ! -n "$MOZ_DEVTOOLS_SERVER"; then + AC_MSG_ERROR("The Developer Tools Server is required to include the client") + fi + + AC_DEFINE(MOZ_DEVTOOLS) +fi + +AC_SUBST(MOZ_DEVTOOLS) + +dnl ======================================================== dnl = Define default location for MOZILLA_FIVE_HOME dnl ======================================================== MOZ_ARG_WITH_STRING(default-mozilla-five-home, @@ -5688,7 +5727,6 @@ AC_SUBST(LIBJPEG_TURBO_USE_YASM) AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS) AC_SUBST(MOZ_LIBAV_FFT) AC_SUBST_LIST(LIBAV_FFT_ASFLAGS) -AC_SUBST(MOZ_DEVTOOLS) AC_SUBST(MOZ_PACKAGE_JSSHELL) AC_SUBST(MOZ_FOLD_LIBS) |