From edcb274440461468879d0420f46432005c0baf0c Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 9 Jan 2011 22:08:40 -0800
Subject: [PATCH] Updated pandora-build files to version 0.171

---
 .quickly                |  2 +-
 m4/pandora_canonical.m4 |  2 +-
 m4/pandora_vc_build.m4  | 11 +++++++++--
 m4/pandora_warnings.m4  | 11 +++++++----
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.quickly b/.quickly
index 424a3768..398e2ab6 100644
--- a/.quickly
+++ b/.quickly
@@ -2,4 +2,4 @@ project = libmemcached
 version = 0.4.2
 template = pandora-build
 project-type = library
-pandora-version = 0.167
+pandora-version = 0.171
diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 6768783b..fe5a944d 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.167])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.171])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],
diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4
index 9ae485a6..5e7ed652 100644
--- a/m4/pandora_vc_build.m4
+++ b/m4/pandora_vc_build.m4
@@ -36,7 +36,14 @@ AC_DEFUN([PANDORA_TEST_VC_DIR],[
 ])
 
 AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
-  m4_syscmd(PANDORA_TEST_VC_DIR [
+  m4_syscmd(PANDORA_TEST_VC_DIR
+    m4_if(PCT_NO_VC_CHANGELOG,yes,[
+      vc_changelog=no
+      ],[
+      vc_changelog=yes
+      ])
+  
+    [
 
     PANDORA_RELEASE_DATE=`date +%Y.%m`
     PANDORA_RELEASE_NODOTS_DATE=`date +%Y%m`
@@ -53,7 +60,7 @@ AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
         PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
         PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
         PANDORA_VC_BRANCH=`bzr nick`
-        if test "x${vcs_changelog}" = "xyes"; then
+        if test "x${vc_changelog}" = "xyes"; then
           bzr log --gnu > ChangeLog
         fi
       fi
diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4
index 99f40c93..6d82df1d 100644
--- a/m4/pandora_warnings.m4
+++ b/m4/pandora_warnings.m4
@@ -371,7 +371,7 @@ inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
       dnl TODO: Figure out a better way to deal with this:
       PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}"
       NO_WERROR="-Wno-error"
-      INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align"
+      PERMISSIVE_WARNINGS="-Wno-error -Wno-unused-function -fpermissive"
       AS_IF([test "$host_vendor" = "apple"],[
         BOOSTSKIP_WARNINGS="-Wno-uninitialized"
       ])
@@ -405,10 +405,10 @@ inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
 
 
     m4_if(PW_LESS_WARNINGS, [no],[
-      CC_WARNINGS_FULL="-erroff=E_INTEGER_OVERFLOW_DETECTED${W_PASTE_RESULT}"
+      CC_WARNINGS_FULL="-erroff=E_STATEMENT_NOT_REACHED,E_INTEGER_OVERFLOW_DETECTED${W_PASTE_RESULT}"
       CXX_WARNINGS_FULL="-erroff=inllargeuse"
     ],[
-      CC_WARNINGS_FULL="-erroff=E_ATTRIBUTE_NOT_VAR"
+      CC_WARNINGS_FULL="-erroff=E_ATTRIBUTE_NOT_VAR,E_STATEMENT_NOT_REACHED"
       CXX_WARNINGS_FULL="-erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1,signextwarn,inllargeint"
     ])
 
@@ -416,6 +416,8 @@ inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
     CXX_WARNINGS="+w +w2 -xwe -xport64 -errtags=yes ${CXX_WARNINGS_FULL} ${W_FAIL}"
     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"
+    PERMISSIVE_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1,signextwarn,inllargeint,hidef,wvarhidenmem,notused,badargtype2w,wunreachable"
+    INNOBASE_SKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1,signextwarn,partinit,notused,badargtype2w,wbadinit,wunreachable"
     NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED"
     NO_WERROR="-errwarn=%none"
 
@@ -429,8 +431,9 @@ 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(BOOSTSKIP_WARNINGS)
+  AC_SUBST(PERMISSIVE_WARNINGS)
   AC_SUBST(NO_WERROR)
   AC_SUBST([GCOV_LIBS])
 
-- 
2.30.2