From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 13 Jun 2010 16:24:20 +0000 (-0700)
Subject: Updated pandora-build files to version 0.134
X-Git-Tag: 0.41~24^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=c1a8ae2ab7557b9c167e022182b810d3e2cd43ce;p=m6w6%2Flibmemcached

Updated pandora-build files to version 0.134
---

diff --git a/.quickly b/.quickly
index c33726ff..b7c3fe31 100644
--- a/.quickly
+++ b/.quickly
@@ -2,4 +2,4 @@ project = libmemcached
 version = 0.4.2
 template = pandora-build
 project-type = library
-pandora-version = 0.131
+pandora-version = 0.134
diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index ed3b0642..8443bf80 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.131])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.134])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],
@@ -77,9 +77,9 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   AC_CANONICAL_TARGET
   
   m4_if(PCT_DONT_SUPRESS_INCLUDE,yes,[
-    AM_INIT_AUTOMAKE(-Wall -Werror subdir-objects foreign)
+    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability subdir-objects foreign)
   ],[
-    AM_INIT_AUTOMAKE(-Wall -Werror nostdinc subdir-objects foreign)
+    AM_INIT_AUTOMAKE(-Wall -Werror -Wno-portability nostdinc subdir-objects foreign)
   ])
 
   m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -177,6 +177,8 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   ])
 
   AC_CHECK_LIBM
+  dnl Bug on FreeBSD - LIBM check doesn't set the damn variable
+  AC_SUBST([LIBM])
   
   AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
   AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])
diff --git a/m4/pandora_have_libhashkit.m4 b/m4/pandora_have_libhashkit.m4
index a10c9aca..4e7965e5 100644
--- a/m4/pandora_have_libhashkit.m4
+++ b/m4/pandora_have_libhashkit.m4
@@ -20,7 +20,8 @@ AC_DEFUN([_PANDORA_SEARCH_LIBHASHKIT],[
     AC_LIB_HAVE_LINKFLAGS(hashkit,,[
       #include <libhashkit/hashkit.h>
     ],[
-      hashkit_st *kit = hashkit_create(NULL);
+      hashkit_st foo;
+      hashkit_st *kit = hashkit_create(&foo);
       hashkit_free(kit);
     ])
   ],[
diff --git a/m4/pandora_have_libpqxx.m4 b/m4/pandora_have_libpqxx.m4
new file mode 100644
index 00000000..30b94368
--- /dev/null
+++ b/m4/pandora_have_libpqxx.m4
@@ -0,0 +1,44 @@
+dnl  Copyright (C) 2010 Padraig O'Sullivan
+dnl This file is free software; 
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([_PANDORA_SEARCH_LIBPQXX],[
+  AC_REQUIRE([AC_LIB_PREFIX])
+
+  dnl --------------------------------------------------------------------
+  dnl  Check for libpqxx
+  dnl --------------------------------------------------------------------
+
+  AC_ARG_ENABLE([libpqxx],
+    [AS_HELP_STRING([--disable-libpqxx],
+      [Build with libpqxx support @<:@default=on@:>@])],
+    [ac_enable_libpqxx="$enableval"],
+    [ac_enable_libpqxx="yes"])
+
+  AS_IF([test "x$ac_enable_libpqxx" = "xyes"],[
+    AC_LANG_PUSH([C++])
+    AC_LIB_HAVE_LINKFLAGS(pqxx,,[
+      #include <pqxx/pqxx>
+    ],[
+       pqxx::connection conn("dbname=test");
+    ])
+    AC_LANG_POP()
+  ],[
+    ac_cv_libpqxx="no"
+  ])
+  
+  AM_CONDITIONAL(HAVE_LIBPQXX, [test "x${ac_cv_libpqxx}" = "xyes"])
+  
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBPQXX],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBPQXX])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBPQXX],[
+  AC_REQUIRE([PANDORA_HAVE_LIBPQXX])
+  AS_IF([test "x$ac_cv_libpqxx" = "xno"],[
+      AC_MSG_ERROR([libpqxx is required for ${PACKAGE}])
+  ])
+])
diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4
index 178a867a..1731870d 100644
--- a/m4/pandora_warnings.m4
+++ b/m4/pandora_warnings.m4
@@ -293,7 +293,9 @@ inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
       PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}"
       NO_WERROR="-Wno-error"
       INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align"
-      
+      AS_IF([test "$host_vendor" = "apple"],[
+        BOOSTSKIP_WARNINGS="-Wno-uninitialized"
+      ])
     ])
   ])
 
@@ -334,6 +336,7 @@ inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
     CC_WARNINGS="-v -errtags=yes ${W_FAIL} ${CC_WARNINGS_FULL} ${CFLAG_VISIBILITY}"
     CXX_WARNINGS="+w +w2 -xwe -xport64 -errtags=yes ${CXX_WARNINGS_FULL} ${W_FAIL} ${CFLAG_VISIBILITY}"
     PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1,signextwarn,partinit,notused,badargtype2w,wbadinit"
+    BOOSTSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1,signextwarn,inllargeint,hidef,wvarhidenmem"
     NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED"
     NO_WERROR="-errwarn=%none"
 
@@ -347,6 +350,7 @@ inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
   AC_SUBST(NO_EFF_CXX)
   AC_SUBST(NO_OLD_STYLE_CAST)
   AC_SUBST(PROTOSKIP_WARNINGS)
+  AC_SUBST(BOOSTSKIP_WARNINGS)
   AC_SUBST(INNOBASE_SKIP_WARNINGS)
   AC_SUBST(NO_WERROR)
   AC_SUBST([GCOV_LIBS])