X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=0027253509707b1d8b7939bda11ca62d11b5eb7e;hb=b70b673fbce340e71c28bc8985781d141c43b295;hp=1114c6a7129bbbab8cc7f7c212008380aad45fd0;hpb=eb6af058b088b3230b021cb2064b699c9bc30735;p=guestfs-browser.git

diff --git a/configure.ac b/configure.ac
index 1114c6a..0027253 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Guestfs Browser.
-dnl Copyright (C) 2010 Red Hat Inc.
+dnl Copyright (C) 2010-2011 Red Hat Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with this program; if not, write to the Free Software Foundation, Inc.,
 dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-AC_INIT([guestfs-browser],[0.0.3])
+AC_INIT([guestfs-browser],[0.1.6])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -28,6 +28,8 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 AM_PROG_CC_C_O
 AC_SYS_LARGEFILE
 
+AC_PROG_SED
+
 dnl Check for OCaml compiler.
 AC_PROG_OCAML
 if test "$OCAMLOPT" = "no"; then
@@ -56,11 +58,26 @@ if test "$OCAML_PKG_guestfs" = "no"; then
     AC_MSG_ERROR([Please install OCaml module 'guestfs'.])
 fi
 
+AC_CHECK_OCAML_PKG([hivex])
+if test "$OCAML_PKG_hivex" = "no"; then
+    AC_MSG_ERROR([Please install OCaml module 'hivex'.])
+fi
+
 AC_CHECK_OCAML_PKG([xml-light])
 if test "$OCAML_PKG_xml_light" = "no"; then
     AC_MSG_ERROR([Please install OCaml module 'xml-light'.])
 fi
 
+AC_CHECK_OCAML_PKG([camomile])
+if test "$OCAML_PKG_camomile" = "no"; then
+    AC_MSG_ERROR([Please install OCaml module 'camomile' (>= 0.8, including the data module if that is separate).])
+fi
+
+AC_CHECK_OCAML_PKG([bitstring])
+if test "$OCAML_PKG_bitstring" = "no"; then
+    AC_MSG_ERROR([Please install OCaml module 'bitstring'.])
+fi
+
 AC_CHECK_OCAML_PKG([extlib])
 if test "$OCAML_PKG_extlib" = "no"; then
     AC_MSG_ERROR([Please install OCaml module 'extlib'.])
@@ -69,6 +86,19 @@ fi
 dnl Check for gdk_pixbuf_mlsource program.
 AC_PATH_PROGS([GDK_PIXBUF_MLSOURCE], [gdk_pixbuf_mlsource])
 
+dnl Optional programs.
+
+dnl XXX Other desktop environments?
+AC_CHECK_PROGS([OPENER], [gnome-open], [no])
+
+AC_CHECK_PROG([HIVEXREGEDIT], [hivexregedit], [hivexregedit], [no])
+
+AC_CHECK_PROG(PERLDOC,[perldoc],[perldoc],[no])
+if test "x$PERLDOC" = "xno" ; then
+    AC_MSG_WARN([perldoc not found - install perl to make man pages])
+fi
+AM_CONDITIONAL(HAVE_PERLDOC,[test "$perldoc" != "no"])
+
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile config.ml guestfs-browser.spec])
 AC_OUTPUT