1 files changed, 22 insertions, 9 deletions
diff --git a/configure b/configure
index d6bc57a..3143538 100755
--- a/configure
+++ b/configure
@@ -276,15 +276,28 @@ else
             CFLAGS=${CFLAGS-"-O3"}
             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
  SunOS\ 5* | solaris*)
-         LDSHARED=${LDSHARED-"cc -G"}
+         LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
-         case `(uname -m || echo unknown) 2>/dev/null` in
+         SFLAGS=${CFLAGS-"-fast -KPIC -R."}
-         i86*)
+         CFLAGS=${CFLAGS-"-fast"}
-             SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
+         if test $build64 -eq 1; then
-             CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
+             # old versions of SunPRO/Workshop/Studio don't support -m64,
-         *)
+             # but newer ones do.  Check for it.
-             SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
+             flag64=`$CC -flags | egrep -- '^-m64'`
-             CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
+             if test x"$flag64" != x"" ; then
-         esac ;;
+                 CFLAGS="${CFLAGS} -m64"
+                 SFLAGS="${SFLAGS} -m64"
+             else
+                 case `(uname -m || echo unknown) 2>/dev/null` in
+                   i86*)
+                     SFLAGS="$SFLAGS -xarch=amd64"
+                     CFLAGS="$CFLAGS -xarch=amd64" ;;
+                   *)
+                     SFLAGS="$SFLAGS -xarch=v9"
+                     CFLAGS="$CFLAGS -xarch=v9" ;;
+                 esac
+             fi
+         fi
+         ;;
  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
             CFLAGS=${CFLAGS-"-O2"}
             LDSHARED=${LDSHARED-"ld"} ;;