Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Revert previous change to the configure: we don't need to check for t…

…he presence of md5/md5sum anymore.

This reverts cd5dc8f and 09aa904

(and it's a better fix for #563)
  • Loading branch information...
commit 09375fc17117e2bd0cc95455de45a3f7c2e65aca 1 parent d651ce4
Thomas Gazagnaire authored

Showing 3 changed files with 1 addition and 61 deletions. Show diff stats Hide diff stats

  1. +0 1  Makefile.config.in
  2. +1 55 configure
  3. +0 5 configure.ac
1  Makefile.config.in
@@ -3,4 +3,3 @@ prefix=@prefix@
3 3 mandir=@mandir@
4 4 version=@PACKAGE_VERSION@
5 5 FETCH=@fetch@
6   -MD5SUM=@MD5SUM@
56 configure
@@ -644,7 +644,6 @@ CAMLP4PROF
644 644 CAMLP4R
645 645 CAMLP4RF
646 646 AWK
647   -MD5SUM
648 647 FETCH
649 648 fetch
650 649 LIBOBJS
@@ -4543,58 +4542,6 @@ if test "x${enable_certificate-check}" = "xno"; then
4543 4542 fi
4544 4543
4545 4544
4546   -for ac_prog in md5sum md5
4547   -do
4548   - # Extract the first word of "$ac_prog", so it can be a program name with args.
4549   -set dummy $ac_prog; ac_word=$2
4550   -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
4551   -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
4552   -if test "${ac_cv_prog_MD5SUM+set}" = set; then
4553   - echo $ECHO_N "(cached) $ECHO_C" >&6
4554   -else
4555   - if test -n "$MD5SUM"; then
4556   - ac_cv_prog_MD5SUM="$MD5SUM" # Let the user override the test.
4557   -else
4558   -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4559   -for as_dir in $PATH
4560   -do
4561   - IFS=$as_save_IFS
4562   - test -z "$as_dir" && as_dir=.
4563   - for ac_exec_ext in '' $ac_executable_extensions; do
4564   - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4565   - ac_cv_prog_MD5SUM="$ac_prog"
4566   - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
4567   - break 2
4568   - fi
4569   -done
4570   -done
4571   -IFS=$as_save_IFS
4572   -
4573   -fi
4574   -fi
4575   -MD5SUM=$ac_cv_prog_MD5SUM
4576   -if test -n "$MD5SUM"; then
4577   - { echo "$as_me:$LINENO: result: $MD5SUM" >&5
4578   -echo "${ECHO_T}$MD5SUM" >&6; }
4579   -else
4580   - { echo "$as_me:$LINENO: result: no" >&5
4581   -echo "${ECHO_T}no" >&6; }
4582   -fi
4583   -
4584   -
4585   - test -n "$MD5SUM" && break
4586   -done
4587   -test -n "$MD5SUM" || MD5SUM="no"
4588   -
4589   -if test "x$MD5SUM" = "xno"; then
4590   -
4591   - { { echo "$as_me:$LINENO: error: You must have either md5 or md5sum installed." >&5
4592   -echo "$as_me: error: You must have either md5 or md5sum installed." >&2;}
4593   - { (exit 1); exit 1; }; }
4594   -
4595   -fi
4596   -
4597   -
4598 4545 for ac_prog in curl wget
4599 4546 do
4600 4547 # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5348,14 +5295,13 @@ CAMLP4PROF!$CAMLP4PROF$ac_delim
5348 5295 CAMLP4R!$CAMLP4R$ac_delim
5349 5296 CAMLP4RF!$CAMLP4RF$ac_delim
5350 5297 AWK!$AWK$ac_delim
5351   -MD5SUM!$MD5SUM$ac_delim
5352 5298 FETCH!$FETCH$ac_delim
5353 5299 fetch!$fetch$ac_delim
5354 5300 LIBOBJS!$LIBOBJS$ac_delim
5355 5301 LTLIBOBJS!$LTLIBOBJS$ac_delim
5356 5302 _ACEOF
5357 5303
5358   - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
  5304 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
5359 5305 break
5360 5306 elif $ac_last_try; then
5361 5307 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
5 configure.ac
@@ -35,11 +35,6 @@ AS_IF([test "x${enable_certificate-check}" = "xno"], [
35 35 wget_certificate_check=--no-check-certificate
36 36 ])
37 37
38   -AC_CHECK_PROGS(MD5SUM,[md5sum md5],no)
39   -AS_IF([test "x$MD5SUM" = "xno"], [
40   - AC_MSG_ERROR([You must have either md5 or md5sum installed.])
41   -])
42   -
43 38 AC_CHECK_PROGS(FETCH,[curl wget],no)
44 39
45 40 if test x"$FETCH" = x"curl" ; then

0 comments on commit 09375fc

Please sign in to comment.
Something went wrong with that request. Please try again.