X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_drizzle_build.m4;h=54f946f1cc0d05cd39d0a77584daa0b5bc6c74c7;hb=8ddd817cd74d85db3f945920fb02f4cc4daa8050;hp=bcec7f71bad7fc713a92c5a98c3093916597ab35;hpb=d9dab0a24eebad142b33d00ccb0f87b083f02195;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_drizzle_build.m4 b/m4/pandora_drizzle_build.m4
index bcec7f71..54f946f1 100644
--- a/m4/pandora_drizzle_build.m4
+++ b/m4/pandora_drizzle_build.m4
@@ -1,5 +1,5 @@
-dnl  Copyright (C) 2009 Sun Microsystems
-dnl This file is free software; Sun Microsystems
+dnl  Copyright (C) 2009 Sun Microsystems, Inc.
+dnl This file is free software; Sun Microsystems, Inc.
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -9,15 +9,6 @@ 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
-
   AC_STRUCT_TM
 
   AC_FUNC_ALLOCA
@@ -39,10 +30,10 @@ 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)
+  AC_CHECK_HEADERS(synch.h sys/mman.h)
   AC_CHECK_HEADERS(sched.h)
   AC_CHECK_HEADERS(sys/prctl.h)
   AC_CHECK_HEADERS(execinfo.h)
@@ -70,8 +61,17 @@ AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
     # include <curses.h>
     #endif
   ]])
-  AC_CHECK_TYPES([ulong])
+  AC_CHECK_TYPES([uint, ulong])
+
+  PANDORA_REQUIRE_BISON
 
   PANDORA_CXX_DEMANGLE
+  PANDORA_REQUIRE_BOOST([1.38])
+  PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS
+  PANDORA_REQUIRE_BOOST_THREAD
+  PANDORA_REQUIRE_BOOST_REGEX
+  PANDORA_REQUIRE_BOOST_DATE_TIME
+  PANDORA_REQUIRE_BOOST_FILESYSTEM
+  PANDORA_REQUIRE_BOOST_IOSTREAMS
 
 ])