1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From: Chris Hofstaedtler <zeha@debian.org>
Date: Thu, 12 Oct 2023 13:39:08 +0200
Subject: Use pkg-config to find libxml2
---
Makefile.in | 2 +-
aclocal.m4 | 1 +
configure.in | 28 +++-------------------------
3 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 565d476..824edba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ ODBC_FLAGS = @ODBC_FLAGS@
ODBC_LIB = @ODBC_LIB@ @LDFLAGS@
VER_INFO = @VER_INFO@
-XML2_FLAGS = @XML2_FLAGS@
+XML2_FLAGS = @XML2_CFLAGS@
XML2_LIBS = @XML2_LIBS@
all: @LIB_TARGETS@
diff --git a/aclocal.m4 b/aclocal.m4
index 761ed4c..04f620c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,4 @@
+# generated by aclocal
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
diff --git a/configure.in b/configure.in
index df2b397..3db2290 100644
--- a/configure.in
+++ b/configure.in
@@ -348,38 +348,16 @@ AC_SUBST(SQLITE4_A10N_FLAGS)
# libxml2 support for XPath virtual table module
AC_ARG_WITH(libxml2, [ --with-libxml2=SCR use xml2-config script SCR],
XML2_CONFIG=$withval)
-XML2_FLAGS=""
-XML2_LIBS=""
EXT_XPATH=""
if test "$SQLITE3_LOADEXTENSION" = "1" ; then
if test "$with_libxml2" = "no" ; then
XML2_CONFIG=""
else
- AC_MSG_CHECKING([for libxml2 header and library])
- if test "$with_libxml2" != "no" ; then
- if test -z "$XML2_CONFIG" ; then
- XML2_CONFIG=`which xml2-config 2>/dev/null`
- fi
- fi
- xml2_err1=1
- xml2_err2=1
- if test -n "$XML2_CONFIG" ; then
- XML2_FLAGS="`$XML2_CONFIG --cflags 2>/dev/null`"
- xml2_err1=$?
- XML2_LIBS="`$XML2_CONFIG --libs 2>/dev/null`"
- xml2_err2=$?
- fi
- if test $xml2_err1 -eq 0 -a $xml2_err2 -eq 0 ; then
- EXT_XPATH=libsqlite3_mod_xpath.la
- LIB_TARGETS="$LIB_TARGETS $EXT_XPATH"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+ PKG_CHECK_MODULES([XML2], [libxml-2.0])
+ EXT_XPATH=libsqlite3_mod_xpath.la
+ LIB_TARGETS="$LIB_TARGETS $EXT_XPATH"
fi
fi
-AC_SUBST(XML2_FLAGS)
-AC_SUBST(XML2_LIBS)
AC_SUBST(EXT_XPATH)
#########
|
