Kaydet (Commit) 43d1b80a authored tarafından Benedikt Morbach's avatar Benedikt Morbach Kaydeden (comit) Tor Lillqvist

configure.ac: always search for md5sum

Since edf8db71, 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/6127Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
Tested-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 2997d7d1
...@@ -11992,10 +11992,9 @@ AC_SUBST(OOO_JUNIT_JAR) ...@@ -11992,10 +11992,9 @@ AC_SUBST(OOO_JUNIT_JAR)
AC_SUBST(SCPDEFS) AC_SUBST(SCPDEFS)
# #
# check for wget and md5sum # check for wget and curl
# #
WGET= WGET=
MD5SUM=
CURL= CURL=
if test "$enable_fetch_external" != "no"; then if test "$enable_fetch_external" != "no"; then
...@@ -12015,6 +12014,16 @@ if test -z "$WGET" -a -z "$CURL"; then ...@@ -12015,6 +12014,16 @@ if test -z "$WGET" -a -z "$CURL"; then
AC_MSG_ERROR([neither wget nor curl found!]) AC_MSG_ERROR([neither wget nor curl found!])
fi 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 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 if test "$i" = "md5"; then
eval "$i -x" > /dev/null 2>&1 eval "$i -x" > /dev/null 2>&1
...@@ -12040,10 +12049,6 @@ if test -z "$MD5SUM"; then ...@@ -12040,10 +12049,6 @@ if test -z "$MD5SUM"; then
AC_MSG_ERROR([no md5sum: found!]) AC_MSG_ERROR([no md5sum: found!])
fi fi
fi
AC_SUBST(WGET)
AC_SUBST(CURL)
AC_SUBST(MD5SUM) AC_SUBST(MD5SUM)
dnl =================================================================== dnl ===================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment