configure: Don't test for camlp4of.opt, test for camlp4of.

[ocaml-bitstring.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c6d2ac7..d59de02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Bitstring syntax extension.
-# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones
+# Copyright (C) 2008-2013 Red Hat Inc., Richard W.M. Jones
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,9 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(ocaml-bitstring,1.9.7)
+AC_INIT(ocaml-bitstring,2.0.4)
+
+AC_PROG_SED
 
 dnl Check for basic C environment.
 AC_PROG_CC
@@ -59,25 +61,46 @@ if test "x$OCAMLFIND" = "x"; then
 fi
 
 dnl Check for camlp4
-AC_CHECK_PROG(CAMLP4OF,camlp4of.opt,camlp4of.opt,no)
+AC_CHECK_PROG(CAMLP4OF,camlp4of,camlp4of,no)
 if test "x$CAMLP4OF" = "xno"; then
     AC_MSG_ERROR([You must have camlp4 installed])
 fi
 
 dnl Check for Extlib (optional)
 AC_CHECK_OCAML_PKG(extlib)
-AC_SUBST(pkg_extlib)
 
 dnl Check for CIL (optional)
 AC_CHECK_OCAML_PKG(cil)
-AC_SUBST(pkg_cil)
 
 dnl Check for /usr/bin/time and get full path.
 AC_PATH_PROG(TIME,time,no)
+if test "x$TIME" = "xno"; then
+    AC_MSG_ERROR(['time' command not found])
+fi
+
+dnl Check for diff and get full path.
+AC_PATH_PROG(DIFF,diff,no)
+if test "x$DIFF" = "xno"; then
+    AC_MSG_ERROR(['diff' command not found])
+fi
+AC_SUBST(DIFF)
 
-dnl Check for gprof.
+dnl Check for gprof (optional).
 AC_CHECK_PROG(GPROF,gprof,gprof,no)
 
+dnl Check for ocaml-bisect (optional) and --enable-coverage.
+AC_CHECK_PROG(BISECT_REPORT,bisect-report,bisect-report,no)
+AC_ARG_ENABLE([coverage],
+    [AS_HELP_STRING([--enable-coverage],
+       [add code coverage information (slow) @<:@default=no@:>@])],
+    [],
+    [enable_coverage=no])
+
+if test "x$enable_coverage" != "xno" -a "x$BISECT_REPORT" = "xno"; then
+    AC_MSG_ERROR([You must install ocaml-bisect package to get code coverage])
+fi
+AC_SUBST(enable_coverage)
+
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile META bitstring_config.ml cil-tools/Makefile])