From 4c23dcdab4f9c9941eb245bda2ff65371fca13d7 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 10 Jan 2011 11:46:18 -0800
Subject: [PATCH] Fixed unittests and vc-changelog.

---
 .bzrignore           | 1 +
 configure.ac         | 2 +-
 unittests/include.am | 2 +-
 unittests/strings.cc | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index d7c41d0e..0ccaac97 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -185,3 +185,4 @@ tests/testhashkit
 tests/testplus
 tests/testudp
 unittests/unittests
+config/top.h
diff --git a/configure.ac b/configure.ac
index 379466df..8d55fa90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([libmemcached],[0.44],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 
-PANDORA_CANONICAL_TARGET
+PANDORA_CANONICAL_TARGET(no-vc-changelog)
 
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
diff --git a/unittests/include.am b/unittests/include.am
index 6c217208..c1443418 100644
--- a/unittests/include.am
+++ b/unittests/include.am
@@ -10,7 +10,7 @@ unittests_unittests_SOURCES= \
 			     unittests/main.cc \
 			     unittests/strings.cc
 
-unittests_unittest_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR}
+unittests_unittests_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR} ${NO_EFF_CXX}
 unittests_unittests_LDADD= \
 			   tests/libserver.la \
 			   libmemcached/libmemcachedinternal.la \
diff --git a/unittests/strings.cc b/unittests/strings.cc
index 921fe876..8728926b 100644
--- a/unittests/strings.cc
+++ b/unittests/strings.cc
@@ -8,9 +8,6 @@
 
 #include "config.h"
 
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
-
 #include <gtest/gtest.h>
 
 #include <libmemcached/common.h>
-- 
2.30.2