X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=configure.ac;h=8926a9bcab9c7c73025661ae6f93f4767c6e458c;hp=2920cf359e10a03620ef2e81e76a7886da84b63b;hb=ca6baf8fcb2e3ecc917c8ec1e11c1ddbec29afcb;hpb=b858ee135c0814f1781cc16802a7b538d5f047a7

diff --git a/configure.ac b/configure.ac
index 2920cf3..8926a9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(ocaml-libvirt,0.4.0.1)
+AC_INIT(ocaml-libvirt,0.4.0.3)
 
 dnl Check for basic C environment.
 AC_PROG_CC
@@ -62,6 +62,11 @@ AC_CHECK_HEADER([libvirt/libvirt.h],
 	[],
 	AC_MSG_ERROR([You must install libvirt development package]))
 
+dnl We also use <libvirt/virterror.h>
+AC_CHECK_HEADER([libvirt/virterror.h],
+	[],
+	AC_MSG_ERROR([You must install libvirt development package]))
+
 dnl Check for libvirt >= 0.2.1 (our minimum supported version).
 dnl See: http://libvirt.org/hvsupport.html
 AC_CHECK_FUNC(virConnectGetCapabilities,
@@ -70,12 +75,74 @@ AC_CHECK_FUNC(virConnectGetCapabilities,
 
 dnl Check for optional libvirt functions added since 0.2.1.
 dnl See: http://libvirt.org/hvsupport.html
-AC_CHECK_FUNCS([virConnectGetHostname virConnectGetURI virDomainBlockStats virDomainGetSchedulerParameters virDomainGetSchedulerType virDomainInterfaceStats virDomainMigrate virDomainSetSchedulerParameters virNodeGetFreeMemory virNodeGetCellsFreeMemory])
+AC_CHECK_FUNCS([virConnectGetHostname \
+		virConnectGetURI \
+		virDomainBlockStats \
+		virDomainGetSchedulerParameters \
+		virDomainGetSchedulerType \
+		virDomainInterfaceStats \
+		virDomainMigrate \
+		virDomainSetSchedulerParameters \
+		virNodeGetFreeMemory \
+		virNodeGetCellsFreeMemory \
+		virStoragePoolGetConnect \
+		virConnectNumOfStoragePools \
+		virConnectListStoragePools \
+		virConnectNumOfDefinedStoragePools \
+		virConnectListDefinedStoragePools \
+		virStoragePoolLookupByName \
+		virStoragePoolLookupByUUID \
+		virStoragePoolLookupByUUIDString \
+		virStoragePoolLookupByVolume \
+		virStoragePoolCreateXML \
+		virStoragePoolDefineXML \
+		virStoragePoolBuild \
+		virStoragePoolUndefine \
+		virStoragePoolCreate \
+		virStoragePoolDestroy \
+		virStoragePoolDelete \
+		virStoragePoolFree \
+		virStoragePoolRefresh \
+		virStoragePoolGetName \
+		virStoragePoolGetUUID \
+		virStoragePoolGetUUIDString \
+		virStoragePoolGetInfo \
+		virStoragePoolGetXMLDesc \
+		virStoragePoolGetAutostart \
+		virStoragePoolSetAutostart \
+		virStoragePoolNumOfVolumes \
+		virStoragePoolListVolumes \
+		virStorageVolLookupByName \
+		virStorageVolLookupByKey \
+		virStorageVolLookupByPath \
+		virStorageVolGetName \
+		virStorageVolGetKey \
+		virStorageVolCreateXML \
+		virStorageVolDelete \
+		virStorageVolFree \
+		virStorageVolGetInfo \
+		virStorageVolGetXMLDesc \
+		virStorageVolGetPath \
+])
 
-dnl We also use <libvirt/virterror.h>
-AC_CHECK_HEADER([libvirt/virterror.h],
-	[],
-	AC_MSG_ERROR([You must install libvirt development package]))
+# This jobs API was never published and is due to get overhauled
+# in the near future:
+#		virJobGetInfo
+#		virJobGetDomain
+#		virJobGetNetwork
+#		virJobCancel
+#		virJobFree
+#		virDomainCreateLinuxJob
+#		virDomainSaveJob
+#		virDomainRestoreJob
+#		virDomainCoreDumpJob
+#		virDomainCreateJob
+#		virNetworkCreateXMLJob
+#		virNetworkCreateJob
+
+dnl Check for optional types added since 0.2.1.
+AC_CHECK_TYPES([virJobPtr, virStoragePoolPtr, virStorageVolPtr],,,
+	       [#include <libvirt/libvirt.h>])
 
 dnl Check for optional ncurses.
 AC_CHECK_LIB(ncurses,initscr)
@@ -102,7 +169,13 @@ 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(calendar)
+    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])
+    if test "x$pkg_calendar2" = "xno"; then
+    	AC_CHECK_OCAML_PKG(calendar)
+    fi
 
     AC_SUBST(pkg_unix)
     AC_SUBST(pkg_extlib)
@@ -111,7 +184,9 @@ if test "x$OCAMLFIND" != "x"; then
     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
     dnl Use a basic module test if there is no findlib ...
 
@@ -128,13 +203,15 @@ 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(dbus,pkg_dbus,DBus,[+dbus])
+    dnl XXX Version check - see above.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[+calendar])
 fi
 
 dnl Which subpackages (== subdirs) will we build?
 subdirs="libvirt examples mlvirsh"
 if test "x$pkg_lablgtk2" != "xno"; then
-    subdirs="$subdirs mlvirtmanager"
+    subdirs="$subdirs virt-ctrl"
 fi
 if test "x$pkg_extlib" != "xno" -a "x$pkg_curses" != "xno"; then
     subdirs="$subdirs virt-top"
@@ -251,7 +328,7 @@ AC_CONFIG_FILES([META
 	libvirt/Makefile
 	examples/Makefile
 	mlvirsh/Makefile
-	mlvirtmanager/Makefile
+	virt-ctrl/Makefile
 	virt-top/Makefile
 	virt-df/Makefile
 	])