Added LIBM link-line.

diff --git a/clients/include.am b/clients/include.am
index 1d09efc3d4ddf0026e9e7b1c8b85a700e11b6eb2..cc734ca7137dbe7fe49b4564672d1521dced8222 100644 (file)
--- a/clients/include.am
+++ b/clients/include.am
@@ -3,6 +3,7 @@
 # All paths should be given relative to the root
 
 CLIENTS_LDADDS = \
+       $(LIBM) \
        clients/libutilities.la \
        libmemcached/libmemcached.la
 
@@ -69,7 +70,7 @@ clients_memslap_SOURCES= \
                clients/ms_stats.c \
                clients/ms_task.c \
                clients/ms_thread.c
-clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS) $(LIBM)
+clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
 
 clients_memcapable_SOURCES= clients/memcapable.c
 if BUILD_BYTEORDER

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index b9b3e455e6b889db2e4d21e720c11eda46d739c2..4740e1a4954e320eddf1ca6c9279c3ea928ab957 100644 (file)
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.94])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.95])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],

diff --git a/m4/pandora_have_better_malloc.m4 b/m4/pandora_have_better_malloc.m4
index ac70019795fbc91668e8311bf33ee0f3534c43df..6f46ee9ae802b5308d193cac3cc28ba3539da4ed 100644 (file)
--- a/m4/pandora_have_better_malloc.m4
+++ b/m4/pandora_have_better_malloc.m4
@@ -64,4 +64,5 @@ AC_DEFUN([PANDORA_HAVE_BETTER_MALLOC],[
 AC_DEFUN([PANDORA_USE_BETTER_MALLOC],[
   AC_REQUIRE([PANDORA_HAVE_BETTER_MALLOC])
   LIBS="${LIBS} ${BETTER_MALLOC_LIBS}"
-])
\ No newline at end of file
+])
+

diff --git a/m4/pandora_have_libdl.m4 b/m4/pandora_have_libdl.m4
index c28b2f0cb505576b4e5189903ad5906014584b5e..1317ee9dac096d9ae85b350bb110a2128e6053dd 100644 (file)
--- a/m4/pandora_have_libdl.m4
+++ b/m4/pandora_have_libdl.m4
@@ -15,7 +15,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBDL],[
   AC_CHECK_LIB(dl,dlopen)
   AC_CHECK_FUNCS(dlopen)
   LIBDL_LIBS="$LIBS"
-  LIBS="$my_save_LIBS"
+  LIBS="${save_LIBS}"
   AC_SUBST(LIBDL_LIBS)
 
   AM_CONDITIONAL(HAVE_LIBDL, [test "x${ac_cv_func_dlopen}" = "xyes"])