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

diff --git a/packages/ctags/configure.ac.patch b/packages/ctags/configure.ac.patch
index ca6dc0cb..b650be40 100644
--- a/packages/ctags/configure.ac.patch
+++ b/packages/ctags/configure.ac.patch
@@ -1,6 +1,6 @@
-diff -u -r ../ctags-15504fe2d0c84b6dbcb0b8a5c594424dd383185e/configure.ac ./configure.ac
---- ../ctags-15504fe2d0c84b6dbcb0b8a5c594424dd383185e/configure.ac	2017-01-23 15:00:41.000000000 +0100
-+++ ./configure.ac	2017-01-24 20:17:41.484033433 +0100
+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.
  
@@ -14,21 +14,24 @@ diff -u -r ../ctags-15504fe2d0c84b6dbcb0b8a5c594424dd383185e/configure.ac ./conf
 +# 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])
+ AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
  AM_SILENT_RULES([yes])
  AC_CONFIG_HEADERS([config.h])
-@@ -587,13 +594,7 @@
+@@ -574,16 +581,7 @@
  
  AH_TEMPLATE([HAVE_LIBXML],
  	[Define this value if libxml is available.])
 -dnl About the condition of version
 -dnl see https://mail.gnome.org/archives/xml/2010-February/msg00008.html
--PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7],
--		       [have_libxml=yes
--		       AC_DEFINE(HAVE_LIBXML)],
--		       [have_libxml=no])
+-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 true = false])
  
- AH_TEMPLATE([HAVE_JANSSON],
- 	[Define this value if jansson is available.])
+ AC_ARG_ENABLE([json],
+ 	[AS_HELP_STRING([--disable-json],