Version 0.4.1.1 for release.

[virt-top.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4a83490..427c680 100644 (file)
--- 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.1)
 
 dnl Check for basic C environment.
 AC_PROG_CC
@@ -85,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 \
@@ -130,13 +118,28 @@ AC_CHECK_FUNCS([virConnectGetHostname \
                virStorageVolGetName \
                virStorageVolGetKey \
                virStorageVolCreateXML \
-               virStorageVolDestroy \
+               virStorageVolDelete \
                virStorageVolFree \
                virStorageVolGetInfo \
                virStorageVolGetXMLDesc \
                virStorageVolGetPath \
 ])
 
+# 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>])
@@ -144,6 +147,29 @@ AC_CHECK_TYPES([virJobPtr, virStoragePoolPtr, virStorageVolPtr],,,
 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,6 +192,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(dbus)
 
     dnl Need to check which version of calendar is installed.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar2,CalendarLib.Date,[+calendar])
@@ -180,6 +207,7 @@ 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
@@ -198,6 +226,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(dbus,pkg_dbus,DBus,[+dbus])
     dnl XXX Version check - see above.
     AC_CHECK_OCAML_MODULE(calendar,pkg_calendar,Calendar,[+calendar])
 fi
@@ -218,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],