X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=d1232d37c202e12e3facd4f2c80f1f2453478bcb;hb=b393dfee11d39ada901202ae82d5dfd22dc561df;hp=50fb3b3d01e4bc5ecf6fe57cb039caae9a1488ac;hpb=e3cc4d32de383a8087c1065f150a09c5f3f77ca8;p=guestfs-browser.git

diff --git a/configure.ac b/configure.ac
index 50fb3b3..d1232d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.6])
+AC_INIT([guestfs-browser],[0.2.3])
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -32,16 +32,32 @@ 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
     AC_MSG_ERROR([You must install OCaml findlib (ocamlfind)])
 fi
 
+dnl Check for camlp4.
+AC_PROG_CAMLP4
+if test "$CAMLP4" = "no"; then
+    AC_MSG_ERROR([You must install the OCaml 'camlp4' preprocessor package])
+fi
+
 dnl Check for all OCaml packages.
 AC_CHECK_OCAML_PKG([lablgtk2])
 if test "$OCAML_PKG_lablgtk2" = "no"; then
@@ -68,6 +84,11 @@ if test "$OCAML_PKG_xml_light" = "no"; then
     AC_MSG_ERROR([Please install OCaml module 'xml-light'.])
 fi
 
+AC_CHECK_OCAML_PKG([calendar])
+if test "$OCAML_PKG_calendar" = "no"; then
+    AC_MSG_ERROR([Please install OCaml module 'calendar'.])
+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).])
@@ -100,5 +121,5 @@ fi
 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])
 AC_OUTPUT