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
|
From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <raphael@offensive-security.com>
Date: Fri, 24 Jan 2020 17:58:11 +0100
Subject: Use pkg-config instead of xml2config
---
configure.in | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/configure.in b/configure.in
index 3515dc4..2a56338 100644
--- a/configure.in
+++ b/configure.in
@@ -39,24 +39,10 @@ AC_CHECK_FUNCS([memset strerror])
#CFLAGS="-g -ggdb"
# config for libxml2 check
-AC_ARG_WITH(xml2cfgpath,
- [ --with-libxml2=dir Base directory where libxml2 is installed],
- [ xml2cfgpath="${withval}/bin" ])
-# check for libxml2
-if test -z "$xml2cfgpath"
-then
- AC_PATH_PROG(xml2cfg,xml2-config,"no")
-else
- AC_PATH_PROG(xml2cfg,xml2-config,"no", $xml2cfgpath)
-fi
-if test "$xml2cfg" = "no"
-then
- AC_MSG_ERROR([libxml2 not found or installed])
-else
- CFLAGS="$CFLAGS `$xml2cfg --cflags`"
- CPPFLAGS="$CPPFLAGS `$xml2cfg --cflags`"
- LDFLAGS="$LDFLAGS `$xml2cfg --libs`"
-fi
+CFLAGS="$CFLAGS `pkg-config libxml-2.0 --cflags`"
+CPPFLAGS="$CPPFLAGS"
+LDFLAGS="$LDFLAGS `pkg-config libxml-2.0 --libs`"
+
# check for libxml2 heads/libs
AC_CHECK_HEADERS([libxml/parser.h libxml/tree.h],,
[AC_MSG_ERROR([libxml2 headers MIA])])
|
