From 7a6723b3d51cc0febd42aa1273343057b41a9d18 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kim=20Nguy=E1=BB=85n?= <kn@lri.fr>
Date: Mon, 8 Feb 2016 22:26:06 +0100
Subject: [PATCH] Add ocamlbuild detection to configure.in

---
 Makefile.in  |  6 +++---
 configure.in | 43 ++++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d8797be..5443f6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 CAMLP4FLAGS=@CAMLP4FLAGS@
 PPOPTSFLAGS= $($CAMLP4FLAGS:%=ppopt(%))
 OCAMLBUILDFLAGS=-j 0 -use-ocamlfind @OCAMLBUILDFLAGS@
-
+OCAMLBUILD=@OCAMLBUILD@
 
 TARGETS=tatoo.native
 ifeq ($(BYTE), true)
@@ -17,10 +17,10 @@ all: $(TARGETS)
 	@
 
 %:
-	@ ocamlbuild $(OCAMLBUILDFLAGS)  $(PPOPTFLAGS:%=-tag %) $@
+	@ $(OCAMLBUILD) $(OCAMLBUILDFLAGS)  $(PPOPTFLAGS:%=-tag %) $@
 
 clean:
-	@ ocamlbuild $(OCAMLBUILDFLAGS) -clean
+	@ $(OCAMLBUILD) $(OCAMLBUILDFLAGS) -clean
 
 distclean: clean
 	@ rm -rf configure config.log config.status autom4te.cache Makefile
diff --git a/configure.in b/configure.in
index 1fc73cf..d9a9133 100644
--- a/configure.in
+++ b/configure.in
@@ -90,50 +90,51 @@ case "$OCAMLYACC_VERSION" in
 esac
 AC_SUBST([OCAMLYACC])
 
-#detect ocamllex
-OCAMLLEX=ocamllex
-AC_ARG_WITH([ocamllex],
-            AS_HELP_STRING([--with-ocamllex=PATH], [location of the ocamllex binary]),
-        [OCAMLLEX="$withval"])
-AC_MSG_CHECKING([for ocamllex ($OCAMLLEX)])
-OCAMLLEX_VERSION=$($OCAMLLEX -version 2>/dev/null || echo foo)
-case "$OCAMLLEX_VERSION" in
+
+#detect camlp4
+CAMLP4=camlp4
+AC_ARG_WITH([camlp4],
+            AS_HELP_STRING([--with-camlp4=PATH], [location of the camlp4 binary]),
+        [CAMLP4="$withval"])
+AC_MSG_CHECKING([for camlp4 ($CAMLP4)])
+CAMLP4_VERSION=$($CAMLP4 -version 2>/dev/null || echo foo)
+case "$CAMLP4_VERSION" in
      *$OCAMLVERSION)
      AC_MSG_RESULT([ok])
      ;;
      foo)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Cannot find ocamllex])
+     AC_MSG_ERROR([Cannot find camlp4])
      ;;
      *)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Bad ocamllex version])
+     AC_MSG_ERROR([Bad camlp4 version])
      ;;
 esac
-AC_SUBST([OCAMLLEX])
-
+AC_SUBST([CAMLP4])
 
-#detect camlp4
-CAMLP4=camlp4
-AC_ARG_WITH([camlp4],
-            AS_HELP_STRING([--with-camlp4=PATH], [location of the camlp4 binary]),
+#detect ocamlbuild
+OCAMLBUILD=ocamlbuild
+AC_ARG_WITH([ocamlbuild],
+            AS_HELP_STRING([--with-ocamlbuild=PATH], [location of the ocamlbuild binary]),
         [CAMLP4="$withval"])
-AC_MSG_CHECKING([for camlp4 ($CAMLP4)])
-CAMLP4_VERSION=$($CAMLP4 -version 2>/dev/null || echo foo)
+AC_MSG_CHECKING([for ocamlbuild ($OCAMLBUILD)])
+OCAMLBUILD_VERSION=$($OCAMLBUILD -version 2>/dev/null || echo foo)
 case "$CAMLP4_VERSION" in
      *$OCAMLVERSION)
      AC_MSG_RESULT([ok])
      ;;
      foo)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Cannot find camlp4])
+     AC_MSG_ERROR([Cannot find ocamlbuild])
      ;;
      *)
      AC_MSG_RESULT([failed])
-     AC_MSG_ERROR([Bad camlp4 version])
+     AC_MSG_ERROR([Bad ocamlbuild version])
      ;;
 esac
-AC_SUBST([CAMLP4])
+AC_SUBST([OCAMLBUILD])
+
 
 # platform
 AC_MSG_CHECKING([platform])
-- 
2.17.1