diff options
| author | Benedikt Morbach <benedikt.morbach@googlemail.com> | 2013-10-04 13:40:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-04 12:54:39 +0000 |
| commit | 195caf1f600fe07a1549636103c91b46050eb259 (patch) | |
| tree | 5c0c050fb3e5fd66575459fcc25aebeeacd662e3 | |
| parent | 2727377bed3f4f1e555f61b22a1fb3547ce18edc (diff) | |
configure.ac: always search for md5sum
Since edf8db717f49199833de9fc9d2c9817bab613795, the MD5SUM env variable
is used by solenv/bin/modules/{installer.pm,installer/systemactions.pm}
like this:
echo $languagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"
Because the MD5SUM check is behind "$enable_fetch_external" != "no",
this causes an error with --disable-fetch external:
sh: -c: line 0: syntax error near unexpected token `|'
Move it out of the enable_fetch_external check.
Change-Id: Ib0a9694226deed3957868c17fe4d982f38fd84b1
Reviewed-on: https://gerrit.libreoffice.org/6128
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c6bee5c8c6c8..23b514f60e27 100644 --- a/configure.ac +++ b/configure.ac @@ -11281,10 +11281,9 @@ AC_SUBST(OOO_JUNIT_JAR) AC_SUBST(SCPDEFS) # -# check for wget and md5sum +# check for wget and curl # WGET= -MD5SUM= CURL= if test "$enable_fetch_external" != "no"; then @@ -11304,6 +11303,16 @@ if test -z "$WGET" -a -z "$CURL"; then AC_MSG_ERROR([neither wget nor curl found!]) fi +fi + +AC_SUBST(WGET) +AC_SUBST(CURL) + +# +# check for md5sum +# +MD5SUM= + for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do if test "$i" = "md5"; then eval "$i -x" > /dev/null 2>&1 @@ -11329,10 +11338,6 @@ if test -z "$MD5SUM"; then AC_MSG_ERROR([no md5sum: found!]) fi -fi - -AC_SUBST(WGET) -AC_SUBST(CURL) AC_SUBST(MD5SUM) dnl =================================================================== |