Added a separate file and dependency for DBus.

diff --git a/MANIFEST b/MANIFEST
index 2f3d8d6..2e2eb0d 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -36,6 +36,7 @@ virt-ctrl/Makefile.in
 virt-ctrl/mingw-gcc-wrapper.ml
 virt-ctrl/vc_connections.ml
 virt-ctrl/vc_connections.mli
 virt-ctrl/mingw-gcc-wrapper.ml
 virt-ctrl/vc_connections.ml
 virt-ctrl/vc_connections.mli

+virt-ctrl/vc_dbus.ml

 virt-ctrl/vc_domain_ops.ml
 virt-ctrl/vc_domain_ops.mli
 virt-ctrl/vc_helpers.ml
 virt-ctrl/vc_domain_ops.ml
 virt-ctrl/vc_domain_ops.mli
 virt-ctrl/vc_helpers.ml

diff --git a/configure.ac b/configure.ac
index dd31829..1d72e75 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,7 @@ if test "x$OCAMLFIND" != "x"; then
     AC_CHECK_OCAML_PKG(gettext)
     AC_CHECK_OCAML_PKG(xml-light)
     AC_CHECK_OCAML_PKG(csv)
     AC_CHECK_OCAML_PKG(gettext)
     AC_CHECK_OCAML_PKG(xml-light)
     AC_CHECK_OCAML_PKG(csv)

+    AC_CHECK_OCAML_PKG(dbus)

 
     dnl Need to check which version of calendar is installed.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar2,CalendarLib.Date,[+calendar])
 
     dnl Need to check which version of calendar is installed.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar2,CalendarLib.Date,[+calendar])


@@ -180,6 +181,7 @@ if test "x$OCAMLFIND" != "x"; then
     AC_SUBST(pkg_gettext)
     AC_SUBST(pkg_xml_light)
     AC_SUBST(pkg_csv)
     AC_SUBST(pkg_gettext)
     AC_SUBST(pkg_xml_light)
     AC_SUBST(pkg_csv)

+    AC_SUBST(pkg_dbus)

     AC_SUBST(pkg_calendar)
     AC_SUBST(pkg_calendar2)
 else
     AC_SUBST(pkg_calendar)
     AC_SUBST(pkg_calendar2)
 else


@@ -198,6 +200,7 @@ else
     AC_CHECK_OCAML_MODULE(gettext,pkg_gettext,Gettext,[+gettext]) dnl XXX
     AC_CHECK_OCAML_MODULE(xml-light,pkg_xml_light,Xml,[+xml-light])
     AC_CHECK_OCAML_MODULE(csv,pkg_csv,Csv,[+csv])
     AC_CHECK_OCAML_MODULE(gettext,pkg_gettext,Gettext,[+gettext]) dnl XXX
     AC_CHECK_OCAML_MODULE(xml-light,pkg_xml_light,Xml,[+xml-light])
     AC_CHECK_OCAML_MODULE(csv,pkg_csv,Csv,[+csv])

+    AC_CHECK_OCAML_MODULE(dbus,pkg_dbus,DBus,[+dbus])

     dnl XXX Version check - see above.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[+calendar])
 fi
     dnl XXX Version check - see above.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[+calendar])
 fi

diff --git a/virt-ctrl/Makefile.in b/virt-ctrl/Makefile.in
index 26d6fe5..5ef6362 100644 (file)
--- a/virt-ctrl/Makefile.in
+++ b/virt-ctrl/Makefile.in
@@ -21,17 +21,29 @@ prefix              = @prefix@
 exec_prefix    = @exec_prefix@
 bindir         = @bindir@
 
 exec_prefix    = @exec_prefix@
 bindir         = @bindir@
 

+pkg_dbus        = @pkg_dbus@
+

 OCAMLFIND      = @OCAMLFIND@
 
 OCAMLFIND      = @OCAMLFIND@
 

+OBJS := \
+       vc_helpers.cmo \
+       vc_connections.cmo \
+       vc_domain_ops.cmo \
+       vc_mainwindow.cmo
+

 ifneq ($(OCAMLFIND),)
 ifneq ($(OCAMLFIND),)

-OCAMLCPACKAGES := -package unix,lablgtk2 -I ../libvirt
+OCAMLCPACKAGES := -I ../libvirt -package unix,lablgtk2
+ifeq ($(pkg_dbus),yes)
+OCAMLCPACKAGES  := $(OCAMLCPACKAGES),dbus
+OBJS            += vc_dbus.cmo
+endif

 OCAMLCFLAGS    := -g
 OCAMLCLIBS     := -linkpkg
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS  :=
 OCAMLOPTLIBS   := $(OCAMLCLIBS)
 else
 OCAMLCFLAGS    := -g
 OCAMLCLIBS     := -linkpkg
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS  :=
 OCAMLOPTLIBS   := $(OCAMLCLIBS)
 else

-OCAMLCINCS     := -I @pkg_lablgtk2@ -I ../libvirt
+OCAMLCINCS     := -I ../libvirt -I @pkg_lablgtk2@

 OCAMLCFLAGS    := -g
 OCAMLCLIBS     := unix.cma lablgtk.cma
 OCAMLOPTINCS   := $(OCAMLCINCS)
 OCAMLCFLAGS    := -g
 OCAMLCLIBS     := unix.cma lablgtk.cma
 OCAMLOPTINCS   := $(OCAMLCINCS)


@@ -45,12 +57,7 @@ export LD_LIBRARY_PATH=../libvirt
 BYTE_TARGETS   := virt-ctrl
 OPT_TARGETS    := virt-ctrl.opt
 
 BYTE_TARGETS   := virt-ctrl
 OPT_TARGETS    := virt-ctrl.opt
 

-OBJS := \
-       vc_helpers.cmo \
-       vc_connections.cmo \
-       vc_domain_ops.cmo \
-       vc_mainwindow.cmo \
-       virt_ctrl.cmo
+OBJS += virt_ctrl.cmo

 
 XOBJS := $(OBJS:.cmo=.cmx)
 
 
 XOBJS := $(OBJS:.cmo=.cmx)
 

diff --git a/virt-ctrl/vc_dbus.ml b/virt-ctrl/vc_dbus.ml
new file mode 100644 (file)
index 0000000..5117482
--- /dev/null
+++ b/virt-ctrl/vc_dbus.ml
@@ -0,0 +1,21 @@
+(* virt-ctrl: A graphical management tool.
+   (C) Copyright 2007 Richard W.M. Jones, Red Hat Inc.
+   http://libvirt.org/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   This file contains any code which needs optional package OCaml-DBUS.
+*)
+