mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Fix shell syntax to placate OpenBSD's pdksh

Browse Source 
Unfortunately the OpenBSD pdksh does not like brackets inside
the right part of a ${variable+word} parameter expansion:

  $ echo "${a+($b)}"
  ksh: ${a+($b)}": bad substitution

though both bash and dash accept them. In any case this line
was causing odd output in the case where nettle is not present:
  nettle    no ()

(because if nettle is not present then $nettle will be "no",
not a null string or unset).

Rewrite it to just use an if.

This bug was originally introduced in becaeb726 and was present
in the 2.4.0 release.

Fixes: https://bugs.launchpad.net/qemu/+bug/1525682
Reported-by: Dmitrij D. Czarkoff
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1450105357-8516-1-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2015-12-14 15:02:36 +00:00
parent 67a7084062
commit 18f49881cf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -4766,7 +4766,11 @@ echo "GTK GL support $gtk_gl"
echo "GNUTLS support $gnutls" echo "GNUTLS support $gnutls"
echo "GNUTLS hash $gnutls_hash" echo "GNUTLS hash $gnutls_hash"
echo "libgcrypt $gcrypt" echo "libgcrypt $gcrypt"
echo "nettle $nettle ${nettle+($nettle_version)}" if test "$nettle" = "yes"; then
echo "nettle $nettle ($nettle_version)"
else
echo "nettle $nettle"
fi
echo "libtasn1 $tasn1" echo "libtasn1 $tasn1"
echo "VTE support $vte" echo "VTE support $vte"
echo "curses support $curses" echo "curses support $curses"