Merge lp:~mordred/gearmand/pandora-build into lp:gearmand/1.0

[Monty Taylor]

[Monty Taylor (mordred)]

Latest pandora.

[lp:~mordred/gearmand/pandora-build]

314. By Brian Aker <brian@gaz> on 2010-01-19

Merge Monty

315. By Brian Aker <brian@gaz> on 2010-01-19

Merge

=== modified file 'm4/pandora_canonical.m4'
--- m4/pandora_canonical.m4	2009-12-30 18:08:00 +0000
+++ m4/pandora_canonical.m4	2010-01-13 10:51:14 +0000
@@ -4,13 +4,23 @@
 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.91])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.95])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
+  AC_ARG_ENABLE([fat-binaries],
+    [AS_HELP_STRING([--enable-fat-binaries],
+      [Enable fat binary support on OSX @<:@default=off@:>@])],
+    [ac_enable_fat_binaries="$enableval"],
+    [ac_enable_fat_binaries="no"])
+
   dnl Force dependency tracking on for Sun Studio builds
   AS_IF([test "x${enable_dependency_tracking}" = "x"],[
     enable_dependency_tracking=yes
   ])
+  dnl If we're building OSX Fat Binaries, we have to turn off -M options
+  AS_IF([test "x${ac_enable_fat_binaries}" = "xyes"],[
+    enable_dependency_tracking=no
+  ])
 ])
 
 dnl The standard setup for how we build Pandora projects
@@ -232,5 +242,6 @@
   AC_SUBST([AM_CFLAGS])
   AC_SUBST([AM_CXXFLAGS])
   AC_SUBST([AM_CPPFLAGS])
+  AC_SUBST([AM_LDFLAGS])
 
 ])
 
=== modified file 'm4/pandora_have_better_malloc.m4'
--- m4/pandora_have_better_malloc.m4	2009-12-18 19:25:00 +0000
+++ m4/pandora_have_better_malloc.m4	2010-01-13 10:51:14 +0000
@@ -64,4 +64,5 @@
 AC_DEFUN([PANDORA_USE_BETTER_MALLOC],[
   AC_REQUIRE([PANDORA_HAVE_BETTER_MALLOC])
   LIBS="${LIBS} ${BETTER_MALLOC_LIBS}"
-])
 \ No newline at end of file
+])
+
 
=== modified file 'm4/pandora_have_libdl.m4'
--- m4/pandora_have_libdl.m4	2009-12-18 18:02:39 +0000
+++ m4/pandora_have_libdl.m4	2010-01-13 10:51:14 +0000
@@ -15,7 +15,7 @@
   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"])
 
=== modified file 'm4/pandora_have_libmemcached.m4'
--- m4/pandora_have_libmemcached.m4	2009-12-18 19:25:00 +0000
+++ m4/pandora_have_libmemcached.m4	2010-01-13 10:51:14 +0000
@@ -24,10 +24,28 @@
       memcached_dump_func *df;
       memcached_lib_version();
     ])
+    AC_LIB_HAVE_LINKFLAGS(memcachedprotocol,,[
+      #include <libmemcached/protocol_handler.h>
+    ],[
+      struct memcached_protocol_st *protocol_handle;
+      protocol_handle= memcached_protocol_create_instance();
+    ])
   ],[
     ac_cv_libmemcached="no"
   ])
   
+  AC_CACHE_CHECK([if libmemcached has memcached_server_fn],
+    [pandora_cv_libmemcached_server_fn],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <libmemcached/memcached.h>
+memcached_server_fn callbacks[1];
+    ]])],
+    [pandora_cv_libmemcached_server_fn=yes],
+    [pandora_cv_libmemcached_server_fn=no])])
+  AS_IF([test "x$pandora_cv_libmemcached_server_fn" = "xyes"],[
+    AC_DEFINE([HAVE_MEMCACHED_SERVER_FN],[1],[If we have the new memcached_server_fn typedef])
+  ])
+
   AM_CONDITIONAL(HAVE_LIBMEMCACHED, [test "x${ac_cv_libmemcached}" = "xyes"])
   
 ])
