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
|
Description: Use pkg-config to find libxml2
Author: Hugh McMaster <hugh.mcmaster@outlook.com>
Bug-Debian: https://bugs.debian.org/949404
Forwarded: no, upstream inactive
Last-Update: 2022-08-23
--- a/configure.ac
+++ b/configure.ac
@@ -15,13 +15,7 @@ AC_PROG_CC
AM_PATH_GTK_3_0(3.20.0,,
AC_MSG_ERROR([GTK+ not found or too old (version < 3.10)]))
-AM_PATH_XML2(2.9.0,,
- AC_MSG_ERROR([You do not appear to have libxml2 installed.]))
-
-AC_CHECK_PROG([var], [xml2-config], [yes], [no])
-if test ! "$var" = "yes"; then
- AC_MSG_ERROR(You do not appear to have xml2-config installed.)
-fi
+PKG_CHECK_MODULES([xml], [libxml-2.0])
AC_ARG_ENABLE(
debug,
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ VERSION_MINOR := $(shell echo $(VERSION) | awk -F "." '{print $$2}')
VERSION_MICRO := $(shell echo $(VERSION) | awk -F "." '{print $$3}')
if !MAEMO
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" @GTK_CFLAGS@ @XML_CPPFLAGS@ \
+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" @GTK_CFLAGS@ \
-DREVISION=$(REVISION) \
-DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_MICRO=\"$(VERSION_MICRO)\"
@@ -26,7 +26,7 @@ kanatest_SOURCES = about.c about.h \
stock_icons.c stock_icons.h stock_icons_data.h \
test.c test.h
-kanatest_LDADD = $(LIBINTL) @GTK_LIBS@ -lm @XML_LIBS@
+kanatest_LDADD = $(LIBINTL) @GTK_LIBS@ -lm -lxml2
else
|
