X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=6a8c3cf1b06542ca73c30849579b5204e9317955;hb=ce220c62fccd46bb3fd79b863142fe6579ba40da;hp=f875ffae67eb045b625fbe75ad026fb90fb7d472;hpb=fc96d842a5276a27f528fbfb382b8a4afaeb2819;p=virt-df.git

diff --git a/configure.ac b/configure.ac
index f875ffa..6a8c3cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(virt-df,2.0.0)
+AC_INIT(virt-df,2.1.4)
 
 AC_PROG_INSTALL
 
@@ -29,6 +29,8 @@ if test "x$OCAMLFIND" = "x"; then
     AC_MSG_ERROR([OCaml findlib is required])
 fi
 
+AC_CHECK_OCAML_WORD_SIZE(OCAML_WORD_SIZE)
+
 dnl Use ocamlfind to find the required packages ...
 
 dnl Check for required OCaml packages.
@@ -52,9 +54,9 @@ if test "x$pkg_xml_light" != "xyes"; then
     AC_MSG_ERROR([Cannot find required OCaml package 'xml-light'])
 fi
 
-AC_CHECK_OCAML_PKG(bitmatch)
-if test "x$pkg_bitmatch" != "xyes"; then
-    AC_MSG_ERROR([Cannot find required OCaml package 'bitmatch'])
+AC_CHECK_OCAML_PKG(bitstring)
+if test "x$pkg_bitstring" != "xyes"; then
+    AC_MSG_ERROR([Cannot find required OCaml package 'bitstring'])
 fi
 
 dnl Check for optional OCaml packages.
@@ -65,7 +67,7 @@ AC_SUBST(pkg_unix)
 AC_SUBST(pkg_extlib)
 AC_SUBST(pkg_libvirt)
 AC_SUBST(pkg_xml_light)
-AC_SUBST(pkg_bitmatch)
+AC_SUBST(pkg_bitstring)
 AC_SUBST(pkg_gettext)
 AC_SUBST(pkg_csv)
 
@@ -77,7 +79,7 @@ AC_CHECK_PROG(OCAML_GETTEXT,ocaml-gettext,ocaml-gettext)
 
 dnl Write gettext modules for the programs.
 dnl http://www.le-gall.net/sylvain+violaine/documentation/ocaml-gettext/html/reference-manual/ch03s04.html
-for d in virt-df; do
+for d in diskzip virt-df; do
     f=`echo $d | tr - _`_gettext.ml
     AC_MSG_NOTICE([creating $d/$f])
     rm -f $d/$f
@@ -111,6 +113,20 @@ EOT
     fi
 done
 
+dnl Enable type annotation files (always, there's no penalty for doing
+dnl this).  Use C-c C-t in emacs to print the type of an expression.
+OCAMLCFLAGS="-dtypes -g"
+OCAMLOPTFLAGS=""
+
+dnl Enable profiling support for native code.
+AC_ARG_ENABLE([profiling],
+	[AS_HELP_STRING([--enable-profiling],
+	  [enable profiling for native code])],
+	[OCAMLOPTFLAGS="$OCAMLOPTFLAGS -p"])
+
+AC_SUBST(OCAMLCFLAGS)
+AC_SUBST(OCAMLOPTFLAGS)
+
 dnl Summary.
 echo "------------------------------------------------------------"
 echo "Thanks for downloading" $PACKAGE_STRING
@@ -120,7 +136,11 @@ dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile
 	Make.rules
+	diskzip/Makefile
+	lib/Makefile
+	lib/META
 	po/Makefile
 	virt-df/Makefile
+	virt-df/virt_df_version.ml
 	])
 AC_OUTPUT