adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1589: Cannot disable cscope interface using configure

Browse Source 
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 <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-07-25 18:27:53 +02:00
parent a566a78029
commit b124b8d276
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auto/configure vendored
View File

@ -8653,14 +8653,14 @@ if test ${enable_cscope+y}
then : then :
enableval=$enable_cscope; enableval=$enable_cscope;
else case e in #( else case e in #(
e) enable_cscope="no" ;; e) enable_cscope="yes" ;;
esac esac
fi fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5
printf "%s\n" "$enable_cscope" >&6; } printf "%s\n" "$enable_cscope" >&6; }
if test "$enable_cscope" = "yes"; then if test "$enable_cscope" = "yes"; then
printf "%s\n" "#define FEAT_CSCOPE 1" >>confdefs.h printf "%s\n" "#define ENABLE_CSCOPE 1" >>confdefs.h
fi fi

2
src/config.h.in
View File

@ -395,7 +395,7 @@
#undef HAVE_SYSMOUSE #undef HAVE_SYSMOUSE
/* Define if you want to include the Cscope interface. */ /* 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. */ /* Define if you don't want to include right-left support. */
#undef DISABLE_RIGHTLEFT #undef DISABLE_RIGHTLEFT

4
src/configure.ac
View File

@ -2168,10 +2168,10 @@ AC_SUBST(RUBY_LIBS)
AC_MSG_CHECKING(--enable-cscope argument) AC_MSG_CHECKING(--enable-cscope argument)
AC_ARG_ENABLE(cscope, AC_ARG_ENABLE(cscope,
[ --enable-cscope Include cscope interface.], , [ --enable-cscope Include cscope interface.], ,
[enable_cscope="no"]) [enable_cscope="yes"])
AC_MSG_RESULT($enable_cscope) AC_MSG_RESULT($enable_cscope)
if test "$enable_cscope" = "yes"; then if test "$enable_cscope" = "yes"; then
AC_DEFINE(FEAT_CSCOPE) AC_DEFINE(ENABLE_CSCOPE)
fi fi
AC_MSG_CHECKING(--disable-netbeans argument) AC_MSG_CHECKING(--disable-netbeans argument)

2
src/feature.h
View File

@ -236,7 +236,7 @@
/* /*
* +cscope Unix only: Cscope support. * +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 # define FEAT_CSCOPE
#endif #endif

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1589,
/**/ /**/
1588, 1588,
/**/ /**/