From 94ac51588972366287fa359a1e7d37b5e08f9bef Mon Sep 17 00:00:00 2001 From: pbrook Date: Wed, 26 Apr 2006 16:07:35 +0000 Subject: [PATCH] Solaris configure hacks. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1858 c046a42c-6fe2-441c-8c8c-71466251a162 --- configure | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/configure b/configure index cae6f6e..07c3738 100755 --- a/configure +++ b/configure @@ -51,7 +51,7 @@ case "$cpu" in s390) cpu="s390" ;; - sparc) + sparc|sun4[muv]) cpu="sparc" ;; sparc64) @@ -296,7 +296,7 @@ cc="${cross_prefix}${cc}" ar="${cross_prefix}${ar}" strip="${cross_prefix}${strip}" -if [ -z `which $cc` ] ; then +if [ ! -x "`which $cc`" ] ; then echo "Compiler $cc could not be found" exit fi @@ -341,16 +341,6 @@ if test "$solaris" = "yes" ; then echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install" exit 1 fi - soltexi2html=`which texi2html 2> /dev/null | /usr/bin/grep -v "no texi2html in"` - if test -z "$soltexi2html" ; then - echo "Error: No path includes texi2html." - if test -f /usr/sfw/bin/texi2html ; then - echo "Add /usr/sfw/bin to your path and rerun configure" - else - echo "Add the directory holding the texi2html to your path and rerun configure" - fi - exit 1 - fi sol_ar=`which ar 2> /dev/null | /usr/bin/grep -v "no ar in"` if test -z "$sol_ar" ; then echo "Error: No path includes ar" @@ -492,7 +482,7 @@ fi # cross compilation fi # -z $sdl # Check if tools are available to build documentation. -if [ ! -z `which texi2html` ] && [ ! -z `which pod2man` ]; then +if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then build_docs="yes" fi -- 2.7.4