summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2010-01-20 11:35:54 +0100
committerBlue Swirl <blauwirbel@gmail.com>2010-01-28 21:27:46 +0000
commit6792aa115e05d59419dd167c772496f41fc451cc (patch)
treebd2fd9da94541789dd340f1df633723246b122e2
parent0dba619507150125cfe04c77b6b8e0d210bdbc07 (diff)
downloadqemu-6792aa115e05d59419dd167c772496f41fc451cc.tar.gz
Solaris: test for presence of commands with has()
Signed-off-by: Loïc Minier <lool@dooz.org> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rwxr-xr-xconfigure12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure b/configure
index 6bdd2b743e..42ef6287a2 100755
--- a/configure
+++ b/configure
@@ -803,21 +803,23 @@ fi
# Solaris specific configure tool chain decisions
#
if test "$solaris" = "yes" ; then
- solinst=`path_of $install`
- if test -z "$solinst" ; then
+ if has $install; then
+ :
+ else
echo "Solaris install program not found. Use --install=/usr/ucb/install or"
echo "install fileutils from www.blastwave.org using pkg-get -i fileutils"
echo "to get ginstall which is used by default (which lives in /opt/csw/bin)"
exit 1
fi
- if test "$solinst" = "/usr/sbin/install" ; then
+ if test "`path_of $install`" = "/usr/sbin/install" ; then
echo "Error: Solaris /usr/sbin/install is not an appropriate install program."
echo "try ginstall from the GNU fileutils available from www.blastwave.org"
echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install"
exit 1
fi
- sol_ar=`path_of ar`
- if test -z "$sol_ar" ; then
+ if has ar; then
+ :
+ else
echo "Error: No path includes ar"
if test -f /usr/ccs/bin/ar ; then
echo "Add /usr/ccs/bin to your path and rerun configure"