projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge from trunk.
[awesomized/libmemcached]
/
m4
/
pandora_canonical.m4
diff --git
a/m4/pandora_canonical.m4
b/m4/pandora_canonical.m4
index fc77522f015cb046f2e5280b476d0316f89821f2..90ea6da8a7c1f5dab97640ecc77bc25920217072 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.
13
])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.
22
])
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,6
+59,7
@@
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
@@
-66,11
+67,15
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
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)
])
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_LIBTOOL
PANDORA_LIBTOOL
@@
-97,15
+102,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,7
+113,6
@@
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}"
dnl We need to inject error into the cflags to test if visibility works or not
save_CFLAGS="${CFLAGS}"
@@
-127,6
+126,9
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
PANDORA_ENABLE_DTRACE
PANDORA_ENABLE_DTRACE
+ 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])