Fix caml deprecated warnings in nls

configure

@@ -2,7 +2,7 @@
 
 sysname='Sundials/ML'
 version=6.1.1
-versionp=0
+versionp=1
 contact='[email protected]'
 
 unset prefix

src/lsolvers/sundials_linearsolver_ml.c

@@ -13,6 +13,8 @@
 
 #include "../config.h"
 
+#define CAML_NAME_SPACE
+
 #include <caml/mlvalues.h>
 #include <caml/alloc.h>
 #include <caml/memory.h>
@@ -21,12 +23,6 @@
 #include <caml/fail.h>
 #include <caml/bigarray.h>
 
-#if 41400 <= OCAML_VERSION
-// caml/compatibility.h defines a macro 'initialize' in order to show a
-// deprecated warning, but Sundials uses 'initialize' as a field name.
-#undef initialize
-#endif
-
 #include "../sundials/sundials_ml.h"
 #include "../nvectors/nvector_ml.h"
 #include "../lsolvers/sundials_linearsolver_ml.h"

src/lsolvers/sundials_nonlinearsolver_ml.c

@@ -13,6 +13,15 @@
 
 #include "../config.h"
 
+#define CAML_NAME_SPACE
+
+#include <caml/mlvalues.h>
+#include <caml/alloc.h>
+#include <caml/memory.h>
+#include <caml/callback.h>
+#include <caml/custom.h>
+#include <caml/fail.h>
+
 #include "../sundials/sundials_ml.h"
 #include "../nvectors/nvector_ml.h"
 #include "../lsolvers/sundials_nonlinearsolver_ml.h"
@@ -66,13 +75,6 @@ typedef struct _N_VectorContent_SensWrapper *N_VectorContent_SensWrapper;
 
 #endif
 
-#include <caml/mlvalues.h>
-#include <caml/alloc.h>
-#include <caml/memory.h>
-#include <caml/callback.h>
-#include <caml/custom.h>
-#include <caml/fail.h>
-
 #define MAX_ERRMSG_LEN 256
 
 /* Nonlinear solvers (NLS) - use cases