aboutsummaryrefslogtreecommitdiffstats
path: root/msdos
diff options
context:
space:
mode:
authorMattias EngdegÄrd2024-03-30 15:13:24 +0100
committerMattias EngdegÄrd2024-03-30 15:19:56 +0100
commit1135ce461d188869e0294af45641edc2cbfacbf0 (patch)
treefe0c7ec4113ac62c6ab0d28b9bc8bc81dc005906 /msdos
parent890edfd2bb8fd79730919972cc82811b73c7f572 (diff)
downloademacs-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 'msdos')
-rw-r--r--msdos/sed1v2.inp3
1 files changed, 0 insertions, 3 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 632c45a16b6..da056067548 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -175,9 +175,6 @@ s/ *@WEBP_LIBS@//
175/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/ 175/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/
176/^W32_OBJ *=/s/@W32_OBJ@// 176/^W32_OBJ *=/s/@W32_OBJ@//
177/^W32_LIBS *=/s/@W32_LIBS@// 177/^W32_LIBS *=/s/@W32_LIBS@//
178/^JSON_OBJ *=/s/@JSON_OBJ@//
179/^JSON_CFLAGS *=/s/@JSON_CFLAGS@//
180/^JSON_LIBS *=/s/@JSON_LIBS@//
181/^LIBGCCJIT_OBJ *=/s/@LIBGCCJIT_OBJ@// 178/^LIBGCCJIT_OBJ *=/s/@LIBGCCJIT_OBJ@//
182/^LIBGCCJIT_CFLAGS *=/s/@LIBGCCJIT_CFLAGS@// 179/^LIBGCCJIT_CFLAGS *=/s/@LIBGCCJIT_CFLAGS@//
183/^LIBGCCJIT_LIBS *=/s/@LIBGCCJIT_LIBS@// 180/^LIBGCCJIT_LIBS *=/s/@LIBGCCJIT_LIBS@//