diff options
| author | Mattias EngdegÄrd | 2024-03-30 15:13:24 +0100 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2024-03-30 15:19:56 +0100 |
| commit | 1135ce461d188869e0294af45641edc2cbfacbf0 (patch) | |
| tree | fe0c7ec4113ac62c6ab0d28b9bc8bc81dc005906 /java | |
| parent | 890edfd2bb8fd79730919972cc82811b73c7f572 (diff) | |
| download | emacs-1135ce461d188869e0294af45641edc2cbfacbf0.tar.gz emacs-1135ce461d188869e0294af45641edc2cbfacbf0.zip | |
Always enable native JSON support and remove Jansson references
* src/json.c (Fjson__available_p): Remove.
* lisp/subr.el (json-available-p): Always return t.
* admin/nt/dist-build/build-dep-zips.py:
* configure.ac:
* doc/lispref/text.texi (Parsing JSON):
* java/INSTALL:
* java/org/gnu/emacs/EmacsNative.java (EmacsNative):
* lisp/term/w32-win.el (dynamic-library-alist):
* m4/ndk-build.m4 (ndk_INIT):
* msdos/sed1v2.inp:
* nt/INSTALL:
* nt/INSTALL.W64:
* src/Makefile.in:
* src/emacs.c (main):
* src/lisp.h:
Remove JSON configuration options and references to it and Jansson from
documentation and build files.
* etc/NEWS: Announce.
Diffstat (limited to 'java')
| -rw-r--r-- | java/INSTALL | 8 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsNative.java | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/java/INSTALL b/java/INSTALL index f1063b40c25..6daef59084e 100644 --- a/java/INSTALL +++ b/java/INSTALL | |||
| @@ -307,14 +307,6 @@ Many of these dependencies have been migrated over to the | |||
| 307 | However, the old ``Android.mk'' Makefiles are still present in older | 307 | However, the old ``Android.mk'' Makefiles are still present in older |
| 308 | branches, and can be easily adapted to newer versions. | 308 | branches, and can be easily adapted to newer versions. |
| 309 | 309 | ||
| 310 | In addition, some Emacs dependencies provide `ndk-build' support | ||
| 311 | themselves: | ||
| 312 | |||
| 313 | libjansson - https://github.com/akheron/jansson | ||
| 314 | (You must add LOCAL_EXPORT_INCLUDES := $(LOCAL_C_INCLUDES) before | ||
| 315 | its Android.mk includes $(BUILD_SHARED_LIBRARY), then copy | ||
| 316 | android/jansson_config.h to android/jansson_private_config.h.) | ||
| 317 | |||
| 318 | Emacs developers have ported the following dependencies to ARM Android | 310 | Emacs developers have ported the following dependencies to ARM Android |
| 319 | systems: | 311 | systems: |
| 320 | 312 | ||
diff --git a/java/org/gnu/emacs/EmacsNative.java b/java/org/gnu/emacs/EmacsNative.java index 654e94b1a7d..24440bd5953 100644 --- a/java/org/gnu/emacs/EmacsNative.java +++ b/java/org/gnu/emacs/EmacsNative.java | |||
| @@ -337,7 +337,7 @@ public final class EmacsNative | |||
| 337 | "gnutls_emacs", "gmp_emacs", | 337 | "gnutls_emacs", "gmp_emacs", |
| 338 | "nettle_emacs", "p11-kit_emacs", | 338 | "nettle_emacs", "p11-kit_emacs", |
| 339 | "tasn1_emacs", "hogweed_emacs", | 339 | "tasn1_emacs", "hogweed_emacs", |
| 340 | "jansson_emacs", "jpeg_emacs", | 340 | "jpeg_emacs", |
| 341 | "tiff_emacs", "xml2_emacs", | 341 | "tiff_emacs", "xml2_emacs", |
| 342 | "icuuc_emacs", "harfbuzz_emacs", | 342 | "icuuc_emacs", "harfbuzz_emacs", |
| 343 | "tree-sitter_emacs", }; | 343 | "tree-sitter_emacs", }; |