Browse files

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...
1 parent d651ce4 commit 09375fc17117e2bd0cc95455de45a3f7c2e65aca @samoht committed Mar 27, 2013
Showing with 1 addition and 61 deletions.
  1. +0 −1 Makefile.config.in
  2. +1 −55 configure
  3. +0 −5 configure.ac
View
1 Makefile.config.in
@@ -3,4 +3,3 @@ prefix=@prefix@
mandir=@mandir@
version=@PACKAGE_VERSION@
FETCH=@fetch@
-MD5SUM=@MD5SUM@
View
56 configure
@@ -644,7 +644,6 @@ CAMLP4PROF
CAMLP4R
CAMLP4RF
AWK
-MD5SUM
FETCH
fetch
LIBOBJS
@@ -4543,58 +4542,6 @@ if test "x${enable_certificate-check}" = "xno"; then
fi
-for ac_prog in md5sum md5
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_MD5SUM+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$MD5SUM"; then
- ac_cv_prog_MD5SUM="$MD5SUM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MD5SUM="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-MD5SUM=$ac_cv_prog_MD5SUM
-if test -n "$MD5SUM"; then
- { echo "$as_me:$LINENO: result: $MD5SUM" >&5
-echo "${ECHO_T}$MD5SUM" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$MD5SUM" && break
-done
-test -n "$MD5SUM" || MD5SUM="no"
-
-if test "x$MD5SUM" = "xno"; then
-
- { { echo "$as_me:$LINENO: error: You must have either md5 or md5sum installed." >&5
-echo "$as_me: error: You must have either md5 or md5sum installed." >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-
-
for ac_prog in curl wget
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5348,14 +5295,13 @@ CAMLP4PROF!$CAMLP4PROF$ac_delim
CAMLP4R!$CAMLP4R$ac_delim
CAMLP4RF!$CAMLP4RF$ac_delim
AWK!$AWK$ac_delim
-MD5SUM!$MD5SUM$ac_delim
FETCH!$FETCH$ac_delim
fetch!$fetch$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
View
5 configure.ac
@@ -35,11 +35,6 @@ AS_IF([test "x${enable_certificate-check}" = "xno"], [
wget_certificate_check=--no-check-certificate
])
-AC_CHECK_PROGS(MD5SUM,[md5sum md5],no)
-AS_IF([test "x$MD5SUM" = "xno"], [
- AC_MSG_ERROR([You must have either md5 or md5sum installed.])
-])
-
AC_CHECK_PROGS(FETCH,[curl wget],no)
if test x"$FETCH" = x"curl" ; then

0 comments on commit 09375fc

Please sign in to comment.