projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in fixes for rpm/instance lookup.
[awesomized/libmemcached]
/
m4
/
pandora_canonical.m4
diff --git
a/m4/pandora_canonical.m4
b/m4/pandora_canonical.m4
index fe5a944d5630c915e19cf76f21bd1456feaa3a29..ceb859af2dd74cf3a32c31af623431378093cce0 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.17
1
])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.17
5
])
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
AC_ARG_ENABLE([fat-binaries],
AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
AC_ARG_ENABLE([fat-binaries],
@@
-115,7
+115,7
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
vc_changelog=yes
])
m4_if(PCT_VERSION_FROM_VC,yes,[
vc_changelog=yes
])
m4_if(PCT_VERSION_FROM_VC,yes,[
- PANDORA_VC_
VERSION
+ PANDORA_VC_
INFO_HEADER
],[
PANDORA_TEST_VC_DIR
],[
PANDORA_TEST_VC_DIR
@@
-268,6
+268,7
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
AC_LIB_PREFIX
PANDORA_HAVE_BETTER_MALLOC
AC_LIB_PREFIX
PANDORA_HAVE_BETTER_MALLOC
+ PANDORA_WITH_VALGRIND
AC_CHECK_PROGS([DOXYGEN], [doxygen])
AC_CHECK_PROGS([PERL], [perl])
AC_CHECK_PROGS([DOXYGEN], [doxygen])
AC_CHECK_PROGS([PERL], [perl])
@@
-328,7
+329,7
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
#error "You should include config.h as your first include file"
#endif
#error "You should include config.h as your first include file"
#endif
-#include
"config/top.h"
+#include
<config/top.h>
])
mkdir -p config
cat > config/top.h.stamp <<EOF_CONFIG_TOP
])
mkdir -p config
cat > config/top.h.stamp <<EOF_CONFIG_TOP