X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=configure.ac;h=4a83490d017c078ebeb4575f8329e594405f5dac;hp=d52f746eae98e00860acc4f84b734662f303ee10;hb=84a06ad012f23d958fd7b5816a3abcc7c8eb64ab;hpb=4c5a6c02d72a5c40102b6c26705574f84c89eb20

diff --git a/configure.ac b/configure.ac
index d52f746..4a83490 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,71 @@ 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 \
+		virJobGetInfo \
+		virJobGetDomain \
+		virJobGetNetwork \
+		virJobCancel \
+		virJobFree \
+		virDomainCreateLinuxJob \
+		virDomainSaveJob \
+		virDomainRestoreJob \
+		virDomainCoreDumpJob \
+		virDomainCreateJob \
+		virNetworkCreateXMLJob \
+		virNetworkCreateJob \
+		virStoragePoolGetConnect \
+		virConnectNumOfStoragePools \
+		virConnectListStoragePools \
+		virConnectNumOfDefinedStoragePools \
+		virConnectListDefinedStoragePools \
+		virConnectDiscoverStoragePools \
+		virStoragePoolLookupByName \
+		virStoragePoolLookupByUUID \
+		virStoragePoolLookupByUUIDString \
+		virStoragePoolLookupByVolume \
+		virStoragePoolCreateXML \
+		virStoragePoolDefineXML \
+		virStoragePoolUndefine \
+		virStoragePoolCreate \
+		virStoragePoolDestroy \
+		virStoragePoolShutdown \
+		virStoragePoolFree \
+		virStoragePoolRefresh \
+		virStoragePoolGetName \
+		virStoragePoolGetUUID \
+		virStoragePoolGetUUIDString \
+		virStoragePoolGetInfo \
+		virStoragePoolGetXMLDesc \
+		virStoragePoolGetAutostart \
+		virStoragePoolSetAutostart \
+		virStoragePoolNumOfVolumes \
+		virStoragePoolListVolumes \
+		virStorageVolLookupByName \
+		virStorageVolLookupByKey \
+		virStorageVolLookupByPath \
+		virStorageVolGetName \
+		virStorageVolGetKey \
+		virStorageVolCreateXML \
+		virStorageVolDestroy \
+		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]))
+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 +166,12 @@ 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)
+
+    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)
@@ -112,6 +181,7 @@ if test "x$OCAMLFIND" != "x"; then
     AC_SUBST(pkg_xml_light)
     AC_SUBST(pkg_csv)
     AC_SUBST(pkg_calendar)
+    AC_SUBST(pkg_calendar2)
 else
     dnl Use a basic module test if there is no findlib ...
 
@@ -128,6 +198,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])
+    dnl XXX Version check - see above.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[+calendar])
 fi