X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_canonical.m4;h=90ea6da8a7c1f5dab97640ecc77bc25920217072;hb=31079a798f38d56476c644a7ec596a600fb01930;hp=65e1d128c86f7b8f2ac4df2c120ce98747074958;hpb=15b71a80142a85eb34afbad016a23bb591145f36;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 65e1d128..90ea6da8 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.20])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.22])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
@@ -59,6 +59,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   
   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
@@ -66,6 +67,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   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)
@@ -111,7 +113,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   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}"