View | Details | Raw Unified | Return to bug 199413 | Differences between
and this patch

Collapse All | Expand All

(-)configure (-74 lines)
Lines 599-606 Link Here
599
OCAML_PKG_re
599
OCAML_PKG_re
600
OCAML_PKG_extlib
600
OCAML_PKG_extlib
601
OCAML_PKG_unix
601
OCAML_PKG_unix
602
fetch
603
FETCH
604
OCAMLFIND
602
OCAMLFIND
605
OCAMLYACC
603
OCAMLYACC
606
OCAMLLEXDOTOPT
604
OCAMLLEXDOTOPT
Lines 671-677 Link Here
671
ac_user_opts='
669
ac_user_opts='
672
enable_option_checking
670
enable_option_checking
673
enable_version_check
671
enable_version_check
674
enable_certificate_check
675
'
672
'
676
      ac_precious_vars='build_alias
673
      ac_precious_vars='build_alias
677
host_alias
674
host_alias
Lines 1292-1301 Link Here
1292
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1289
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1293
  --disable-version-check Do not check OCaml version
1290
  --disable-version-check Do not check OCaml version
1294
1291
1295
  --disable-certificate-check
1296
                          Do not check the certificate of OPAM's dependency
1297
                          archives
1298
1299
1292
1300
Some influential environment variables:
1293
Some influential environment variables:
1301
  CC          C compiler command
1294
  CC          C compiler command
Lines 4156-4228 Link Here
4156
4149
4157
4150
4158
4151
4159
# Check whether --enable-certificate_check was given.
4160
if test "${enable_certificate_check+set}" = set; then :
4161
  enableval=$enable_certificate_check;
4162
fi
4163
4164
4165
if test "x${enable_certificate_check}" = "xno"; then :
4166
4167
  curl_certificate_check=--insecure
4168
  wget_certificate_check=--no-check-certificate
4169
4170
fi
4171
4172
for ac_prog in curl wget
4173
do
4174
  # Extract the first word of "$ac_prog", so it can be a program name with args.
4175
set dummy $ac_prog; ac_word=$2
4176
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4177
$as_echo_n "checking for $ac_word... " >&6; }
4178
if ${ac_cv_prog_FETCH+:} false; then :
4179
  $as_echo_n "(cached) " >&6
4180
else
4181
  if test -n "$FETCH"; then
4182
  ac_cv_prog_FETCH="$FETCH" # Let the user override the test.
4183
else
4184
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4185
for as_dir in $PATH
4186
do
4187
  IFS=$as_save_IFS
4188
  test -z "$as_dir" && as_dir=.
4189
    for ac_exec_ext in '' $ac_executable_extensions; do
4190
  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4191
    ac_cv_prog_FETCH="$ac_prog"
4192
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4193
    break 2
4194
  fi
4195
done
4196
  done
4197
IFS=$as_save_IFS
4198
4199
fi
4200
fi
4201
FETCH=$ac_cv_prog_FETCH
4202
if test -n "$FETCH"; then
4203
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FETCH" >&5
4204
$as_echo "$FETCH" >&6; }
4205
else
4206
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4207
$as_echo "no" >&6; }
4208
fi
4209
4210
4211
  test -n "$FETCH" && break
4212
done
4213
test -n "$FETCH" || FETCH="no"
4214
4215
4216
if test x"$FETCH" = x"curl" ; then
4217
  fetch="curl $curl_certificate_check -OL"
4218
4219
elif test x"$FETCH" = x"wget" ; then
4220
  fetch="wget $wget_certificate_check"
4221
4222
else
4223
  as_fn_error $? "You must have either curl or wget installed." "$LINENO" 5
4224
fi
4225
4226
echo
4152
echo
4227
4153
4228
4154

Return to bug 199413