projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32202df
)
configure.ac: Split libxml2 and libvirt mix
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Thu, 26 Jul 2018 05:42:26 +0000
(12:42 +0700)
committer
Pavel Rochnyack
<pavel2000@ngs.ru>
Thu, 26 Jul 2018 05:43:07 +0000
(12:43 +0700)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
a91b755
..
54eb7f6
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-5904,7
+5904,7
@@
AC_SUBST([BUILD_WITH_LIBVARNISH_CFLAGS])
AC_SUBST([BUILD_WITH_LIBVARNISH_LIBS])
# }}}
AC_SUBST([BUILD_WITH_LIBVARNISH_LIBS])
# }}}
-# pkg-config --exists 'libxml-2.0'
; pkg-config --exists libvirt
{{{
+# pkg-config --exists 'libxml-2.0' {{{
$PKG_CONFIG --exists 'libxml-2.0' 2>/dev/null
if test $? -eq 0; then
with_libxml2="yes"
$PKG_CONFIG --exists 'libxml-2.0' 2>/dev/null
if test $? -eq 0; then
with_libxml2="yes"
@@
-5912,13
+5912,6
@@
else
with_libxml2="no (pkg-config doesn't know libxml-2.0)"
fi
with_libxml2="no (pkg-config doesn't know libxml-2.0)"
fi
-$PKG_CONFIG --exists libvirt 2>/dev/null
-if test $? = 0; then
- with_libvirt="yes"
-else
- with_libvirt="no (pkg-config doesn't know libvirt)"
-fi
-
if test "x$with_libxml2" = "xyes"; then
with_libxml2_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
if test $? -ne 0; then
if test "x$with_libxml2" = "xyes"; then
with_libxml2_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
if test $? -ne 0; then
@@
-5962,6
+5955,15
@@
fi
AC_SUBST([BUILD_WITH_LIBXML2_CFLAGS])
AC_SUBST([BUILD_WITH_LIBXML2_LIBS])
AC_SUBST([BUILD_WITH_LIBXML2_CFLAGS])
AC_SUBST([BUILD_WITH_LIBXML2_LIBS])
+# }}}
+
+# pkg-config --exists libvirt {{{
+$PKG_CONFIG --exists libvirt 2>/dev/null
+if test $? = 0; then
+ with_libvirt="yes"
+else
+ with_libvirt="no (pkg-config doesn't know libvirt)"
+fi
if test "x$with_libvirt" = "xyes"; then
with_libvirt_cflags="`$PKG_CONFIG --cflags libvirt`"
if test "x$with_libvirt" = "xyes"; then
with_libvirt_cflags="`$PKG_CONFIG --cflags libvirt`"