X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=2d4cd33c568b285ddaae329f8490e5b6a05823c3;hp=403a9981338fcf07bf316bc97d4281203631b521;hb=refs%2Ftags%2F1.0.73;hpb=dc0c80b3884c5fa2735b55b205e7406599bd77b0 diff --git a/configure.ac b/configure.ac index 403a998..2d4cd33 100644 --- 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], [0]) -m4_define([libguestfs_release], [72]) +m4_define([libguestfs_release], [73]) # extra can be any string m4_define([libguestfs_extra], []) @@ -144,6 +144,10 @@ AC_PATH_PROGS([MKISOFS],[mkisofs],[no], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) test "x$MKISOFS" = "xno" && AC_MSG_ERROR([mkisofs must be installed]) +dnl Check for optional xmllint. +AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no]) +AM_CONDITIONAL([HAVE_XMLLINT],[test "x$XMLLINT" != "xno"]) + dnl Check for QEMU for running binaries on this $host_cpu, fall dnl back to basic 'qemu'. Allow the user to override it. default_qemu="qemu-kvm qemu-system-$host_cpu qemu" @@ -416,6 +420,24 @@ AC_PROG_OCAML AC_PROG_FINDLIB AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"]) +dnl Optional xml-light for building virt-inspector language bindings +dnl from the virt-inspector.rng file. +OCAML_PKG_xml_light=no +if test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"; then + AC_CHECK_OCAML_PKG([xml-light]) +fi +AM_CONDITIONAL([HAVE_XML_LIGHT],[test "x$OCAML_PKG_xml_light" != "xno"]) + +dnl Build the OCaml viewer example. This has a lengthy list of +dnl dependencies and we don't attempt to detect them all. Read +dnl the top of ocaml/examples/viewer.ml before enabling this. +AC_ARG_ENABLE([ocaml-viewer], + [AS_HELP_STRING([--enable-ocaml-viewer], + [enable OCaml viewer (see ocaml/examples) @<:@default=no@:>@])], + [], + [enable_ocaml_viewer=no]) +AM_CONDITIONAL([BUILD_OCAML_VIEWER],[test "x$enable_ocaml_viewer" = "xyes"]) + dnl Check for Perl (optional, for Perl bindings). dnl XXX This isn't quite right, we should check for Perl devel library. AC_CHECK_PROG([PERL],[perl],[perl],[no])