X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4704ce642c6440576a7cd9f07b921c72d13672e4..79191bb30c8f62fb094e054943a27e272074c130:/packages/ctags/configure.ac.patch

diff --git a/packages/ctags/configure.ac.patch b/packages/ctags/configure.ac.patch
index f94d8b8b..b650be40 100644
--- a/packages/ctags/configure.ac.patch
+++ b/packages/ctags/configure.ac.patch
@@ -1,16 +1,37 @@
-diff -u -r ../ctags-c82fb5e615de043ef98926ef21fc3f8cb4a57ae7/configure.ac ./configure.ac
---- ../ctags-c82fb5e615de043ef98926ef21fc3f8cb4a57ae7/configure.ac	2016-05-02 02:37:13.000000000 -0400
-+++ ./configure.ac	2016-05-02 21:15:55.462438802 -0400
-@@ -586,11 +586,7 @@
+diff -u -r ../ctags-8a60622839c98ef6fac1c57a5563812393c56c1d/configure.ac ./configure.ac
+--- ../ctags-8a60622839c98ef6fac1c57a5563812393c56c1d/configure.ac	2017-09-01 11:04:30.000000000 +0200
++++ ./configure.ac	2017-09-01 23:38:48.761978655 +0200
+@@ -7,7 +7,14 @@
+ #	Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ([2.59])
+-AC_INIT([universal-ctags],[0.0.0])
++# Avoid identifying as
++#   Universal Ctags 0.0.0, Copyright (C) 2015 Universal Ctags Team
++#   Universal Ctags is derived from Exuberant Ctags.
++#   Exuberant Ctags 5.8, Copyright (C) 1996-2009 Darren Hiebert
++# since that causes at least vim-easytags to identify the ctags
++# version as 0.0.0, see
++# https://github.com/xolox/vim-easytags/blob/master/autoload/xolox/easytags.vim
++AC_INIT([universal-ctags],[5.8])
+ AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
+ AM_SILENT_RULES([yes])
+ AC_CONFIG_HEADERS([config.h])
+@@ -574,16 +581,7 @@
  
  AH_TEMPLATE([HAVE_LIBXML],
  	[Define this value if libxml is available.])
--PKG_CHECK_MODULES(LIBXML, libxml-2.0,
--		       [have_libxml=yes
--		       AC_DEFINE(HAVE_LIBXML)],
--		       [have_libxml=no])
+-dnl About the condition of version
+-dnl see https://mail.gnome.org/archives/xml/2010-February/msg00008.html
+-AS_IF([test "x$enable_xml" != "xno"], [
+-	PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
+-			       [have_libxml=yes
+-			       AC_DEFINE(HAVE_LIBXML)],
+-			       [AS_IF([test "x$enable_xml" = "xyes"], [
+-			           AC_MSG_ERROR([libxml2 not found])])])
+-])
 -AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes)
-+AM_CONDITIONAL(HAVE_LIBXML, test "no" = xyes)
++AM_CONDITIONAL(HAVE_LIBXML, [test true = false])
  
- AC_CHECK_FUNCS(fmemopen,[have_fmemopen=yes],[have_fmemopen=no])
- AM_CONDITIONAL(HAVE_FMEMOPEN, test "x$have_fmemopen" = xyes)
+ AC_ARG_ENABLE([json],
+ 	[AS_HELP_STRING([--disable-json],