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 <cb@256bit.org>

diff --git a/src/auto/configure b/src/auto/configure
index 2652a2a504c83cedab5d47caaece8eb8d860ea76..5f755924709ce8ae1eb798faf540eb499caed43b 100755 (executable)
--- 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\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5
 printf "%s\n" "$enable_cscope" >&6; }
 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
 

diff --git a/src/config.h.in b/src/config.h.in
index 1b8495515ff484e8d0377fe278d11e384230e4a3..fce8d5f44ffccb51eb8211a67cf132f57eb81d74 100644 (file)
--- 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 a4ff405bc2a21a7d50a611290c79a40cd9c2ffc7..9016f969933d0f897a25646a139eb7a2cc6c07cd 100644 (file)
--- 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 145de0be5fd32e5f4c4002c63437e018bfc9f08f..a87b9c2bbe3852e5bdc233b61fcb2cbfd679c1bb 100644 (file)
--- 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 e9e601aa2270505496ff3d30229c67eb1aaff762..60cb58b4e0881b30949a3af6fdece7e8c6cd6396 100644 (file)
--- 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,
 /**/