From 55123d13873893acddf9809a8ce6ea6e5f430770 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.oliveiramaroneze@cea.fr>
Date: Fri, 6 Jan 2017 19:56:52 +0100
Subject: [PATCH] [configure] integrate landmarks profiling lib and remove
 unneeded substitutions

---
 configure.in             | 17 +++++++++++++++--
 share/Makefile.config.in |  9 +++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 87317160f6d..88b5fb19609 100644
--- a/configure.in
+++ b/configure.in
@@ -316,6 +316,20 @@ else
   AC_MSG_RESULT(not found. The corresponding domains won't be available in Eva)
 fi;
 
+# landmarks (profiling tool, for developers)
+########
+
+AC_MSG_CHECKING(for Landmarks)
+
+LANDMARKS_PATH=$($OCAMLFIND query landmarks 2>/dev/null | tr -d '\r\n')
+LANDMARKS_PPX_PATH=$($OCAMLFIND query landmarks.ppx 2>/dev/null | tr -d '\r\n')
+if test -f "$LANDMARKS_PATH/landmarks.cmxs" -a -f "$LANDMARKS_PPX_PATH/ppx_landmarks"; then
+  HAS_LANDMARKS="yes";
+  AC_MSG_RESULT(found)
+else
+  HAS_LANDMARKS="no";
+  AC_MSG_RESULT(not found.)
+fi;
 
 ############
 # Platform #
@@ -972,9 +986,8 @@ AC_SUBST(DEVELOPMENT)
 AC_SUBST(DOT)
 AC_SUBST(HAS_DOT)
 AC_SUBST(HAS_ZARITH)
-AC_SUBST(ZARITH_PATH)
 AC_SUBST(HAS_APRON)
-AC_SUBST(APRON_PATH)
+AC_SUBST(HAS_LANDMARKS)
 AC_SUBST(OCAMLBEST)
 AC_SUBST(OCAMLVERSION)
 AC_SUBST(OCAMLLIB)
diff --git a/share/Makefile.config.in b/share/Makefile.config.in
index 0f2a08ce440..f03455ed587 100644
--- a/share/Makefile.config.in
+++ b/share/Makefile.config.in
@@ -101,11 +101,12 @@ HAS_GNOMECANVAS	?=@HAS_GNOMECANVAS@
 
 # zarith
 HAS_ZARITH	?=@HAS_ZARITH@
-ZARITH_PATH	?=@ZARITH_PATH@
 
 # apron
 HAS_APRON	?=@HAS_APRON@
-APRON_PATH	?=@APRON_PATH@
+
+# landmarks
+HAS_LANDMARKS	?=@HAS_LANDMARKS@
 
 ##########################
 # Miscellaneous commands #
@@ -178,6 +179,10 @@ ifeq ($(HAS_ZARITH),yes)
 LIBRARY_NAMES += zarith
 endif
 
+ifeq ($(HAS_LANDMARKS),yes)
+LIBRARY_NAMES += landmarks landmarks.ppx
+endif
+
 ifneq ($(ENABLE_GUI),no)
 LIBRARY_NAMES_GUI = lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2
 else
-- 
GitLab