Re: [PATCH] Re: etags name collision.

[Ergus <spacibba@aol.com>]

[-- Attachment #1: Type: text/plain, Size: 886 bytes --]

On Mon, Apr 11, 2022 at 07:40:29PM +0300, Eli Zaretskii wrote:
>> Date: Mon, 11 Apr 2022 18:19:42 +0200
>> From: Ergus <spacibba@aol.com>
>> Cc: emacs-devel@gnu.org
>>
>> On Mon, Apr 11, 2022 at 06:51:58PM +0300, Eli Zaretskii wrote:
>>
>> >The code should test whether another version of 'ctags' is already
>> >installed, and if so, that it isn't our 'ctags'.  _Then_ we could
>> >default to not installing our 'ctags'.  Your proposal doesn't make
>> >that test, so please add it.
>> >
>> >Thanks.
>> >
>> I do this tests like with mailutils and movemail:
>>
>> (ctags --version) >/dev/null 2>&1 || with_ctags=no
>>
>> Isn't this enough?
>
>No, because AFAIU this test will succeed also if the installed ctags
>is (an older version) of the program that came with (an older version)
>of Emacs.  You need to make sure the text emitted by --version does
>NOT include "GNU Emacs".
>
Now?


[-- Attachment #2: ctags.patch --]
[-- Type: text/plain, Size: 1610 bytes --]

diff --git a/configure.ac b/configure.ac
index 185e4d0862..ace80aed56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,6 +267,19 @@ AC_DEFUN
 fi
 AC_SUBST([with_mailutils])
 
+AC_ARG_WITH([ctags],
+  [AS_HELP_STRING([--with-ctags],
+     [rely on System ctags; this is the default if Universal ctags or
+      Exuberant ctags is installed])],
+  [],
+  [with_ctags=$with_features
+   if test "$with_ctags" = yes; then
+     (ctags --version | grep "GNU Emacs") 2>/dev/null || with_ctags=no
+   fi])
+if test "$with_ctags" = no; then
+  with_ctags=
+fi
+
 AC_ARG_WITH([pop],
   [AS_HELP_STRING([--with-pop],
      [Support POP mail retrieval if Emacs movemail is used (not recommended,
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 0453b93506..ee17576686 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -84,6 +84,9 @@ libexecdir=
 # Nonempty if Emacs can assume Mailutils is installed.
 with_mailutils=@with_mailutils@
 
+# Nonempty if Emacs can assume ctags is installed.
+with_ctags=@with_ctags@
+
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
 
@@ -144,8 +147,8 @@ HAIKU_CFLAGS=
 CLIENTW = @CLIENTW@
 
 # Things that a user might actually run, which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
-               ebrowse${EXEEXT}
+INSTALLABLES = etags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) ebrowse${EXEEXT} \
+	       $(if $(with_ctags), , ctags${EXEEXT})
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.