From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 13 Jan 2010 19:21:11 +0000 (-0800)
Subject: Added LIBM link-line.
X-Git-Tag: 0.40~121^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=4464b734d5e88857eeb05b681dcfb43f5c8842a2;p=m6w6%2Flibmemcached

Added LIBM link-line.
---

diff --git a/clients/include.am b/clients/include.am
index 1d09efc3..cc734ca7 100644
--- 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 b9b3e455..4740e1a4 100644
--- 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 ac700197..6f46ee9a 100644
--- 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 c28b2f0c..1317ee9d 100644
--- 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"])