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
95
96
97
98
99
100
101
102
103
104
105
|
Description: Use PKG_CHECK_MODULES to detect libxml2, libxslt and libexslt.
Also remove the STATIC_LIBS build option, since Debian doesn't ship static
libraries for libxslt or libexslt.
Author: Hugh McMaster <hugh.mcmaster@outlook.com>
Bug-Debian: https://bugs.debian.org/948791
Bug-Debian: https://bugs.debian.org/949513
Forwarded: no
Last-Update: 2020-05-31
--- a/configure.ac
+++ b/configure.ac
@@ -11,16 +11,6 @@
[LIBXML_REQUIRED_VERSION=2.6.27]
[LIBXSLT_REQUIRED_VERSION=1.1.9]
-XSTAR_LIB_ARGS_WITH([LIBXML], [with-src])
-XSTAR_LIB_ARGS_WITH([LIBXSLT], [with-src])
-XSTAR_LIB_ARGS_WITH([LIBICONV])
-
-AC_ARG_ENABLE([static-libs],
- [AS_HELP_STRING([--enable-static-libs],
- [link statically with libxml2 and lib(e)xslt @<:@default=no@:>@])],
- [STATIC_LIBS=$enableval],
- [STATIC_LIBS=no])
-
AS_IF([test -r doc/xmlstarlet.1], [LACK_DOCS=no], [LACK_DOCS=yes])
AC_ARG_ENABLE([build_docs],
@@ -42,33 +32,14 @@
AC_ARG_PROGRAM dnl Transforming Program Names When Installing
AC_PROG_SED
AC_PROG_AWK
+PKG_PROG_PKG_CONFIG
-XSTAR_LIB_CHECK([LIBXML], [xml2-config])
+PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION])
+PKG_CHECK_EXISTS([libexslt],
+ [PKG_CHECK_MODULES([LIBXSLT], [libexslt])],
+ [PKG_CHECK_MODULES([LIBXSLT], [libxslt >= $LIBXSLT_REQUIRED_VERSION])])
-AS_IF([test "x$LIBXML_SRCDIR" != x],
- [LIBXML_INCDIR="$LIBXML_SRCDIR/include"])
-[: ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}]
-
-AS_IF([test "x$STATIC_LIBS" != xno],
- [LIBXML_CPPFLAGS="-I$LIBXML_INCDIR -DLIBXML_STATIC"],
- [LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"])
-
-AS_IF([test "x$STATIC_LIBS" != xno],
- [LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"],
- [LIBXML_LIBS="-lxml2"])
-
-
-XSTAR_LIB_CHECK([LIBXSLT], [xslt-config])
-
-AS_IF([test "x$LIBXSLT_SRCDIR" != x],
- [XSLTPROC_PATH="$LIBXSLT_SRCDIR/xsltproc:$PATH"
- LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"
- LIBXSLT_LDFLAGS="-L$LIBXSLT_SRCDIR/libexslt/.libs -L$LIBXSLT_SRCDIR/libxslt/.libs"
- AS_IF([test "x$STATIC_LIBS" != xno],
- [LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"])],
- [XSLTPROC_PATH="$PATH"
- AS_IF([test "x$STATIC_LIBS" != xno],
- [LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"])])
+XSLTPROC_PATH="$PATH"
AS_IF([test x"$enable_build_docs" = xyes],
[AC_PATH_PROG(XSLTPROC, xsltproc, [none], [$XSLTPROC_PATH])
@@ -87,13 +58,8 @@
AM_CONDITIONAL([BUILD_DOCS], [test x"$enable_build_docs" = xyes])
-
-AS_IF([test "x$STATIC_LIBS" = xno],
- [LIBXSLT_LIBS="-lexslt -lxslt"])
-
-[: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}]
-[LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"]
-
+[LIBXML_CPPFLAGS="$LIBXML_CFLAGS"]
+[LIBXSLT_CPPFLAGS="$LIBXSLT_CFLAGS"]
[WIN32_EXTRA_LDFLAGS=]
[WIN32_EXTRA_LIBS=]
@@ -116,20 +82,6 @@
# replace the libraries from ./configure
[USER_LIBS="$LIBS"]
[LIBS=]
-# shared libraries link to dependant libraries automatically
-AS_IF([test "x$STATIC_LIBS" != xno],
- [AC_SEARCH_LIBS([dlopen], [dl], [], [], "$USER_LIBS")
- AC_SEARCH_LIBS([sqrt], [m], [], [], "$USER_LIBS")
- AC_SEARCH_LIBS([iconv_open], [iconv], [],
- [AC_SEARCH_LIBS([libiconv_open], [iconv], [], [], "$USER_LIBS")], "$USER_LIBS")
- AC_SEARCH_LIBS([clock_gettime], [rt], [], [], "$USER_LIBS")
- AC_SEARCH_LIBS([deflate], [z], [], [], "$USER_LIBS")
- AC_SEARCH_LIBS([gcry_cipher_encrypt], [gcrypt], [], [], "$USER_LIBS")
-
- # Checks for inet libraries:
- AC_SEARCH_LIBS([gethostent], [nsl], [], [], "$USER_LIBS")
- AC_SEARCH_LIBS([setsockopt], [socket net network], [], [], "$USER_LIBS")
- AC_SEARCH_LIBS([connect], [inet], [], [], "$USER_LIBS")])
AC_CHECK_FUNCS_ONCE([lstat stat])
|
