Commit 94ac51588972366287fa359a1e7d37b5e08f9bef

Authored by pbrook
1 parent 3598ecb6

Solaris configure hacks.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1858 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 3 additions and 13 deletions
configure
@@ -51,7 +51,7 @@ case "$cpu" in @@ -51,7 +51,7 @@ case "$cpu" in
51 s390) 51 s390)
52 cpu="s390" 52 cpu="s390"
53 ;; 53 ;;
54 - sparc) 54 + sparc|sun4[muv])
55 cpu="sparc" 55 cpu="sparc"
56 ;; 56 ;;
57 sparc64) 57 sparc64)
@@ -296,7 +296,7 @@ cc="${cross_prefix}${cc}" @@ -296,7 +296,7 @@ cc="${cross_prefix}${cc}"
296 ar="${cross_prefix}${ar}" 296 ar="${cross_prefix}${ar}"
297 strip="${cross_prefix}${strip}" 297 strip="${cross_prefix}${strip}"
298 298
299 -if [ -z `which $cc` ] ; then 299 +if [ ! -x "`which $cc`" ] ; then
300 echo "Compiler $cc could not be found" 300 echo "Compiler $cc could not be found"
301 exit 301 exit
302 fi 302 fi
@@ -341,16 +341,6 @@ if test "$solaris" = "yes" ; then @@ -341,16 +341,6 @@ if test "$solaris" = "yes" ; then
341 echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install" 341 echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install"
342 exit 1 342 exit 1
343 fi 343 fi
344 - soltexi2html=`which texi2html 2> /dev/null | /usr/bin/grep -v "no texi2html in"`  
345 - if test -z "$soltexi2html" ; then  
346 - echo "Error: No path includes texi2html."  
347 - if test -f /usr/sfw/bin/texi2html ; then  
348 - echo "Add /usr/sfw/bin to your path and rerun configure"  
349 - else  
350 - echo "Add the directory holding the texi2html to your path and rerun configure"  
351 - fi  
352 - exit 1  
353 - fi  
354 sol_ar=`which ar 2> /dev/null | /usr/bin/grep -v "no ar in"` 344 sol_ar=`which ar 2> /dev/null | /usr/bin/grep -v "no ar in"`
355 if test -z "$sol_ar" ; then 345 if test -z "$sol_ar" ; then
356 echo "Error: No path includes ar" 346 echo "Error: No path includes ar"
@@ -492,7 +482,7 @@ fi # cross compilation @@ -492,7 +482,7 @@ fi # cross compilation
492 fi # -z $sdl 482 fi # -z $sdl
493 483
494 # Check if tools are available to build documentation. 484 # Check if tools are available to build documentation.
495 -if [ ! -z `which texi2html` ] && [ ! -z `which pod2man` ]; then 485 +if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then
496 build_docs="yes" 486 build_docs="yes"
497 fi 487 fi
498 488