Fix for Solaris 64bit

diff --git a/ChangeLog b/ChangeLog
index 00bf9758614485cf799372cb299777229efcdfd8..c8e04e6fed66b8c68d3682265de26378015ae076 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.23
   * Added strings.h header for Solaris 9
+  * Solaris 64bit fix.
 
 0.22 Mon Jul 14 09:24:11 PDT 2008
   * Fix where master key was no being checked for "bad key"

diff --git a/configure.ac b/configure.ac
index 8215965b634b26ee11c3c04e46cd306ff52570b3..5c9ed3dfcc4f5ac21343351e109cf59a71f882df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,20 +51,21 @@ AC_LANG_CPLUSPLUS
 
 sinclude(config/debug.m4)
 sinclude(config/dtrace.m4)
+sinclude(config/64bit.m4)
 
 # We only support GCC and Sun's forte at the moment
 if test "$GCC" = "yes"
 then
   if test "$ENABLE_DEBUG" = "yes"
   then
-    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG"
+    CFLAGS="-Wall -ggdb -DMEMCACHED_INTERNAL -DHAVE_DEBUG $CFLAGS"
   else
-    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL "
+    CFLAGS="-Wall -O3 -DMEMCACHED_INTERNAL $CFLAGS"
   fi
 else
-  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ -fast -m64"
-  LDFLAGS="-lsocket -lnsl"
-  DTRACEFLAGS="-64"
+  CFLAGS="-Xa -xstrconst -mt -D_FORTEC_ $CFLAGS"
+  LDFLAGS="-lsocket -lnsl $LDFLAGS"
+  DTRACEFLAGS="$DTRACEFLAGS"
 fi
 
 AC_C_CONST