projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
pandora-build v0.20
[m6w6/libmemcached]
/
m4
/
pandora_canonical.m4
diff --git
a/m4/pandora_canonical.m4
b/m4/pandora_canonical.m4
index fc77522f015cb046f2e5280b476d0316f89821f2..65e1d128c86f7b8f2ac4df2c120ce98747074958 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.
20
])
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
@@
-70,7
+70,10
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
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)
])
-
+
+ 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
+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
@@
-127,6
+125,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])