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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Description: Use PKG_CHECK_MODULES to detect libxml2 and libxslt
Author: Hugh McMaster <hugh.mcmaster@outlook.com>
Bug: https://sourceforge.net/p/xml-copy-editor/bugs/232/
Bug-Debian: https://bugs.debian.org/948793, https://bugs.debian.org/949512
Last-Update: 2020-05-25
--- a/configure.ac
+++ b/configure.ac
@@ -17,12 +17,12 @@
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+
CPPFLAGS="$CPPFLAGS -Wall -g -fexceptions"
CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions"
WXCONFIG=wx-config
-LIBXMLCONFIG=xml2-config
-LIBXSLTCONFIG=xslt-config
AC_ARG_WITH(wx-config,
[[ --with-wx-config=FILE Use the given path to wx-config when determining
@@ -59,45 +59,14 @@
AC_MSG_ERROR([wxWidgets 2.8.0 or newer is required])
fi
-# Check for libxml2
-libxmlversion=0
-
-AC_DEFUN([LIBXML2TEST],
-[
- AC_REQUIRE([AC_PROG_AWK])
- AC_MSG_CHECKING([libxml2])
- if libxmlversion=`$LIBXMLCONFIG --version`; then
- AC_MSG_RESULT([$libxmlversion])
- else
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR([libxml2.])
- fi])
-
-# Call XML2 TEST func
-LIBXML2TEST
-
-# Check for libxslt
-libxsltversion=0
-
-AC_DEFUN([LIBXSLTTEST],
-[
- AC_REQUIRE([AC_PROG_AWK])
- AC_MSG_CHECKING([libxslt])
- if libxsltversion=`$LIBXSLTCONFIG --version`; then
- AC_MSG_RESULT([$libxsltversion])
- else
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR([libxslt])
- fi])
-
-# Call XSLT TEST func
-LIBXSLTTEST
-
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS"
AC_SUBST(WX_LIBS)
+PKG_CHECK_MODULES([XML2], [libxml-2.0])
+PKG_CHECK_MODULES([XSLT], [libxslt])
+
AC_ARG_ENABLE(debug,
[ --enable-debug, Enable debug build],
[
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,11 @@
xmlcopyeditor.spec xmlcopyeditor.png custom.xpm
xmlcopyeditor_LDADD = $(WX_LIBS) \
- -lexpat -lxslt -lxml2 -lpcre -lxerces-c $(ASPELL_LIBS) $(ENCHANT_LIBS) $(GTK_LIBS)
+ $(ASPELL_LIBS) \
+ $(ENCHANT_LIBS) \
+ $(GTK_LIBS) \
+ $(XSLT_LIBS) \
+ -lexpat -lpcre -lxerces-c
nobase_dist_xmlcopyeditor_DATA = $(srcdir)/catalog/catalog \
$(srcdir)/dtd/*.* \
@@ -84,5 +88,5 @@
$(srcdir)/xmlcopyeditor.rc \
$(srcdir)/xmlschemaparser.cpp
-AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = $(XML2_CFLAGS) $(ENCHANT_CFLAGS) $(GTK_CFLAGS)
|
