Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 661328
Collapse All | Expand All

(-)file_not_specified_in_diff (-47 / +12 lines)
Line  Link Here
0
-- clamav-0.101.2/m4/reorganization/libs/xml.m4
0
++ clamav-0.101.2/m4/reorganization/libs/xml.m4
Lines 4-58 Link Here
4
[AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],
4
[AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],
5
want_xml=$enableval, want_xml="auto")
5
want_xml=$enableval, want_xml="auto")
6
6
7
XML_HOME=""
7
PKG_CHECK_MODULES([XML], [libxml-2.0],
8
if test "X$want_xml" != "Xno"; then
8
	[found_xml=yes],
9
  AC_MSG_CHECKING([for libxml2 installation])
9
	[
10
  AC_ARG_WITH([xml],
10
		found_xml=no
11
    AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library
11
		AS_IF([test "x$want_xml" = xyes],
12
                    @<:@default=/usr/local or /usr if not found in /usr/local@:>@]),
12
			[AC_MSG_ERROR([--enable-xml set but cannot find libxml2])]
13
    [with_xml_val=$withval]
13
		)
14
  )
14
	]
15
fi
15
)
16
17
AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""],
18
  [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"],
19
  [XML_HOME="$with_xml_val"])
20
21
AS_IF([test "x$XML_HOME" != "x"], [
22
   AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""])
23
   ])
24
25
AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [
26
   AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"])
27
   ])
28
29
if test "x$XML_HOME" != "x"; then
30
  AC_MSG_RESULT([$XML_HOME])
31
else
32
  AC_MSG_RESULT([not found])
33
fi
34
35
found_xml="no"
36
XMLCONF_VERSION=""
37
XML_CPPFLAGS=""
38
XML_LIBS=""
39
if test "x$XML_HOME" != "x"; then
40
  AC_MSG_CHECKING([xml2-config version])
41
  XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`"
42
  if test "x%XMLCONF_VERSION" != "x"; then
43
    AC_MSG_RESULT([$XMLCONF_VERSION])
44
    found_xml="yes"
45
    XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`"
46
    XML_LIBS="`$XML_HOME/bin/xml2-config --libs`"
47
    AS_ECHO("$XML_CPPFLAGS")
48
    AS_ECHO("$XML_LIBS")
49
  else
50
    AC_MSG_ERROR([xml2-config failed])
51
  fi
52
fi
53
16
54
working_xml="no"
17
working_xml="no"
55
if test "X$found_xml" != "Xno"; then
18
if test "X$found_xml" != "Xno"; then
19
  XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0)
56
  AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
20
  AC_MSG_CHECKING([for xmlreader.h in $XML_HOME])
57
21
58
  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
22
  if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then
Lines 61-66 Link Here
61
    AC_MSG_RESULT([found])
25
    AC_MSG_RESULT([found])
62
    save_LIBS="$LIBS"
26
    save_LIBS="$LIBS"
63
    save_CPPFLAGS="$CPPFLAGS"
27
    save_CPPFLAGS="$CPPFLAGS"
28
    XML_CPPFLAGS="$XML_CFLAGS"
64
    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
29
    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
65
    save_LDFLAGS="$LDFLAGS"
30
    save_LDFLAGS="$LDFLAGS"
66
    LDFLAGS="$LDFLAGS $XML_LIBS"
31
    LDFLAGS="$LDFLAGS $XML_LIBS"

Return to bug 661328