Updated to latest pandora-build. Removed the .ver scripts to be consistent with other...

[awesomized/libmemcached] / m4 / pandora_drizzle_build.m4

diff --git a/m4/pandora_drizzle_build.m4 b/m4/pandora_drizzle_build.m4
index bcec7f71bad7fc713a92c5a98c3093916597ab35..35f27161ff0709a1de68b1d9ea9ae35e81d50664 100644 (file)
--- a/m4/pandora_drizzle_build.m4
+++ b/m4/pandora_drizzle_build.m4
@@ -10,10 +10,7 @@ dnl are set.
 AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
 
   dnl We need to turn on our CXXFLAGS to make sure it shows up correctly
-  save_CXXFLAGS="${CXXFLAGS}"
-  CXXFLAGS="${CXXFLAGS} ${AM_CXXFLAGS}"
   PANDORA_CXX_STL_HASH
-  CXXFLAGS="${save_CXXFLAGS}"
 
   PANDORA_CXX_CSTDINT
   PANDORA_CXX_CINTTYPES
@@ -39,7 +36,7 @@ AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
   AC_HEADER_SYS_WAIT
   AC_HEADER_STDBOOL
 
-  AC_CHECK_HEADERS(sys/fpu.h fpu_control.h ieeefp.h)
+  AC_CHECK_HEADERS(sys/types.h sys/fpu.h fpu_control.h ieeefp.h)
   AC_CHECK_HEADERS(select.h sys/select.h)
   AC_CHECK_HEADERS(utime.h sys/utime.h )
   AC_CHECK_HEADERS(synch.h sys/mman.h sys/socket.h)
@@ -70,8 +67,32 @@ AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
     # include <curses.h>
     #endif
   ]])
-  AC_CHECK_TYPES([ulong])
+  AC_CHECK_TYPES([uint, ulong])
 
   PANDORA_CXX_DEMANGLE
 
+  AH_TOP([
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#if defined(i386) && !defined(__i386__)
+#define __i386__
+#endif
+
+  ])
+  AH_BOTTOM([
+#if defined(__cplusplus)
+# include CSTDINT_H
+# include CINTTYPES_H
+#else
+# include <stdint.h>
+# include <inttypes.h>
+#endif
+
+#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
+typedef unsigned long int ulong;
+#endif
+
+#endif /* __CONFIG_H__ */
+  ])
 ])