pandora-build v0.46 - fixed a plugin system problem when it's not in use.

[awesomized/libmemcached] / m4 / pandora_canonical.m4

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index dae56374e2fa34581c11c135d5b57bbe14fc6088..48957d415d2a76965d6e08a5fa16b8a99ba04813 100644 (file)
--- 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
 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.10])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.46])

 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds


@@ -59,18 +59,21 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([PANDORA_MAC_GCC42])
   
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([PANDORA_MAC_GCC42])

+  AC_REQUIRE([PANDORA_64BIT])

 
   dnl Once we can use a modern autoconf, we can use this
   dnl AC_PROG_CC_C99
 
   dnl Once we can use a modern autoconf, we can use this
   dnl AC_PROG_CC_C99

-  AC_PROG_CXX
+  AC_REQUIRE([AC_PROG_CXX])
+  gl_USE_SYSTEM_EXTENSIONS

   AC_PROG_CPP
   AM_PROG_CC_C_O
 
   AC_PROG_CPP
   AM_PROG_CC_C_O
 

-  gl_USE_SYSTEM_EXTENSIONS
+

   m4_if(PCT_FORCE_GCC42, [yes], [
     AS_IF([test "$GCC" = "yes"], PANDORA_ENSURE_GCC_VERSION)
   ])
   m4_if(PCT_FORCE_GCC42, [yes], [
     AS_IF([test "$GCC" = "yes"], PANDORA_ENSURE_GCC_VERSION)
   ])

-  
+
+  PANDORA_PLATFORM

 
   PANDORA_LIBTOOL
 
 
   PANDORA_LIBTOOL
 


@@ -97,15 +100,10 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   AC_C_CONST
   AC_C_INLINE
   AC_C_VOLATILE
   AC_C_CONST
   AC_C_INLINE
   AC_C_VOLATILE

+  AC_C_RESTRICT

 
   AC_HEADER_TIME
   AC_TYPE_SIZE_T
 
   AC_HEADER_TIME
   AC_TYPE_SIZE_T

-  AC_FUNC_MALLOC
-  AC_FUNC_REALLOC
-  
-
-  AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
-

   AC_SYS_LARGEFILE
 
 
   AC_SYS_LARGEFILE
 
 


@@ -113,14 +111,21 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   PANDORA_CHECK_CXX_VERSION
 
   PANDORA_OPTIMIZE
   PANDORA_CHECK_CXX_VERSION
 
   PANDORA_OPTIMIZE

-  PANDORA_64BIT

 
 

+  dnl We need to inject error into the cflags to test if visibility works or not
+  save_CFLAGS="${CFLAGS}"
+  CFLAGS="${CFLAGS} -Werror"

   gl_VISIBILITY
   gl_VISIBILITY

+  CFLAGS="${save_CFLAGS}"
+
+  PANDORA_HEADER_ASSERT

 
   PANDORA_WARNINGS(PCT_ALL_ARGS)
 
   PANDORA_ENABLE_DTRACE
 
   PANDORA_WARNINGS(PCT_ALL_ARGS)
 
   PANDORA_ENABLE_DTRACE

-  PANDORA_HEADER_ASSERT
+
+  AC_LIB_PREFIX
+  PANDORA_HAVE_BETTER_MALLOC

 
   AC_CHECK_PROGS([DOXYGEN], [doxygen])
   AC_CHECK_PROGS([PERL], [perl])
 
   AC_CHECK_PROGS([DOXYGEN], [doxygen])
   AC_CHECK_PROGS([PERL], [perl])


@@ -133,6 +138,9 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
     ])
   ])
 
     ])
   ])
 

+  PANDORA_USE_PIPE
+
+

   AM_CPPFLAGS="-I\${top_srcdir} -I\${top_builddir} ${AM_CPPFLAGS}"
   AM_CFLAGS="${AM_CFLAGS} ${CC_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"
   AM_CXXFLAGS="${AM_CXXFLAGS} ${CXX_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"
   AM_CPPFLAGS="-I\${top_srcdir} -I\${top_builddir} ${AM_CPPFLAGS}"
   AM_CFLAGS="${AM_CFLAGS} ${CC_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"
   AM_CXXFLAGS="${AM_CXXFLAGS} ${CXX_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"