From 1135ce461d188869e0294af45641edc2cbfacbf0 Mon Sep 17 00:00:00 2001
From: Mattias Engdegård
Date: Sat, 30 Mar 2024 15:13:24 +0100
Subject: 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.
---
 java/INSTALL                        | 8 --------
 java/org/gnu/emacs/EmacsNative.java | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'java')

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
 However, the old ``Android.mk'' Makefiles are still present in older
 branches, and can be easily adapted to newer versions.
 
-In addition, some Emacs dependencies provide `ndk-build' support
-themselves:
-
-  libjansson	- https://github.com/akheron/jansson
-    (You must add LOCAL_EXPORT_INCLUDES := $(LOCAL_C_INCLUDES) before
-     its Android.mk includes $(BUILD_SHARED_LIBRARY), then copy
-     android/jansson_config.h to android/jansson_private_config.h.)
-
 Emacs developers have ported the following dependencies to ARM Android
 systems:
 
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
 				 "gnutls_emacs", "gmp_emacs",
 				 "nettle_emacs", "p11-kit_emacs",
 				 "tasn1_emacs", "hogweed_emacs",
-				 "jansson_emacs", "jpeg_emacs",
+				 "jpeg_emacs",
 				 "tiff_emacs", "xml2_emacs",
 				 "icuuc_emacs", "harfbuzz_emacs",
 				 "tree-sitter_emacs", };
-- 
cgit v1.2.1