procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the --without-all build with tree-sitter

Browse source 
* configure.ac (HAVE_TREE_SITTER): Set NEED_DYNLIB=yes, since
tree-sitter support requires dynlib.o.  (Bug#60061)
This commit is contained in:
Eli Zaretskii 2022-12-21 21:52:18 +02:00
parent ec9fbad908
commit c088cdad9e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -3220,6 +3220,7 @@ AC_SUBST([JSON_OBJ])
HAVE_TREE_SITTER=no HAVE_TREE_SITTER=no
TREE_SITTER_OBJ= TREE_SITTER_OBJ=
NEED_DYNLIB=no
if test "${with_tree_sitter}" != "no"; then if test "${with_tree_sitter}" != "no"; then
dnl Tree-sitter 0.20.2 added support to change the malloc it uses dnl Tree-sitter 0.20.2 added support to change the malloc it uses
@ -3245,6 +3246,7 @@ if test "${with_tree_sitter}" != "no"; then
LIBS=$OLD_LIBS LIBS=$OLD_LIBS
if test "$ac_cv_func_ts_set_allocator" = yes; then if test "$ac_cv_func_ts_set_allocator" = yes; then
AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.]) AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
NEED_DYNLIB=yes
else else
AC_MSG_ERROR([Tree-sitter library exists but its version is too old]); AC_MSG_ERROR([Tree-sitter library exists but its version is too old]);
TREE_SITTER_CFLAGS= TREE_SITTER_CFLAGS=
@ -4154,7 +4156,6 @@ AC_SUBST(DYNAMIC_LIB_SECONDARY_SUFFIX)
LIBMODULES= LIBMODULES=
HAVE_MODULES=no HAVE_MODULES=no
MODULES_OBJ= MODULES_OBJ=
NEED_DYNLIB=no
MODULES_SUFFIX="${DYNAMIC_LIB_SUFFIX}" MODULES_SUFFIX="${DYNAMIC_LIB_SUFFIX}"
MODULES_SECONDARY_SUFFIX="${DYNAMIC_LIB_SECONDARY_SUFFIX}" MODULES_SECONDARY_SUFFIX="${DYNAMIC_LIB_SECONDARY_SUFFIX}"