git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inspector: Fix rule to build HTML file.
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
67b1309
..
ad411e2
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,7
+18,7
@@
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [7])
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [7])
-m4_define([libguestfs_release], [
3
])
+m4_define([libguestfs_release], [
11
])
# extra can be any string
m4_define([libguestfs_extra], [])
# extra can be any string
m4_define([libguestfs_extra], [])
@@
-460,6
+460,7
@@
PKG_CHECK_MODULES([LIBVIRT], [libvirt],
AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.])
],
[AC_MSG_WARN([libvirt not found, some core features will be disabled])])
AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.])
],
[AC_MSG_WARN([libvirt not found, some core features will be disabled])])
+AM_CONDITIONAL([HAVE_LIBVIRT],[test "x$LIBVIRT_LIBS" != "x"])
dnl libxml2 (highly recommended)
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
dnl libxml2 (highly recommended)
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
@@
-468,6
+469,7
@@
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
],
[AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
],
[AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
+AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
dnl hivex library (highly recommended)
dnl This used to be a part of libguestfs, but was spun off into its
dnl hivex library (highly recommended)
dnl This used to be a part of libguestfs, but was spun off into its
@@
-493,7
+495,6
@@
AM_CONDITIONAL([HAVE_FUSE],[test "x$enable_fuse" != "xno"])
dnl Check for OCaml (optional, for OCaml bindings).
OCAMLC=no
OCAMLFIND=no
dnl Check for OCaml (optional, for OCaml bindings).
OCAMLC=no
OCAMLFIND=no
-OCAML_PKG_xml_light=no
AC_ARG_ENABLE([ocaml],
AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
[],
AC_ARG_ENABLE([ocaml],
AS_HELP_STRING([--disable-ocaml], [Disable OCaml language bindings]),
[],
@@
-505,14
+506,9
@@
AS_IF([test "x$enable_ocaml" != "xno"],
OCAMLFIND=
AC_PROG_OCAML
AC_PROG_FINDLIB
OCAMLFIND=
AC_PROG_OCAML
AC_PROG_FINDLIB
-
- dnl Optional xml-light for running the generator.
- if test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"; then
- AC_CHECK_OCAML_PKG([xml-light])
- fi])
+ ])
AM_CONDITIONAL([HAVE_OCAML],
[test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
AM_CONDITIONAL([HAVE_OCAML],
[test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
-AM_CONDITIONAL([HAVE_XML_LIGHT],[test "x$OCAML_PKG_xml_light" != "xno"])
dnl Check for Perl (optional, for Perl bindings).
PERL=no
dnl Check for Perl (optional, for Perl bindings).
PERL=no
@@
-792,7
+788,7
@@
AS_IF([test "x$enable_php" != "xno"],
])
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
])
AM_CONDITIONAL([HAVE_PHP], [test "x$PHP" != "xno" && test "x$PHPIZE" != "xno"])
-dnl Check for Perl modules needed by
virt-df, inspector, etc.
+dnl Check for Perl modules needed by
Perl virt tools (virt-df, etc.)
AS_IF([test "x$PERL" != "xno"],
[
missing_perl_modules=no
AS_IF([test "x$PERL" != "xno"],
[
missing_perl_modules=no
@@
-806,12
+802,10
@@
AS_IF([test "x$PERL" != "xno"],
fi
done
if test "x$missing_perl_modules" = "xyes"; then
fi
done
if test "x$missing_perl_modules" = "xyes"; then
- AC_MSG_WARN([some Perl modules required to compile
virt-inspector and the other
virt-* tools are missing])
+ AC_MSG_WARN([some Perl modules required to compile
the Perl
virt-* tools are missing])
fi
])
fi
])
-AM_CONDITIONAL([HAVE_INSPECTOR],
- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
AM_CONDITIONAL([HAVE_TOOLS],
[test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
AM_CONDITIONAL([HAVE_TOOLS],
[test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
@@
-858,6
+852,7
@@
AC_CONFIG_FILES([Makefile
po-docs/ja/Makefile
php/Makefile
csharp/Makefile
po-docs/ja/Makefile
php/Makefile
csharp/Makefile
+ cat/Makefile
ocaml/META perl/Makefile.PL])
AC_OUTPUT
ocaml/META perl/Makefile.PL])
AC_OUTPUT
@@
-886,8
+881,6
@@
echo -n "Haskell bindings .................... "
if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "PHP bindings ........................ "
if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi
if test "x$HAVE_HASKELL_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "PHP bindings ........................ "
if test "x$HAVE_PHP_TRUE" = "x"; then echo "yes"; else echo "no"; fi
-echo -n "virt-inspector ...................... "
-if test "x$HAVE_INSPECTOR_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo -n "virt-* tools ........................ "
if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo "supermin appliance .................. $enable_supermin"
echo -n "virt-* tools ........................ "
if test "x$HAVE_TOOLS_TRUE" = "x"; then echo "yes"; else echo "no"; fi
echo "supermin appliance .................. $enable_supermin"