diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 59 |
1 files changed, 49 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 2d843440503..7d751fd6a81 100644 --- a/configure.ac +++ b/configure.ac @@ -463,6 +463,7 @@ OPTION_DEFAULT_ON([xml2],[don't compile with XML parsing support]) OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support]) OPTION_DEFAULT_ON([native-image-api], [don't use native image APIs (GDI+ on Windows)]) OPTION_DEFAULT_IFAVAILABLE([json], [compile with native JSON support]) +OPTION_DEFAULT_IFAVAILABLE([tree-sitter], [compile with tree-sitter]) OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts]) OPTION_DEFAULT_ON([harfbuzz],[don't use HarfBuzz for text shaping]) @@ -3210,6 +3211,26 @@ AC_SUBST([JSON_LIBS]) AC_SUBST([JSON_CFLAGS]) AC_SUBST([JSON_OBJ]) +HAVE_TREE_SITTER=no +TREE_SITTER_OBJ= + +if test "${with_tree_sitter}" != "no"; then + dnl TODO: we should use tree-sitter >= 0.20.2, but right now all + dnl tree-sitter libraries distributed are versioned at 0.0, so for + dnl the easy of development we'll just leave the version + dnl requirement at 0.0 for now. + EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.0], + [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no]) + if test "${HAVE_TREE_SITTER}" = yes; then + AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.]) + TREE_SITTER_OBJ="treesit.o" + fi +fi + +AC_SUBST(TREE_SITTER_LIBS) +AC_SUBST(TREE_SITTER_CFLAGS) +AC_SUBST(TREE_SITTER_OBJ) + NOTIFY_OBJ= NOTIFY_SUMMARY=no @@ -4080,20 +4101,31 @@ if test "${HAVE_ZLIB}" = "yes"; then fi AC_SUBST([LIBZ]) +### Dynamic library support +case $opsys in + cygwin|mingw32) DYNAMIC_LIB_SUFFIX=".dll" ;; + darwin) DYNAMIC_LIB_SUFFIX=".dylib" ;; + *) DYNAMIC_LIB_SUFFIX=".so" ;; +esac +case "${opsys}" in + darwin) DYNAMIC_LIB_SECONDARY_SUFFIX='.so' ;; + *) DYNAMIC_LIB_SECONDARY_SUFFIX='' ;; +esac +AC_DEFINE_UNQUOTED(DYNAMIC_LIB_SUFFIX, "$DYNAMIC_LIB_SUFFIX", + [System extension for dynamic libraries]) +AC_DEFINE_UNQUOTED(DYNAMIC_LIB_SECONDARY_SUFFIX, "$DYNAMIC_LIB_SECONDARY_SUFFIX", + [Alternative system extension for dynamic libraries.]) + +AC_SUBST(DYNAMIC_LIB_SUFFIX) +AC_SUBST(DYNAMIC_LIB_SECONDARY_SUFFIX) + ### Dynamic modules support LIBMODULES= HAVE_MODULES=no MODULES_OBJ= NEED_DYNLIB=no -case $opsys in - cygwin|mingw32) MODULES_SUFFIX=".dll" ;; - darwin) MODULES_SUFFIX=".dylib" ;; - *) MODULES_SUFFIX=".so" ;; -esac -case "${opsys}" in - darwin) MODULES_SECONDARY_SUFFIX='.so' ;; - *) MODULES_SECONDARY_SUFFIX='' ;; -esac +MODULES_SUFFIX="${DYNAMIC_LIB_SUFFIX}" +MODULES_SECONDARY_SUFFIX="${DYNAMIC_LIB_SECONDARY_SUFFIX}" # pgtkterm.c uses dlsym if test $window_system = pgtk; then @@ -4510,6 +4542,12 @@ case $with_json,$HAVE_JSON in *) MISSING="$MISSING json" WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-json=ifavailable";; esac +case $with_tree_sitter,$HAVE_TREE_SITTER in + no,* | ifavailable,* | *,yes) ;; + *) MISSING="$MISSING tree-sitter" + WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-tree-sitter=ifavailable";; +esac + if test "X${MISSING}" != X; then # If we have a missing library, and we don't have pkg-config installed, # the missing pkg-config may be the reason. Give the user a hint. @@ -6550,7 +6588,7 @@ Configured for '${canonical}'. optsep= emacs_config_features= for opt in ACL BE_APP CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \ - HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \ + HARFBUZZ IMAGEMAGICK JPEG JSON TREE-SITTER LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \ M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP \ SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS \ UNEXEC WEBP X11 XAW3D XDBE XFT XIM XINPUT2 XPM XWIDGETS X_TOOLKIT \ @@ -6621,6 +6659,7 @@ AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D Does Emacs use -lxft? ${HAVE_XFT} Does Emacs use -lsystemd? ${HAVE_LIBSYSTEMD} Does Emacs use -ljansson? ${HAVE_JSON} + Does Emacs use -ltree-sitter? ${HAVE_TREE_SITTER} Does Emacs use the GMP library? ${HAVE_GMP} Does Emacs directly use zlib? ${HAVE_ZLIB} Does Emacs have dynamic modules support? ${HAVE_MODULES} |