[Libguestfs] [PATCH] Fix building on architectures where ocamlopt is not available

[Richard W.M. Jones]

On Fri, Feb 28, 2014 at 03:53:55PM +0100, Olaf Hering wrote:
> On Fri, Feb 28, Hilko Bengen wrote:
> 
> > ---
> >  builder/Makefile.am        | 18 +++++++++++++-
> >  configure.ac               |  2 ++
> >  mllib/Makefile.am          | 60 +++++++++++++++++++++++++++++++---------------
> >  ocaml/Makefile.am          | 28 +++++++++++++++-------
> 
> Something like this is required:
> 
> 
> diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
> index 708b2e7..698e13a 100644
> --- a/ocaml/Makefile.am
> +++ b/ocaml/Makefile.am
> @@ -37,6 +37,11 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so
>  
>  if HAVE_OCAML
>  
> +DATA_HOOK_FILES = META *.so *.a *.cma *.cmi $(srcdir)/*.mli
> +if HAVE_OCAMLOPT
> +DATA_HOOK_FILES += *.cmx *.cmxa
> +endif
> +
>  OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX
>  OCAMLOPTFLAGS = $(OCAMLCFLAGS)
>  
> @@ -177,7 +182,7 @@ install-data-hook:
>  	$(OCAMLFIND) install \
>  	  -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
>  	  guestfs \
> -	  META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli
> +	  $(DATA_HOOK_FILES)
>  	rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.*
>  	rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a

Looks reasonable to me.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top