From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 16 Jun 2009 15:35:04 +0000 (-0700)
Subject: Merged from me.
X-Git-Tag: 0.31~14^2~7^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=35ea8bcfbe3002ad02773a2398b3683a63654d17;p=m6w6%2Flibmemcached

Merged from me.
---

35ea8bcfbe3002ad02773a2398b3683a63654d17
diff --cc configure.ac
index f83c9e06,81602f82..27171ab3
--- a/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