From: Daniel Burr <dburr@dburr.net>
Date: Sat, 28 May 2016 00:30:00 +0000 (+0900)
Subject: build: Make libxml2 check tighter
X-Git-Tag: v0.19.8~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a8f93d8de8f24a303c5aec30ceb696700a503ec;p=thirdparty%2Fgettext.git

build: Make libxml2 check tighter

* gnulib-local/m4/libxml.m4 (gl_LIBXML): Try to check
xmlXPathSetContextNode, which is available in libxml2 2.9.1 or later.
Problem reported by Dominyk in:
http://savannah.gnu.org/bugs/?46844

Copyright-paperwork-exempt: yes
---

diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4
index 3edca0fce..480c700d2 100644
--- a/gnulib-local/m4/libxml.m4
+++ b/gnulib-local/m4/libxml.m4
@@ -44,8 +44,12 @@ AC_DEFUN([gl_LIBXML],
       LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
       AC_TRY_LINK([#include <libxml/xmlversion.h>
                    #include <libxml/xmlmemory.h>
+                   #include <libxml/xpath.h>
                   ],
-        [xmlCheckVersion (0); xmlFree ((void *) 0);],
+        [xmlCheckVersion (0);
+         xmlFree ((void *) 0);
+         xmlXPathSetContextNode ((void *)0, (void *)0);
+        ],
         [gl_cv_libxml=yes
          gl_cv_LIBXML="$LIBXML2 $LIBICONV"
          gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -55,8 +59,12 @@ AC_DEFUN([gl_LIBXML],
         CPPFLAGS="$CPPFLAGS $INCXML2"
         AC_TRY_LINK([#include <libxml/xmlversion.h>
                      #include <libxml/xmlmemory.h>
+                     #include <libxml/xpath.h>
                     ],
-          [xmlCheckVersion (0); xmlFree ((void *) 0);],
+          [xmlCheckVersion (0);
+           xmlFree ((void *) 0);
+           xmlXPathSetContextNode ((void *)0, (void *)0);
+          ],
           [gl_cv_libxml=yes
            gl_cv_LIBXML="$LIBXML2 $LIBICONV"
            gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -82,8 +90,12 @@ AC_DEFUN([gl_LIBXML],
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
             AC_TRY_LINK([#include <libxml/xmlversion.h>
                          #include <libxml/xmlmemory.h>
+                         #include <libxml/xpath.h>
                         ],
-              [xmlCheckVersion (0); xmlFree ((void *) 0);],
+              [xmlCheckVersion (0);
+               xmlFree ((void *) 0);
+               xmlXPathSetContextNode ((void *)0, (void *)0);
+              ],
               [gl_cv_libxml=yes
                gl_cv_LIBXML="$LIBXML2 $LIBICONV"
                gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"