diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-05-10 15:42:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-05-10 15:42:03 +0200 |
| commit | 5897e0c47029512890ecec2c8dddfb9103b02d88 (patch) | |
| tree | d1d8b9ee7b1538a1a41bd4ea1b12fc6cab43a546 | |
| parent | 05da428462ac4ec73de78250eca185da68049170 (diff) | |
| download | vim-git-5897e0c47029512890ecec2c8dddfb9103b02d88.tar.gz | |
updated for version 7.3.183v7.3.183
Problem: When Exuberant ctags binary is exuberant-ctags it's not found.
Solution: Add configure check for exuberant-ctags.
| -rwxr-xr-x | src/auto/configure | 8 | ||||
| -rw-r--r-- | src/configure.in | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/auto/configure b/src/auto/configure index f7a77d440..dbfe36a72 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -12028,10 +12028,12 @@ 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 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 +if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then TAGPRG="ctags -I INIT+ --fields=+S" +elif (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="exctags -I INIT+ --fields=+S" +elif (eval exuberant-ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then + TAGPRG="exuberant-ctags -I INIT+ --fields=+S" else TAGPRG="ctags" (eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags" diff --git a/src/configure.in b/src/configure.in index 0f5ce408b..3ab8c52cc 100644 --- a/src/configure.in +++ b/src/configure.in @@ -3375,10 +3375,12 @@ 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 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 +if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then TAGPRG="ctags -I INIT+ --fields=+S" +elif (eval exctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="exctags -I INIT+ --fields=+S" +elif (eval exuberant-ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then + TAGPRG="exuberant-ctags -I INIT+ --fields=+S" else TAGPRG="ctags" (eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags" diff --git a/src/version.c b/src/version.c index 774758602..a2843e65a 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 */ /**/ + 183, +/**/ 182, /**/ 181, |