Skip to content

Commit 8ced361

Browse files
committed
updated for version 7.3.174
Problem: When Exuberant ctags binary is exctags it's not found. Solution: Add configure check for exctags. (Hong Xu)
1 parent 5b1a973 commit 8ced361

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/auto/configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12031,7 +12031,9 @@ fi
1203112031
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5
1203212032
$as_echo_n "checking how to create tags... " >&6; }
1203312033
test -f tags && mv tags tags.save
12034-
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
12034+
if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
12035+
TAGPRG="exctags -I INIT+ --fields=+S"
12036+
elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
1203512037
TAGPRG="ctags -I INIT+ --fields=+S"
1203612038
else
1203712039
TAGPRG="ctags"

src/configure.in

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,7 +2619,7 @@ else
26192619
dnl On HP-UX 10.10 termcap or termlib should be used instead of
26202620
dnl curses, because curses is much slower.
26212621
dnl Newer versions of ncurses are preferred over anything, except
2622-
dnl when tinfo has been split off, it conains all we need.
2622+
dnl when tinfo has been split off, it contains all we need.
26232623
dnl Older versions of ncurses have bugs, get a new one!
26242624
dnl Digital Unix (OSF1) should use curses (Ronald Schild).
26252625
dnl On SCO Openserver should prefer termlib (Roger Cornelius).
@@ -3370,15 +3370,17 @@ dnl Link with xpg4, it is said to make Korean locale working
33703370
AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
33713371

33723372
dnl Check how we can run ctags. Default to "ctags" when nothing works.
3373-
dnl --version for Exuberant ctags (preferred)
3373+
dnl Use --version to detect Exuberant ctags (preferred)
33743374
dnl Add --fields=+S to get function signatures for omni completion.
33753375
dnl -t for typedefs (many ctags have this)
33763376
dnl -s for static functions (Elvis ctags only?)
33773377
dnl -v for variables. Dangerous, most ctags take this for 'vgrind style'.
33783378
dnl -i+m to test for older Exuberant ctags
33793379
AC_MSG_CHECKING(how to create tags)
33803380
test -f tags && mv tags tags.save
3381-
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
3381+
if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
3382+
TAGPRG="exctags -I INIT+ --fields=+S"
3383+
elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
33823384
TAGPRG="ctags -I INIT+ --fields=+S"
33833385
else
33843386
TAGPRG="ctags"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
174,
717719
/**/
718720
173,
719721
/**/

0 commit comments

Comments
 (0)