ocaml: Generate ocamldoc.

[libguestfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a746256..435b5e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # major/minor/release must be numbers
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [11])
-m4_define([libguestfs_release], [5])
+m4_define([libguestfs_release], [18])
 # extra can be any string
 m4_define([libguestfs_extra],   [])
 
@@ -484,6 +484,8 @@ AM_CONDITIONAL([HAVE_OCAML],
                [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"])
 AM_CONDITIONAL([HAVE_OCAML_PCRE],
                [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_pcre" != "xno"])
+AM_CONDITIONAL([HAVE_OCAMLDOC],
+               [test "x$OCAMLDOC" != "xno"])
 
 dnl Check for Perl (optional, for Perl bindings).
 PERL=no
@@ -558,7 +560,7 @@ AS_IF([test "x$enable_python" != "xno"],
                 AC_MSG_CHECKING([for Python site-packages path])
                 if test -z "$PYTHON_INSTALLDIR"; then
                     PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \
-                                                   print (distutils.sysconfig.get_python_lib(0,0));"`
+                                                   print (distutils.sysconfig.get_python_lib(1,0));"`
                 fi
                 AC_MSG_RESULT([$PYTHON_INSTALLDIR])
             fi
@@ -802,6 +804,7 @@ AC_CONFIG_FILES([Makefile
                  appliance/Makefile
                  capitests/Makefile
                  cat/Makefile
+                 caution/Makefile
                  csharp/Makefile
                  debian/changelog
                  df/Makefile