Merged from me.

diff --cc configure.ac
index f83c9e064ed419b69617116c0170f5e36d2050f6,81602f828161db903d76a8a2a0481b040df78ca3..27171ab38501e37030df3522ee72894a76eb81bf
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -116,16 -111,12 +116,16 @@@ the
  fi
  if test "x$SUNCC" = "xyes"
  then
 -   CFLAGS="-g -mt ${CFLAGS}"
 -   CXXFLAGS="-g -mt -xlang=c99 ${CXXFLAGS}"
 -   OPTIMIZE_CFLAGS="-xO4 -xlibmil -xdepend -Xa -xstrconst"
 +  CFLAGS="-g -mt ${CFLAGS}"
 +  CXXFLAGS="-g -mt -xlang=c99 ${CXXFLAGS}"
 +
 +  OPTIMIZE_FLAGS="-xO4 -xlibmil -xdepend -xbuiltin -lmopt"
 +  OPTIMIZE_CFLAGS="${OPTIMIZE_FLAGS} -Xa -xstrconst"
 +  OPTIMIZE_CXXFLAGS="${OPTIMIZE_FLAGS}"
 +
  fi
  
- SOLARIS_64BIT
+ ENABLE_64BIT
  
  #--------------------------------------------------------------------
  # Check for libpthread