@@ -41,3 +59,4 @@
   AS_IF([test x$ac_cv_libmemcached = xno],
       AC_MSG_ERROR([libmemcached is required for ${PACKAGE}]))
 ])
+
 
=== modified file 'm4/pandora_platform.m4'
--- m4/pandora_platform.m4	2009-09-29 04:30:01 +0000
+++ m4/pandora_platform.m4	2010-01-13 10:51:14 +0000
@@ -74,4 +74,12 @@
       [Cause Sun Studio to not be quite so strict with standards conflicts])
   ])
 
+  AS_IF([test "x$TARGET_OSX" = "xtrue"],[
+    AS_IF([test "x$ac_enable_fat_binaries" = "xyes"],[
+      AM_CFLAGS="-arch i386 -arch x86_64 -arch ppc"
+      AM_CXXFLAGS="-arch i386 -arch x86_64 -arch ppc"
+      AM_LDFLAGS="-arch i386 -arch x86_64 -arch ppc"
+    ])
+  ])
+
 ])
 
=== added file 'm4/pandora_print_callstack.m4'
--- m4/pandora_print_callstack.m4	1970-01-01 00:00:00 +0000
+++ m4/pandora_print_callstack.m4	2010-01-13 10:51:14 +0000
@@ -0,0 +1,61 @@
+dnl  Copyright (C) 2009 Sun Microsystems
+dnl This file is free software; Sun Microsystems
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Try to define a macro to dump the current callstack.
+AC_DEFUN([PANDORA_PRINT_CALLSTACK],[
+  AC_CHECK_HEADERS([ucontext.h])
+  AS_IF([test "x$ac_cv_header_ucontext_h" = "xyes"],
+  	[ AC_CHECK_FUNCS([printstack]) ])
+
+
+  AS_IF([ test "x$ac_cv_func_printstack" != "xyes"],
+        [ AC_CHECK_HEADERS([dlfcn.h])
+          AC_CHECK_HEADERS([execinfo.h])
+          AC_CHECK_FUNCS([backtrace])
+          AC_CHECK_FUNCS([backtrace_symbols_fd]) ])
+
+  AH_BOTTOM([
+#ifdef __cplusplus
+#include <cstdio>
+#define PANDORA_PRINTSTACK_STD_PREFIX std::
+#else
+#include <stdio.h>
+#define PANDORA_PRINTSTACK_STD_PREFIX
+#endif
+
+#if defined(HAVE_UCONTEXT_H) && defined(HAVE_PRINTSTACK)
+#include <ucontext.h>
+#define pandora_print_callstack(a) \
+printstack(PANDORA_PRINTSTACK_STD_PREFIX fileno(a))
+#elif defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS_FD)
+
+#include <execinfo.h>
+
+#define pandora_print_callstack(a) \
+{ \
+  void *stack[100];  \
+  int depth = backtrace(stack, 100); \
+  backtrace_symbols_fd(stack, depth, PANDORA_PRINTSTACK_STD_PREFIX fileno(a)); \
+}
+#elif defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS) && !defined(HAVE_BACKTRACE_SYMBOLS_FD)
+
+#include <execinfo.h>
+
+#define pandora_print_callstack(a) \
+{ \
+  void *stack[100];  \
+  int depth= backtrace(stack, 100); \
+  char **symbol= backtrace_symbols(stack, depth); \
+  for (int x= 0; x < size; ++x) \
+    PANDORA_PRINTSTACK_STD_PREFIX fprintf(a, "%s\n", symbol[x]); \
+}
+#else
+#define pandora_print_callstack(a) \
+    PANDORA_PRINTSTACK_STD_PREFIX fprintf(a, \
+      "Stackdump not supported for this platform\n");
+#endif
+  ])
+
+])
 
=== modified file 'm4/pandora_visibility.m4'
--- m4/pandora_visibility.m4	2009-12-30 08:42:51 +0000
+++ m4/pandora_visibility.m4	2010-01-13 10:51:14 +0000
@@ -1,4 +1,5 @@
 dnl Copyright (C) 2005, 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2009 Monty Taylor
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.