X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=a5023d1155ed014171c2daa7fcb2a3c2136d200d;hb=a9ef60292882952c57883c86d98fd9320bb6e5f3;hp=05a7dcf46a279676fb481f17a2e9ceb65b84822b;hpb=3ab788383673a8300925a7de6113ef3962378a15;p=guestfs-browser.git

diff --git a/configure.ac b/configure.ac
index 05a7dcf..a5023d1 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.1.2])
+AC_INIT([guestfs-browser],[0.1.7])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -32,10 +32,20 @@ AC_PROG_SED
 
 dnl Check for OCaml compiler.
 AC_PROG_OCAML
-if test "$OCAMLOPT" = "no"; then
-    AC_MSG_ERROR([You must install the OCaml native compiler (ocamlopt)])
+if test "$OCAMLC" = "no"; then
+    AC_MSG_ERROR([You must install the OCaml compiler (ocamlc or ocamlopt)])
 fi
 
+dnl Choose native code if available, but allow the user to specify
+dnl bytecode only (useful for debugging).
+AC_ARG_WITH([native],
+        [AS_HELP_STRING([--without-native],
+                [disable native compilation (slow, but useful for debugging)])],
+        [],
+        [with_native=yes])
+AM_CONDITIONAL([HAVE_OCAMLOPT],
+        [test "x$with_native" != "xno" && test "x$OCAMLBEST" = "xopt"])
+
 dnl Check for OCaml findlib.
 AC_PROG_FINDLIB
 if test "$OCAMLFIND" = "no"; then
@@ -70,7 +80,7 @@ fi
 
 AC_CHECK_OCAML_PKG([camomile])
 if test "$OCAML_PKG_camomile" = "no"; then
-    AC_MSG_ERROR([Please install OCaml module 'camomile' (including the data module if that is separate).])
+    AC_MSG_ERROR([Please install OCaml module 'camomile' (>= 0.8, including the data module if that is separate).])
 fi
 
 AC_CHECK_OCAML_PKG([bitstring])
@@ -87,12 +97,18 @@ dnl Check for gdk_pixbuf_mlsource program.
 AC_PATH_PROGS([GDK_PIXBUF_MLSOURCE], [gdk_pixbuf_mlsource])
 
 dnl Optional programs.
-AC_CHECK_PROG(PERLDOC,[perldoc],[perldoc],[no])
+
+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])
+    AC_MSG_WARN([perldoc not found - install perl to make man pages])
 fi
-AM_CONDITIONAL(HAVE_PERLDOC,[test "$perldoc" != "no"])
+AM_CONDITIONAL([HAVE_PERLDOC],[test "x$PERLDOC" != "xno"])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile config.ml guestfs-browser.spec])
+AC_CONFIG_FILES([Makefile config.ml])
 AC_OUTPUT