X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsvr5.sh;h=87118f45503ca76117b9460332a4d3d6e63b0463;hb=e853d2264b77e2bdc0758f8ab38e819629763e81;hp=47f7aff2c12b97a1c6799561d49a9814c3bc700a;hpb=a4349beab060ae6e975b158829344a74589cf57b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/svr5.sh b/hints/svr5.sh
index 47f7aff..87118f4 100644
--- a/hints/svr5.sh
+++ b/hints/svr5.sh
@@ -1,4 +1,4 @@
-# svr5 hints, System V Release 5.x (UnixWare 7)
+# svr5 hints, System V Release 5.x (UnixWare 7, OpenUNIX 8)
 # mods after mail fm Andy Dougherty
 # Reworked by hops@sco.com Sept/Oct 1999 for UW7.1 platform support 
 #   Boyd Gerber, gerberb@zenez.com 1999/09/21 for threads support.
@@ -12,7 +12,7 @@ case "$cc" in
     #  "$gccversion" not set yet
     if [ "X$gccversion" = "X" ]; then
 	# Done too late in Configure if hinted
-	gccversion=`$cc --version | sed 's/.*(GCC) *//'`
+	gccversion=`$cc -dumpversion`
     fi
     case $gccversion in
     *2.95*)
@@ -48,14 +48,15 @@ esac
 	want_dbm='yes'		# use dbm if can find library in /usr/local/lib
 	want_gdbm='yes'		# use gdbm if can find library in /usr/local/lib
 	want_udk70=''		# link with old static libc pieces
-            # link with udk70 if building on 7.1 abd want resulting binary 
+            # link with udk70 if building on 7.1 and want resulting binary
             # to run on uw7.0* - it will link in referenced static symbols 
             # of libc that are (now) in the shared libc.so on 7.1 but were 
             # not there in 7.0.
             # There are still scenarios where this is still insufficient so 
             # overall it is preferable to get ptf7051e 
             #   ftp://ftp.sco.com/SLS/ptf7051e.Z
-            # installed on any/all 7.0 systems and leave the above unset.
+            # installed on any/all 7.0 systems and leave the above unset
+            # (sadly this is unavailable as of 2009-08-03)
 
 if [ "$want_ucb" ] ; then 
     ldflags= '-L/usr/ucblib'
@@ -96,14 +97,13 @@ d_index='undef' d_killpg='undef' d_getprior='undef' d_setprior='undef'
 d_setlinebuf='undef' 
 d_setregid='undef' d_setreuid='undef'  # -- in /usr/lib/libc.so.1
 
-
 # Broken C-Shell tests (Thanks to Tye McQueen):
 # The OS-specific checks may be obsoleted by the this generic test.
 	sh_cnt=`sh -c 'echo /*' | wc -c`
 	csh_cnt=`csh -f -c 'glob /*' 2>/dev/null | wc -c`
 	csh_cnt=`expr 1 + $csh_cnt`
 if [ "$sh_cnt" -ne "$csh_cnt" ]; then
-    echo "You're csh has a broken 'glob', disabling..." >&2
+    echo "Your csh has a broken 'glob', disabling..." >&2
     d_csh='undef'
 fi
 
@@ -116,9 +116,9 @@ fi
 	uw_ver=`uname -v`
 	uw_isuw=`uname -s 2>&1`
 
-if [ "$uw_isuw" = "UnixWare" ]; then
+if [ "$uw_isuw" = "UnixWare" -o "$uw_isuw" = "OpenUNIX" ]; then
    case $uw_ver in
-   7.1*)
+   8.*|7.1*)
 	d_csh='undef'
 	d_memcpy='define'
 	d_memset='define'
@@ -160,8 +160,10 @@ fi
 # lddlflags : must tell the linker to output a shared library
 
 # use shared perl lib if the user doesn't choose otherwise
-if test "x$useshrplib" = "x"; then
-    useshrplib='true'
+if test "$uw_isuw" != "OpenUNIX"; then
+    if test "x$useshrplib" = "x"; then
+	useshrplib='true'
+    fi
 fi
 
 case "$cc" in
@@ -188,7 +190,7 @@ case "$usethreads" in
 $define|true|[yY]*)
         ccflags="$ccflags"
         shift
-        libswanted="$*"
+        libswanted="$libswanted $*"
   case "$cc" in
        *gcc*)
            ccflags="-D_REENTRANT $ccflags -fpic -pthread"