Disable cplugins feature by default (#1242)

* Disable cplugins feature by default

* Both --with-cplugins and --no-cplugins configure options

* Added Changes entry for GPR#1242

2 files changed, 7 insertions, 2 deletions

diff --git a/Changes b/Changes
index 136acee02c..8ef1a562c3 100644
--- a/Changes
+++ b/Changes
@@ -217,6 +217,9 @@ Working version
 - GPR#1203: speed up the manual build by using ocamldoc.opt
   (Gabriel Scherer, review by Florian Angeletti)
 
+- GPR#1242: disable C plugins loading by default
+  (Alexey Egorov)
+
 ### Internal/compiler-libs changes:
 
 - MPR#6826, GPR#828, GPR#834: improve compilation time for open
diff --git a/configure b/configure
index b141e92645..c48413c531 100755
--- a/configure
+++ b/configure
@@ -65,7 +65,7 @@ flambda=false
 safe_string=false
 afl_instrument=false
 max_testsuite_dir_retries=0
-with_cplugins=true
+with_cplugins=false
 with_fpic=false
 
 # Try to turn internationalization off, can cause config.guess to malfunction!
@@ -206,8 +206,10 @@ while : ; do
         native_compiler=false;;
     -flambda|--flambda)
         flambda=true;;
+    -with-cplugins|--with-cplugins)
+        with_cplugins=true;;
     -no-cplugins|--no-cplugins)
-        with_cplugins=false;;
+        ;; # Ignored for backward compatibility
     -fPIC|--fPIC)
         with_fpic=true;;
     -safe-string|--safe-string)