Patchwork [3/3] Solaris: test for presence of commands with has()

login
register
mail settings
Submitter Loïc Minier
Date Jan. 27, 2010, 12:10 p.m.
Message ID <1264594205-14940-3-git-send-email-lool@dooz.org>
Download mbox | patch
Permalink /patch/43794/
State New
Headers show

Comments

Loïc Minier - Jan. 27, 2010, 12:10 p.m.
---
 configure |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

Patch

diff --git a/configure b/configure
index 6bdd2b7..1d0915a 100755
--- a/configure
+++ b/configure
@@ -803,21 +803,19 @@  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
     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 "`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
     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"