From 5181672f20e6cd6ecd283f71e5685dbde5ee17c4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Some more ocaml modules required. --- README | 4 ++-- configure.ac | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README b/README index 6902fca..19962d1 100644 --- a/README +++ b/README @@ -41,8 +41,8 @@ Building Requirements: * livecd-creator (in Fedora the package is called 'livecd-tools') - * ocaml, ocaml-extlib, ocaml-pcre, ocaml-xml-light, - ocaml-newt (all in Fedora) + * ocaml, ocaml-extlib-devel, ocaml-pcre-devel, ocaml-xml-light-devel, + ocaml-newt-devel, ocaml-libvirt-devel (all in Fedora) * qemu and/or KVM (only for testing) Then: diff --git a/configure.ac b/configure.ac index 1cfc4a2..4c67758 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,22 @@ if test "x$pkg_xml_light" = "xno"; then AC_MSG_ERROR([Cannot find required OCaml package 'xml-light']) fi +AC_CHECK_OCAML_MODULE(newt,pkg_newt,Newt,[+newt]) +if test "x$pkg_newt" = "xno"; then + AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-newt']) +fi + +AC_CHECK_OCAML_MODULE(pcre,pkg_pcre,Pcre,[+pcre]) +if test "x$pkg_pcre" = "xno"; then + AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-pcre']) +fi + +AC_CHECK_OCAML_MODULE(libvirt,pkg_libvirt,Libvirt_version,[+libvirt]) +# XXX Broken because *.cmi files are missing from this package. +#if test "x$pkg_libvirt" = "xno"; then +# AC_MSG_ERROR([Cannot find required OCaml package 'ocaml-libvirt']) +#fi + dnl Check for recommended livecd-creator (for building ISOs). AC_CHECK_PROG(HAVE_LIVECD_CREATOR,livecd-creator,livecd-creator) -- 1.8.3.1