Commit | Line | Data |
---|---|---|
484bef42 FF |
1 | diff -u -r ../ctags-a39f842455fdcc47b812c35c6bf0f19735034de0/configure.ac ./configure.ac |
2 | --- ../ctags-a39f842455fdcc47b812c35c6bf0f19735034de0/configure.ac 2017-02-24 10:02:41.000000000 +0100 | |
3 | +++ ./configure.ac 2017-03-01 18:10:59.298643710 +0100 | |
21bd2cf4 FF |
4 | @@ -7,7 +7,14 @@ |
5 | # Process this file with autoconf to produce a configure script. | |
4704ce64 | 6 | |
21bd2cf4 FF |
7 | AC_PREREQ([2.59]) |
8 | -AC_INIT([universal-ctags],[0.0.0]) | |
9 | +# Avoid identifying as | |
10 | +# Universal Ctags 0.0.0, Copyright (C) 2015 Universal Ctags Team | |
11 | +# Universal Ctags is derived from Exuberant Ctags. | |
12 | +# Exuberant Ctags 5.8, Copyright (C) 1996-2009 Darren Hiebert | |
13 | +# since that causes at least vim-easytags to identify the ctags | |
14 | +# version as 0.0.0, see | |
15 | +# https://github.com/xolox/vim-easytags/blob/master/autoload/xolox/easytags.vim | |
16 | +AC_INIT([universal-ctags],[5.8]) | |
17 | AM_INIT_AUTOMAKE([foreign subdir-objects]) | |
18 | AM_SILENT_RULES([yes]) | |
19 | AC_CONFIG_HEADERS([config.h]) | |
484bef42 | 20 | @@ -591,16 +598,7 @@ |
49bbfde9 FF |
21 | |
22 | AH_TEMPLATE([HAVE_LIBXML], | |
23 | [Define this value if libxml is available.]) | |
24 | -dnl About the condition of version | |
25 | -dnl see https://mail.gnome.org/archives/xml/2010-February/msg00008.html | |
484bef42 FF |
26 | -AS_IF([test "x$enable_xml" != "xno"], [ |
27 | - PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7], | |
28 | - [have_libxml=yes | |
29 | - AC_DEFINE(HAVE_LIBXML)], | |
30 | - [AS_IF([test "x$enable_xml" = "xyes"], [ | |
31 | - AC_MSG_ERROR([libxml2 not found])])]) | |
32 | -]) | |
4704ce64 | 33 | -AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes) |
49bbfde9 | 34 | +AM_CONDITIONAL(HAVE_LIBXML, [test true = false]) |
4704ce64 | 35 | |
484bef42 FF |
36 | AC_ARG_ENABLE([json], |
37 | [AS_HELP_STRING([--disable-json], |