search for: ac_check_ocaml_pkg

Not actually useful, as TESTS defines the tests, and it breaks when oUnit is not available (as it tries to build an oUnit-based unit test). --- mllib/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 0b43684..e363f27 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -132,9 +132,6 @@ libdir.ml: Makefile # Tests.

...no"],[ OCAML_PKG_gettext=no OCAML_PKG_libvirt=no OCAML_PKG_oUnit=no +ounit_is_v2=no AS_IF([test "x$OCAMLC" != "xno"],[ # Create mllib/common_gettext.ml, gettext functions or stubs. @@ -1147,17 +1148,9 @@ AS_IF([test "x$OCAMLC" != "xno"],[ AC_CHECK_OCAML_PKG(libvirt) AC_CHECK_OCAML_PKG(oUnit) - # oUnit >= 2 is required. If it's not this version, discard. + # oUnit >= 2 is required, so check that it has OUnit2. if test "x$OCAML_PKG_oUnit" != "xno"; then - AC_MSG_CHECKING([for oUnit version 2 or abo...

..." = "xyes"; then fi OCAML_PKG_gettext=no -OCAML_PKG_libvirt=no OCAML_PKG_oUnit=no ounit_is_v2=no have_Bytes_module=no @@ -158,7 +157,6 @@ AS_IF([test "x$OCAMLC" != "xno"],[ GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml]) - AC_CHECK_OCAML_PKG(libvirt) AC_CHECK_OCAML_PKG(oUnit) # oUnit >= 2 is required, so check that it has OUnit2. @@ -182,8 +180,6 @@ AS_IF([test "x$OCAMLC" != "xno"],[ ]) AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], [test "x$OCAML_PKG_gettext" != "xno"]...

...0644 --- a/m4/guestfs_ocaml.m4 +++ b/m4/guestfs_ocaml.m4 @@ -56,6 +56,14 @@ AM_CONDITIONAL([HAVE_OCAMLOPT], AM_CONDITIONAL([HAVE_OCAMLDOC], [test "x$OCAMLDOC" != "xno"]) +if test "x$enable_daemon" = "xyes"; then + OCAML_PKG_hivex=no + AC_CHECK_OCAML_PKG(hivex) + if test "x$OCAML_PKG_hivex" = "xno"; then + AC_MSG_ERROR([the OCaml module 'hivex' is required]) + fi +fi + OCAML_PKG_gettext=no OCAML_PKG_libvirt=no OCAML_PKG_oUnit=no -- 2.9.4

This commit starts to split our massive, monolithic configure.ac file into smaller files, using the m4_include mechanism to combine them. I don't know if we should really do this, so I'm open to comments about it. However: - Our configure.ac script is 1800+ lines long, and that's pretty long. - configure.ac lacks structure; splitting it up might improve that. - From what I read,

...stfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index e72b5ad39..94c24bc04 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -79,6 +79,7 @@ else fi AC_SUBST([OCAMLDEP_ONE_LINE]) +have_Hivex_OPEN_UNSAFE=no if test "x$enable_daemon" = "xyes"; then OCAML_PKG_hivex=no AC_CHECK_OCAML_PKG(hivex) @@ -86,6 +87,18 @@ if test "x$enable_daemon" = "xyes"; then AC_MSG_ERROR([the OCaml module 'hivex' is required]) fi + # Check if Hivex has 'OPEN_UNSAFE' flag. + AC_MSG_CHECKING([for Hivex.OPEN_UNSAFE]) + rm -f conftest.ml + echo...

...stfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index e72b5ad39..5ceeaf976 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -79,6 +79,7 @@ else fi AC_SUBST([OCAMLDEP_ONE_LINE]) +have_Hivex_OPEN_UNSAFE=no if test "x$enable_daemon" = "xyes"; then OCAML_PKG_hivex=no AC_CHECK_OCAML_PKG(hivex) @@ -86,6 +87,18 @@ if test "x$enable_daemon" = "xyes"; then AC_MSG_ERROR([the OCaml module 'hivex' is required]) fi + # Check if Hivex has 'OPEN_UNSAFE' flag. + AC_MSG_CHECKING([for Hivex.OPEN_UNSAFE]) + rm -f conftest.ml + echo...

...=no OCAML_PKG_oUnit=no AS_IF([test "x$OCAMLC" != "xno"],[ # Create mllib/common_gettext.ml, gettext functions or stubs. @@ -1140,10 +1141,13 @@ AS_IF([test "x$OCAMLC" != "xno"],[ GUESTFS_CREATE_COMMON_GETTEXT_ML([mllib/common_gettext.ml]) + AC_CHECK_OCAML_PKG(libvirt) AC_CHECK_OCAML_PKG(oUnit) ]) AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno"]) +AM_CONDITIONAL([HAVE_OCAML_PKG_LI...

As I'm now working through the enormous virt-v2v/virt-p2v bug list, we need a high quality set of tests to ensure that we don't accidentally regress some old OS/hypervisor combination while making changes. The test cases are going to be huge, so we cannot possibly distribute them in libguestfs. Furthermore many of them have licensing problems which means we cannot redistribute them at

...no AS_IF([test "x$OCAMLC" != "xno"],[ # Create mllib/common_gettext.ml, gettext functions or stubs. @@ -1128,9 +1129,13 @@ AS_IF([test "x$OCAMLC" != "xno"],[ mkdir -p mllib GUESTFS_CREATE_COMMON_GETTEXT_ML([mllib/common_gettext.ml]) + + AC_CHECK_OCAML_PKG(oUnit) ]) AM_CONDITIONAL([HAVE_OCAML_PKG_GETTEXT], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno"]) +AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], + [test "x$OCAMLC&q...

v1 -> v2: - Fixed everything mentioned in patch review. - Libdir module is removed as a separate commit. Rich.

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.

...9;f) format6 + -> int -> ('a, 'b, 'c, 'd, 'e, 'f) format6 + = fun s p n -> if n = 1 then s else p +end +EOF + fi + + chmod -w $1 +]) + +AC_DEFUN([GUESTFS_CREATE_COMMON_GETTEXT_MLI],[ + dnl Check for ocaml-gettext package to translate OCaml tools. + AC_CHECK_OCAML_PKG(gettext) + + AC_MSG_NOTICE([creating $1]) + rm -f $1 + + cat <<EOF > $1 +(* This file is generated automatically by ./configure. *) + (** Gettext functions for OCaml virt tools. The Common_gettext module provides gettext functions, or dummy @@ -59,37 +104,17 @@ v} the...

This works reliably for me ... Rich.

Two (not related to each other) refactorings: Patches 1-12 split configure.ac into smaller files using the m4_include mechanism. Patches 13-15 split out parts of guestfs.pod (ie. guestfs(3)) into three new manual pages: guestfs-hacking(3) - how to extend and contribute to libguestfs guestfs-internals(3) - architecture and internals guestfs-security(3) - security and CVEs Patch 16 is a

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all