X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=1d72e758f3b60193688c8d499bca5f594a5b0181;hb=430d646f23385cff10f3cfe359f27226f42cf01a;hp=e2469348b56c3157e77152a387969cb03c48fb02;hpb=8a8008134e997330d61e0b9736e9067b5689b531;p=virt-top.git

diff --git a/configure.ac b/configure.ac
index e246934..1d72e75 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.2)
+AC_INIT(ocaml-libvirt,0.4.0.3)
 
 dnl Check for basic C environment.
 AC_PROG_CC
@@ -166,7 +166,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 +181,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 +200,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