Merged in pandora-build changes from gearman.

[m6w6/libmemcached] / m4 / pandora_have_better_malloc.m4

diff --git a/m4/pandora_have_better_malloc.m4 b/m4/pandora_have_better_malloc.m4
index 4563e3b5496298f6f27464c7d998e7098152ea12..ac70019795fbc91668e8311bf33ee0f3534c43df 100644 (file)
--- a/m4/pandora_have_better_malloc.m4
+++ b/m4/pandora_have_better_malloc.m4
@@ -11,8 +11,16 @@ AC_DEFUN([PANDORA_HAVE_BETTER_MALLOC],[
   AC_ARG_ENABLE([umem],
     [AS_HELP_STRING([--enable-umem],
        [Enable linking with libumem @<:@default=off@:>@])],
-    [ac_enable_umem="$enableval"],
-    [ac_enable_umem="no"])
+    [ac_enable_umem="$enableval"],[
+      case "$target_os" in
+        *solaris*)
+          ac_enable_umem="yes"
+        ;;
+        *)
+          ac_enable_umem="no"
+        ;;
+      esac
+    ])
   
   AC_ARG_ENABLE([tcmalloc],
     [AS_HELP_STRING([--enable-tcmalloc],
@@ -52,3 +60,8 @@ AC_DEFUN([PANDORA_HAVE_BETTER_MALLOC],[
   AC_SUBST([BETTER_MALLOC_LIBS])
 
 ])
+
+AC_DEFUN([PANDORA_USE_BETTER_MALLOC],[
+  AC_REQUIRE([PANDORA_HAVE_BETTER_MALLOC])
+  LIBS="${LIBS} ${BETTER_MALLOC_LIBS}"
+])
\ No newline at end of file