search for: c85efee64

These changes allow virt-v2v to be compiled against the build directory of a non-installed libguestfs. Note that some small changes are also required to common and virt-v2v itself. I will post those separately. Rich.

...e +++ b/.gitignore @@ -379,6 +379,7 @@ Makefile.in /ocaml/examples/guestfs-ocaml.3 /ocaml/examples/inspect_vm /ocaml/examples/stamp-guestfs-ocaml.pod +/ocaml/guestfs /ocaml/guestfs-c-actions.c /ocaml/guestfs-c-errnos.c /ocaml/guestfs.ml diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index c85efee64..c02246270 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -197,4 +197,21 @@ install-data-hook: CLEANFILES += $(noinst_DATA) $(check_DATA) -endif +# This "tricks" ocamlfind into allowing us to compile other OCaml +# programs against a locally compiled copy of the libguestfs...

...t rec generate_python_actions_h () = #define GUESTFS_PYTHON_ACTIONS_H_ #include \"guestfs.h\" -#include \"guestfs-utils.h\" +#include \"guestfs-stringlists-utils.h\" #define PY_SSIZE_T_CLEAN 1 diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index b31e8fc65..c85efee64 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -94,7 +94,7 @@ libguestfsocaml_a_SOURCES = \ guestfs-c-actions.c \ guestfs-c-errnos.c \ ../common/utils/cleanups.c \ - ../common/utils/utils.c + ../common/utils/stringlists-utils.c if HAVE_OCAMLDOC diff --git a/python/MANIFEST.in...

Make sure they can build also in no as-neede setups. Pino Toscano (1): utils: split string list functions in own file build: use split stringlist functions from common/utils utils/Makefile.am | 2 + utils/guestfs-stringlists-utils.h | 30 +++++ utils/guestfs-utils.h | 7 +- utils/stringlists-utils.c | 197 ++++++++++++++++++++++++++++++ utils/utils.c