X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=48957d415d2a76965d6e08a5fa16b8a99ba04813;hb=38c4b902f9971cf0e95add1e24a7cad86b5d38dd;hp=90ea6da8a7c1f5dab97640ecc77bc25920217072;hpb=acce29c292b435fef4fd486495dca7d653be2bf2;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 90ea6da8..48957d41 100644
--- 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
-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.22])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.46])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
@@ -63,19 +63,17 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
 
   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
 
 
-  gl_USE_SYSTEM_EXTENSIONS
   m4_if(PCT_FORCE_GCC42, [yes], [
     AS_IF([test "$GCC" = "yes"], PANDORA_ENSURE_GCC_VERSION)
   ])
 
-  AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
-  AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])
-  AS_IF([test "x$INTELCC" = "xyes"], [enable_rpath=no])
+  PANDORA_PLATFORM
 
   PANDORA_LIBTOOL
 
@@ -140,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}"