projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Trond
[awesomized/libmemcached]
/
m4
/
pandora_drizzle_build.m4
diff --git
a/m4/pandora_drizzle_build.m4
b/m4/pandora_drizzle_build.m4
index 35f27161ff0709a1de68b1d9ea9ae35e81d50664..2c7a321d512b5bafdc78b4e6f5764ce451382fda 100644
(file)
--- a/
m4/pandora_drizzle_build.m4
+++ b/
m4/pandora_drizzle_build.m4
@@
-9,8
+9,7
@@
dnl are set.
AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
- dnl We need to turn on our CXXFLAGS to make sure it shows up correctly
- PANDORA_CXX_STL_HASH
+ PANDORA_HAVE_CXX_UNORDERED
PANDORA_CXX_CSTDINT
PANDORA_CXX_CINTTYPES
PANDORA_CXX_CSTDINT
PANDORA_CXX_CINTTYPES
@@
-70,16
+69,31
@@
AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
AC_CHECK_TYPES([uint, ulong])
PANDORA_CXX_DEMANGLE
AC_CHECK_TYPES([uint, ulong])
PANDORA_CXX_DEMANGLE
+ PANDORA_REQUIRE_BOOST([1.38])
+ PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS
+
AH_TOP([
#ifndef __CONFIG_H__
#define __CONFIG_H__
AH_TOP([
#ifndef __CONFIG_H__
#define __CONFIG_H__
+#include "config/top.h"
+])
+ mkdir -p config
+ cat > config/top.h.stamp <<EOF_CONFIG_TOP
+
#if defined(i386) && !defined(__i386__)
#define __i386__
#endif
#if defined(i386) && !defined(__i386__)
#define __i386__
#endif
- ])
+#if defined(_FILE_OFFSET_BITS)
+# undef _FILE_OFFSET_BITS
+#endif
+EOF_CONFIG_TOP
+ diff config/top.h.stamp config/top.h >/dev/null 2>&1 || mv config/top.h.stamp config/top.h
+ rm -f config/top.h.stamp
+
+
AH_BOTTOM([
#if defined(__cplusplus)
# include CSTDINT_H
AH_BOTTOM([
#if defined(__cplusplus)
# include CSTDINT_H