diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-05-05 17:24:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-05-05 17:24:27 +0200 |
| commit | 8f4ba6942d888c708cc1c85f7cb77cebb957c878 (patch) | |
| tree | 18144d4c493edbe5904d0a52f25f345e7e999f23 | |
| parent | d236ac0d49aca2f0fa5cb5232baae7a0b1b90d59 (diff) | |
| download | vim-git-8f4ba6942d888c708cc1c85f7cb77cebb957c878.tar.gz | |
updated for version 7.3.174v7.3.174
Problem: When Exuberant ctags binary is exctags it's not found.
Solution: Add configure check for exctags. (Hong Xu)
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index 4a4551511..62056675e 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -12031,7 +12031,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 $as_echo_n "checking how to create tags... " >&6; } test -f tags && mv tags tags.save -if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then +if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="exctags -I INIT+ --fields=+S" +elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then TAGPRG="ctags -I INIT+ --fields=+S" else TAGPRG="ctags" diff --git a/src/configure.in b/src/configure.in index 815d0e8c7..7f53c5037 100644 --- a/src/configure.in +++ b/src/configure.in @@ -2619,7 +2619,7 @@ else dnl On HP-UX 10.10 termcap or termlib should be used instead of dnl curses, because curses is much slower. dnl Newer versions of ncurses are preferred over anything, except - dnl when tinfo has been split off, it conains all we need. + dnl when tinfo has been split off, it contains all we need. dnl Older versions of ncurses have bugs, get a new one! dnl Digital Unix (OSF1) should use curses (Ronald Schild). dnl On SCO Openserver should prefer termlib (Roger Cornelius). @@ -3370,7 +3370,7 @@ dnl Link with xpg4, it is said to make Korean locale working AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) dnl Check how we can run ctags. Default to "ctags" when nothing works. -dnl --version for Exuberant ctags (preferred) +dnl Use --version to detect Exuberant ctags (preferred) dnl Add --fields=+S to get function signatures for omni completion. dnl -t for typedefs (many ctags have this) dnl -s for static functions (Elvis ctags only?) @@ -3378,7 +3378,9 @@ dnl -v for variables. Dangerous, most ctags take this for 'vgrind style'. dnl -i+m to test for older Exuberant ctags AC_MSG_CHECKING(how to create tags) test -f tags && mv tags tags.save -if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then +if (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="exctags -I INIT+ --fields=+S" +elif (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then TAGPRG="ctags -I INIT+ --fields=+S" else TAGPRG="ctags" diff --git a/src/version.c b/src/version.c index c44d2f16b..b6c460997 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 174, +/**/ 173, /**/ 172, |