emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 c088cdad9e: Fix the --without-all build with tree-sitter


From: Eli Zaretskii
Subject: emacs-29 c088cdad9e: Fix the --without-all build with tree-sitter
Date: Wed, 21 Dec 2022 14:53:42 -0500 (EST)

branch: emacs-29
commit c088cdad9e94f905c23783d7d02c6ca44aed8310
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix the --without-all build with tree-sitter
    
    * configure.ac (HAVE_TREE_SITTER): Set NEED_DYNLIB=yes, since
    tree-sitter support requires dynlib.o.  (Bug#60061)
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 432638f872..ac29f351fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3220,6 +3220,7 @@ AC_SUBST([JSON_OBJ])
 
 HAVE_TREE_SITTER=no
 TREE_SITTER_OBJ=
+NEED_DYNLIB=no
 
 if test "${with_tree_sitter}" != "no"; then
    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
       if test "$ac_cv_func_ts_set_allocator" = yes; then
         AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
+       NEED_DYNLIB=yes
       else
         AC_MSG_ERROR([Tree-sitter library exists but its version is too old]);
         TREE_SITTER_CFLAGS=
@@ -4154,7 +4156,6 @@ AC_SUBST(DYNAMIC_LIB_SECONDARY_SUFFIX)
 LIBMODULES=
 HAVE_MODULES=no
 MODULES_OBJ=
-NEED_DYNLIB=no
 MODULES_SUFFIX="${DYNAMIC_LIB_SUFFIX}"
 MODULES_SECONDARY_SUFFIX="${DYNAMIC_LIB_SECONDARY_SUFFIX}"
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]