diff --git a/configure.in b/configure.in
index 88b5fb196096144fde7a9955133601c9f3ee17de..ace93be018f84fa2cc3aafaa7cad0ba56403fdc4 100644
--- a/configure.in
+++ b/configure.in
@@ -170,8 +170,8 @@ fi
 
 AC_ARG_ENABLE(
   devel-mode,
-  [  --enable-devel-mode    force the devel mode (warnings and warn-error).
-  --disable-devel-mode   force the distrib mode (no warnings and no warn-error).
+  [  --enable-devel-mode     force the devel mode (warnings and warn-error).
+  --disable-devel-mode    force the distrib mode (no warnings and no warn-error).
 ],
   DEVELOPMENT=$enableval,
   DEVELOPMENT=$DEFAULT_DEVEL_MODE, # default value
@@ -319,17 +319,27 @@ 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)
+AC_ARG_ENABLE(
+  landmarks,
+  [  --enable-landmarks      enable landmarks profiling (default: yes if package installed)],
+  ENABLE_LANDMARKS=$enableval,
+  ENABLE_LANDMARKS=yes)
+
+if test "$ENABLE_LANDMARKS" = yes ; then
+  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;
 else
-  HAS_LANDMARKS="no";
-  AC_MSG_RESULT(not found.)
-fi;
+  AC_MSG_RESULT(Landmarks profiling disabled);
+  HAS_LANDMARKS="no"
+fi
 
 ############
 # Platform #
@@ -395,7 +405,7 @@ AC_CHECK_HEADERS(unistd.h)
 # Local machdep feature (to generate new platforms)
 AC_ARG_ENABLE(
   localmachdep,
-  [  --enable-localmachdep    enable local machdep configuration],
+  [  --enable-localmachdep   enable local machdep configuration],
   LOCAL_MACHDEP=$enableval,
   LOCAL_MACHDEP=no)