Don't hard-code Storage API errors, in case building with older libvirt.

[virt-top.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2920cf3..e246934 100644 (file)
--- 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.2)
 
 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,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)
@@ -134,7 +198,7 @@ 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 +315,7 @@ AC_CONFIG_FILES([META
        libvirt/Makefile
        examples/Makefile
        mlvirsh/Makefile
-       mlvirtmanager/Makefile
+       virt-ctrl/Makefile
        virt-top/Makefile
        virt-df/Makefile
        ])