X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_64bit.m4;h=5d9983b84689e5eec93d78e492b4ff15f3314acd;hb=21f850c451cb7db8a0085ddcc892290ecac859eb;hp=44ec4c0064dd0a26b9b6893bf529ce452da76f52;hpb=cb05d3311de7e7ca578bafb116f3c8a56b9f0aa8;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_64bit.m4 b/m4/pandora_64bit.m4
index 44ec4c00..5d9983b8 100644
--- a/m4/pandora_64bit.m4
+++ b/m4/pandora_64bit.m4
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+dnl  Copyright (C) 2009 Sun Microsystems, Inc.
+dnl This file is free software; Sun Microsystems, Inc.
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -7,40 +7,47 @@ dnl ---------------------------------------------------------------------------
 dnl Macro: PANDORA_64BIT
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([PANDORA_64BIT],[
+  AC_BEFORE([$0], [AC_LIB_PREFIX])
 
-  AC_ARG_ENABLE([64bit],[
-    AS_HELP_STRING([--disable-64bit],
+  AC_ARG_ENABLE([64bit],
+    [AS_HELP_STRING([--disable-64bit],
       [Build 64 bit binary @<:@default=on@:>@])],
-             [ac_enable_64bit="$enableval"],
-             [ac_enable_64bit="yes"])
+    [ac_enable_64bit="$enableval"],
+    [ac_enable_64bit="yes"])
 
   AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
   AS_IF([test "x$ISAINFO" != "xno"],
         [isainfo_b=`${ISAINFO} -b`],
         [isainfo_b="x"])
 
-  AS_IF([test "$isainfo_b" != "x"],[
+  AS_IF([test "$isainfo_b" != "x" -a "$isainfo_b" != "32"],[
 
-    isainfo_k=`${ISAINFO} -k` 
-    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_k}"
+    isainfo_k=`${ISAINFO} -k`
+    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}"
 
-    AS_IF([test "x${ac_cv_env_CPPFLAGS_set}" = "x"],[
-      CPPFLAGS="-I/usr/local ${CPPFLAGS}"
-    ])
+    AS_IF([test "x$ac_enable_64bit" = "xyes"],[
 
-    AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[
-      LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
-    ])
+      AS_IF([test "x${ac_cv_env_LDFLAGS_set}" = "x"],[
+        LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
+      ])
 
-    AS_IF([test "x$ac_enable_64bit" = "xyes"],[
       AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[
-       dnl The user hasn't overridden the default libdir, so we'll 
+       dnl The user hasn't overridden the default libdir, so we'll
        dnl the dir suffix to match solaris 32/64-bit policy
        libdir="${libdir}/${isainfo_k}"
       ])
 
-      CPPFLAGS="-m64 ${CPPFLAGS}"
-      LDFLAGS="-m64 ${LDFLAGS}"
+      AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],[
+        CFLAGS="${CFLAGS} -m64"
+        ac_cv_env_CFLAGS_set=set
+        ac_cv_env_CFLAGS_value='-m64'
+      ])
+      AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
+        CXXFLAGS="${CXXFLAGS} -m64"
+        ac_cv_env_CXXFLAGS_set=set
+        ac_cv_env_CXXFLAGS_value='-m64'
+      ])
+
       AS_IF([test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes"],[
         AM_CFLAGS="-xmemalign=8s ${AM_CFLAGS}"
         AM_CXXFLAGS="-xmemalign=8s ${AM_CXXFLAGS}"