X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=d1697e7e0af8eebb4ca250f9e8360dd23bfc5365;hb=dde81c0c0e4d6517781392310768dfe8fe4392fe;hp=d3c3e19593d136d134430a25bac705e712df9ce1;hpb=4c8bdd342450aad1f49a44a009eae015a44f9572;p=libguestfs.git

diff --git a/configure.ac b/configure.ac
index d3c3e19..d1697e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,7 +420,9 @@ AC_PROG_OCAML
 AC_PROG_FINDLIB
 AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"])
 
-dnl Build the OCaml viewer example.
+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@:>@])],