X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=configure.ac;h=dd3182991e7a7087540f623512ab9e47b8cec316;hp=9331243f781367bb456e8062d4ce6652587b5d73;hb=1f61980d8869d1290895e631fc4294fe9c52d827;hpb=aee5f1b6aa2b80873a34de67727c40ad43cccca7

diff --git a/configure.ac b/configure.ac
index 9331243..dd31829 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
@@ -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,
@@ -133,12 +138,8 @@ AC_CHECK_FUNCS([virConnectGetHostname \
 ])
 
 dnl Check for optional types added since 0.2.1.
-AC_CHECK_TYPES([virJobPtr, virStoragePoolPtr, virStorageVolPtr])
-
-dnl We also use <libvirt/virterror.h>
-AC_CHECK_HEADER([libvirt/virterror.h],
-	[],
-	AC_MSG_ERROR([You must install libvirt development package]))
+AC_CHECK_TYPES([virJobPtr, virStoragePoolPtr, virStorageVolPtr],,,
+	       [#include <libvirt/libvirt.h>])
 
 dnl Check for optional ncurses.
 AC_CHECK_LIB(ncurses,initscr)
@@ -165,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)
@@ -175,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 ...
 
@@ -191,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