patch 9.1.1589: Cannot disable cscope interface using configure
Commit:
https://github.com/vim/vim/commit/b124b8d276fd465bff78111113256b308f6a7f8d
Author: Christian Brabandt <c...@256bit.org>
Date: Fri Jul 25 18:27:53 2025 +0200
patch 9.1.1589: Cannot disable cscope interface using configure
Problem: Cannot disable cscope interface using configure, because in
feature.h FEAT_CSCOPE will always be enabled for huge builds
(chdiza)
Solution: Don't define FEAT_CSCOPE from configure script but set the
ENABLE_CSCOPE flag and check for the presence of that flag in
feature.h
fixes: #17825
closes: #17842
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/auto/configure b/src/auto/configure
index 2652a2a50..5f7559247 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -8653,14 +8653,14 @@ if test ${enable_cscope+y}
then :
enableval=$enable_cscope;
else case e in #(
- e) enable_cscope="no" ;;
+ e) enable_cscope="yes" ;;
esac
fi
{ printf "%s
" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5
printf "%s
" "$enable_cscope" >&6; }
if test "$enable_cscope" = "yes"; then
- printf "%s
" "#define FEAT_CSCOPE 1" >>confdefs.h
+ printf "%s
" "#define ENABLE_CSCOPE 1" >>confdefs.h
fi
diff --git a/src/config.h.in b/src/config.h.in
index 1b8495515..fce8d5f44 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -395,7 +395,7 @@
#undef HAVE_SYSMOUSE
/* Define if you want to include the Cscope interface. */
-#undef FEAT_CSCOPE
+#undef ENABLE_CSCOPE
/* Define if you don't want to include right-left support. */
#undef DISABLE_RIGHTLEFT
diff --git a/src/configure.ac b/src/configure.ac
index a4ff405bc..9016f9699 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2168,10 +2168,10 @@ AC_SUBST(RUBY_LIBS)
AC_MSG_CHECKING(--enable-cscope argument)
AC_ARG_ENABLE(cscope,
[ --enable-cscope Include cscope interface.], ,
- [enable_cscope="no"])
+ [enable_cscope="yes"])
AC_MSG_RESULT($enable_cscope)
if test "$enable_cscope" = "yes"; then
- AC_DEFINE(FEAT_CSCOPE)
+ AC_DEFINE(ENABLE_CSCOPE)
fi
AC_MSG_CHECKING(--disable-netbeans argument)
diff --git a/src/feature.h b/src/feature.h
index 145de0be5..a87b9c2bb 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -236,7 +236,7 @@
/*
* +cscope Unix only: Cscope support.
*/
-#if defined(UNIX) && defined(FEAT_HUGE) && !defined(FEAT_CSCOPE) &&
!defined(MACOS_X)
+#if defined(UNIX) && defined(FEAT_HUGE) && defined(ENABLE_CSCOPE) &&
!defined(MACOS_X)
# define FEAT_CSCOPE
#endif
diff --git a/src/version.c b/src/version.c
index e9e601aa2..60cb58b4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1589,
/**/
1588,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1ufLJC-009vVC-Rn%40256bit.org.
