···
186
+
@@ -4564,7 +4564,7 @@
187
+
if test "$OCAMLFIND" = no; then
188
+
reason_ocamlfind=" (not found)"
190
+
- OCAMLFINDLIB=$(ocamlfind printconf stdlib)
191
+
+ OCAMLFINDLIB=$(ocamlfind printconf stdlib | tr -d '\r')
192
+
if test "$OCAMLFINDLIB" != "$OCAMLLIB"; then
194
+
reason_ocamlfind=" (incompatible with OCaml)"
195
+
@@ -4585,7 +4585,7 @@
197
+
if test "$enable_ocamlfind" != no; then
198
+
#if ocamlfind is used it gives the install path for ocaml library
199
+
- OCAMLINSTALLLIB=$($OCAMLFIND printconf destdir)
200
+
+ OCAMLINSTALLLIB=$($OCAMLFIND printconf destdir | tr -d '\r')
201
+
enable_ocamlfind=yes
203
+
OCAMLINSTALLLIB=$OCAMLLIB
204
+
@@ -4601,7 +4601,7 @@
206
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Why3 using ocamlfind" >&5
207
+
printf %s "checking for Why3 using ocamlfind... " >&6; }
208
+
- DIR=$($OCAMLFIND query why3 2> /dev/null)
209
+
+ DIR=$($OCAMLFIND query why3 | tr -d '\r' 2> /dev/null)
210
+
if test -n "$DIR"; then
211
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
212
+
printf "%s\n" "yes" >&6; }
213
+
@@ -4623,7 +4623,7 @@
214
+
if test "$enable_ocamlfind" = yes; then
215
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler-libs using ocamlfind" >&5
216
+
printf %s "checking for compiler-libs using ocamlfind... " >&6; }
217
+
- COMPILERLIBS=$($OCAMLFIND query compiler-libs 2> /dev/null)
218
+
+ COMPILERLIBS=$($OCAMLFIND query compiler-libs | tr -d '\r' 2> /dev/null)
219
+
if test -n "$COMPILERLIBS"; then
220
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
221
+
printf "%s\n" "yes" >&6; }
222
+
@@ -4810,7 +4810,7 @@
223
+
if test "$enable_ocamlfind" = yes; then
224
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for num using ocamlfind" >&5
225
+
printf %s "checking for num using ocamlfind... " >&6; }
226
+
- DIR=$($OCAMLFIND query num 2> /dev/null)
227
+
+ DIR=$($OCAMLFIND query num | tr -d '\r' 2> /dev/null)
228
+
if test -z "$DIR"; then
229
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
230
+
printf "%s\n" "no" >&6; }
231
+
@@ -4940,7 +4940,7 @@
232
+
if test "$enable_ocamlfind" = yes; then
233
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zarith using ocamlfind" >&5
234
+
printf %s "checking for zarith using ocamlfind... " >&6; }
235
+
- DIR=$($OCAMLFIND query zarith 2> /dev/null)
236
+
+ DIR=$($OCAMLFIND query zarith | tr -d '\r' 2> /dev/null)
237
+
if test -n "$DIR"; then
238
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
239
+
printf "%s\n" "yes" >&6; }
240
+
@@ -5031,7 +5031,7 @@
241
+
if test "$enable_bddinfer" = yes; then
242
+
if test "$enable_ocamlfind" = yes; then
243
+
# gmp is a dependency of apron
244
+
- INFERINCLUDE=$($OCAMLFIND query -separator ' ' -i-format apron 2> /dev/null)
245
+
+ INFERINCLUDE=$($OCAMLFIND query -separator ' ' -i-format apron | tr -d '\r' 2> /dev/null)
247
+
if test -n "$INFERINCLUDE"; then
248
+
echo "ocamlfind found apron in $INFERINCLUDE"
249
+
@@ -5051,14 +5051,14 @@
250
+
if test "$enable_infer" = yes; then
251
+
if test "$enable_ocamlfind" = yes; then
252
+
# gmp is a dependency of apron
253
+
- INFERINCLUDE=$($OCAMLFIND query apron camllib 2> /dev/null)
254
+
+ INFERINCLUDE=$($OCAMLFIND query apron camllib | tr -d '\r' 2> /dev/null)
256
+
if test -n "$INFERINCLUDE"; then
257
+
echo "ocamlfind found apron, camllib in $INFERINCLUDE"
258
+
- INFERINCLUDE=$($OCAMLFIND query fixpoint 2> /dev/null)
259
+
+ INFERINCLUDE=$($OCAMLFIND query fixpoint | tr -d '\r' 2> /dev/null)
260
+
if test -n "$INFERINCLUDE"; then
261
+
echo "ocamlfind found fixpoint in $INFERINCLUDE"
262
+
- INFERINCLUDE="$($OCAMLFIND query -separator ' ' -i-format apron fixpoint camllib gmp 2> /dev/null)"
263
+
+ INFERINCLUDE="$($OCAMLFIND query -separator ' ' -i-format apron fixpoint camllib gmp | tr -d '\r' 2> /dev/null)"
264
+
INFERLIB="apron fixpoint"
265
+
INFERPKG="apron fixpoint apron.boxMPQ apron.octMPQ apron.polkaMPQ"
267
+
@@ -5086,7 +5086,7 @@
268
+
if test "$enable_ocamlfind" = yes; then
269
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for camlzip using ocamlfind" >&5
270
+
printf %s "checking for camlzip using ocamlfind... " >&6; }
271
+
- DIR=$($OCAMLFIND query zip 2> /dev/null)
272
+
+ DIR=$($OCAMLFIND query zip | tr -d '\r' 2> /dev/null)
273
+
if test -n "$DIR"; then
274
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
275
+
printf "%s\n" "yes" >&6; }
276
+
@@ -5177,7 +5177,7 @@
277
+
if test "$enable_ocamlfind" = yes; then
278
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for menhirLib using ocamlfind" >&5
279
+
printf %s "checking for menhirLib using ocamlfind... " >&6; }
280
+
- DIR=$($OCAMLFIND query menhirLib 2> /dev/null)
281
+
+ DIR=$($OCAMLFIND query menhirLib | tr -d '\r' 2> /dev/null)
282
+
if test -n "$DIR"; then
283
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
284
+
printf "%s\n" "yes" >&6; }
285
+
@@ -5280,7 +5280,7 @@
286
+
if test "$enable_ocamlfind" = yes; then
287
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for re using ocamlfind" >&5
288
+
printf %s "checking for re using ocamlfind... " >&6; }
289
+
- DIR=$($OCAMLFIND query re 2> /dev/null)
290
+
+ DIR=$($OCAMLFIND query re | tr -d '\r' 2> /dev/null)
291
+
if test -n "$DIR"; then
292
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
293
+
printf "%s\n" "yes" >&6; }
294
+
@@ -5381,7 +5381,7 @@
295
+
if test "$enable_ide" != no; then
296
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lablgtk3 using ocamlfind" >&5
297
+
printf %s "checking for lablgtk3 using ocamlfind... " >&6; }
298
+
- DIR=$($OCAMLFIND query lablgtk3 2> /dev/null)
299
+
+ DIR=$($OCAMLFIND query lablgtk3 | tr -d '\r' 2> /dev/null)
300
+
if test -n "$DIR"; then
301
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
302
+
printf "%s\n" "yes" >&6; }
303
+
@@ -5428,7 +5428,7 @@
304
+
for p in $PKGS_SOURCEVIEW; do
305
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $p using ocamlfind" >&5
306
+
printf %s "checking for $p using ocamlfind... " >&6; }
307
+
- DIR=$($OCAMLFIND query $p 2> /dev/null)
308
+
+ DIR=$($OCAMLFIND query $p | tr -d '\r' 2> /dev/null)
309
+
if test -n "$DIR"; then
310
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
311
+
printf "%s\n" "yes" >&6; }
312
+
@@ -5502,7 +5502,7 @@
313
+
if test "$enable_ocamlfind" = yes; then
314
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ocamlgraph using ocamlfind" >&5
315
+
printf %s "checking for ocamlgraph using ocamlfind... " >&6; }
316
+
- DIR=$($OCAMLFIND query ocamlgraph 2> /dev/null)
317
+
+ DIR=$($OCAMLFIND query ocamlgraph | tr -d '\r' 2> /dev/null)
318
+
if test -n "$DIR"; then
319
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
320
+
printf "%s\n" "yes" >&6; }
321
+
@@ -5625,7 +5625,7 @@
323
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mlmpfr" >&5
324
+
printf %s "checking for mlmpfr... " >&6; }
325
+
- DIR=$($OCAMLFIND query mlmpfr 2> /dev/null)
326
+
+ DIR=$($OCAMLFIND query mlmpfr | tr -d '\r' 2> /dev/null)
327
+
if test -n "$DIR"; then
328
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
329
+
printf "%s\n" "yes" >&6; }
330
+
@@ -5633,7 +5633,7 @@
331
+
echo "ocamlfind found mlmpfr in $DIR"
332
+
# Test that MPFR version is higher than 4.0.0 (because of
333
+
# Faithful constructor incompatibility).
334
+
- MPFRVERSION=$($OCAMLFIND query -format "%v" mlmpfr 2> /dev/null)
335
+
+ MPFRVERSION=$($OCAMLFIND query -format "%v" mlmpfr | tr -d '\r' 2> /dev/null)
336
+
as_arg_v1=$MPFRVERSION
338
+
awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
339
+
@@ -5732,7 +5732,7 @@
340
+
for p in js_of_ocaml js_of_ocaml-ppx; do
341
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $p" >&5
342
+
printf %s "checking for $p... " >&6; }
343
+
- DIR=$($OCAMLFIND query $p 2> /dev/null)
344
+
+ DIR=$($OCAMLFIND query $p | tr -d '\r' 2> /dev/null)
345
+
if test -z "$DIR"; then
346
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
347
+
printf "%s\n" "no" >&6; }
348
+
@@ -5777,7 +5777,7 @@
349
+
enable_statmemprof=no
350
+
reason_statmemprof=" (ocamlfind not available)"
352
+
- DIR=$($OCAMLFIND query statmemprof-emacs 2> /dev/null)
353
+
+ DIR=$($OCAMLFIND query statmemprof-emacs | tr -d '\r' 2> /dev/null)
354
+
if test -z "$DIR"; then
355
+
enable_statmemprof=no
356
+
reason_statmemprof=" (statmemprof-emacs not found)"
357
+
@@ -5802,7 +5802,7 @@
358
+
for p in ppx_sexp_conv sexplib ppx_deriving; do
359
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $p using ocamlfind" >&5
360
+
printf %s "checking for $p using ocamlfind... " >&6; }
361
+
- DIR=$($OCAMLFIND query $p 2> /dev/null)
362
+
+ DIR=$($OCAMLFIND query $p | tr -d '\r' 2> /dev/null)
363
+
if test -z "$DIR"; then
364
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
365
+
printf "%s\n" "no" >&6; }