X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=configure.ac;h=ba9be919e6d9366b731b4a234035fa8188cdc100;hp=0fe2bda3e440d96c72ab24cd91b27fded151668a;hb=10d89a4a52b85803c85e14a1a71737ba20dea3d4;hpb=43b894e0ef93f380dcd8b1b20a3cd6626a8f3b7d

diff --git a/configure.ac b/configure.ac
index 0fe2bda..ba9be91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # ocaml-libvirt
-# Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
+# Copyright (C) 2007-2008 Red Hat Inc., Richard W.M. Jones
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(ocaml-libvirt,0.4.0.2)
+AC_INIT(ocaml-libvirt,0.4.1.0)
 
 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,
@@ -80,34 +85,22 @@ AC_CHECK_FUNCS([virConnectGetHostname \
 		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 \
+		virStoragePoolBuild \
 		virStoragePoolUndefine \
 		virStoragePoolCreate \
 		virStoragePoolDestroy \
-		virStoragePoolShutdown \
+		virStoragePoolDelete \
 		virStoragePoolFree \
 		virStoragePoolRefresh \
 		virStoragePoolGetName \
@@ -119,31 +112,64 @@ AC_CHECK_FUNCS([virConnectGetHostname \
 		virStoragePoolSetAutostart \
 		virStoragePoolNumOfVolumes \
 		virStoragePoolListVolumes \
-		virStorageVolGetConnect \
 		virStorageVolLookupByName \
 		virStorageVolLookupByKey \
 		virStorageVolLookupByPath \
 		virStorageVolGetName \
 		virStorageVolGetKey \
 		virStorageVolCreateXML \
-		virStorageVolDestroy \
+		virStorageVolDelete \
 		virStorageVolFree \
 		virStorageVolGetInfo \
 		virStorageVolGetXMLDesc \
 		virStorageVolGetPath \
 ])
 
-dnl Check for optional types added since 0.2.1.
-AC_CHECK_TYPES([virJobPtr, virStoragePoolPtr, virStorageVolPtr])
+# 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 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)
 
+dnl Check for optional GNOME icons (from gnome-icon-theme package).
+AC_ARG_WITH(icons,
+	AC_HELP_STRING([--with-icons=PATH],
+		[Set path to installed icons @<:@default=/usr/share/icons@:>@]),
+	[],[with_icons=/usr/share/icons])
+icons=""
+if test "x$with_icons" != "xno"; then
+    for size in 16 24 32 48; do
+	for f in devices/computer.png; do
+	    fname="${with_icons}/gnome/${size}x${size}/${f}"
+	    AC_MSG_CHECKING([checking for icon $fname])
+	    if test -f "$fname"; then
+	    	AC_MSG_RESULT([yes])
+	        icons="$size $f $fname $icons"
+	    else
+	    	AC_MSG_RESULT([no])
+	    fi
+	done
+    done
+fi
+AC_SUBST(with_icons)
+AC_SUBST(icons)
+
 dnl Check for basic OCaml environment & findlib.
 dnl Note that findlib is not necessary, but things will work better
 dnl if it is present.
@@ -166,7 +192,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)
@@ -175,7 +207,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 ...
 
@@ -192,6 +226,8 @@ 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
 
@@ -211,6 +247,9 @@ AC_SUBST(subdirs)
 dnl Check for optional perldoc (for building manual pages).
 AC_CHECK_PROG(HAVE_PERLDOC,perldoc,perldoc)
 
+dnl Check for optional gdk-pixbuf-mlsource (for icons).
+AC_CHECK_PROG(HAVE_GDK_PIXBUF_MLSOURCE,gdk-pixbuf-mlsource,gdk-pixbuf-mlsource)
+
 dnl Check for optional NSIS (for building a Windows installer).
 AC_ARG_WITH([nsis],
 	[AS_HELP_STRING([--with-nsis],