X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/21bd2cf4aaae5dac24dae54edba951a8a87dad85..1dd641f19017d1abdbd457d4ea57e2d0f6f9db6c:/packages/ctags/configure.ac.patch

diff --git a/packages/ctags/configure.ac.patch b/packages/ctags/configure.ac.patch
index a2a793ee..6fab5c4c 100644
--- a/packages/ctags/configure.ac.patch
+++ b/packages/ctags/configure.ac.patch
@@ -1,6 +1,6 @@
-diff -u -r ../ctags-ff448e2e2a08325c95f2e162ae50fb899392d99f/configure.ac ./configure.ac
---- ../ctags-ff448e2e2a08325c95f2e162ae50fb899392d99f/configure.ac	2016-11-28 06:04:11.000000000 -0500
-+++ ./configure.ac	2016-11-28 17:57:01.052817678 -0500
+diff -u -r ../ctags-a39f842455fdcc47b812c35c6bf0f19735034de0/configure.ac ./configure.ac
+--- ../ctags-a39f842455fdcc47b812c35c6bf0f19735034de0/configure.ac	2017-02-24 10:02:41.000000000 +0100
++++ ./configure.ac	2017-03-01 18:10:59.298643710 +0100
 @@ -7,7 +7,14 @@
  #	Process this file with autoconf to produce a configure script.
  
@@ -17,12 +17,21 @@ diff -u -r ../ctags-ff448e2e2a08325c95f2e162ae50fb899392d99f/configure.ac ./conf
  AM_INIT_AUTOMAKE([foreign subdir-objects])
  AM_SILENT_RULES([yes])
  AC_CONFIG_HEADERS([config.h])
-@@ -593,7 +600,7 @@
- 		       [have_libxml=yes
- 		       AC_DEFINE(HAVE_LIBXML)],
- 		       [have_libxml=no])
+@@ -591,16 +598,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
+-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])
  
- AH_TEMPLATE([HAVE_JANSSON],
- 	[Define this value if jansson is available.])
+ AC_ARG_ENABLE([json],
+ 	[AS_HELP_STRING([--disable-json],