projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Casting fixes for linux.
[m6w6/libmemcached]
/
m4
/
pandora_canonical.m4
diff --git
a/m4/pandora_canonical.m4
b/m4/pandora_canonical.m4
index c1170f158e45d83856f147527ca7d28af96e1ffa..ef5e1983df69d9f05cf9874ad840f4072801a623 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.
78
])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.
80
])
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
@@
-24,6
+24,7
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
m4_define([PCT_IGNORE_SHARED_PTR],[no])
m4_define([PCT_FORCE_GCC42],[no])
m4_define([PCT_SRC_IN_SRC],[no])
m4_define([PCT_IGNORE_SHARED_PTR],[no])
m4_define([PCT_FORCE_GCC42],[no])
m4_define([PCT_SRC_IN_SRC],[no])
+ m4_define([PCT_VERSION_FROM_VC],[no])
m4_define([PCT_USE_VISIBILITY],[yes])
m4_foreach([pct_arg],[$*],[
m4_case(pct_arg,
m4_define([PCT_USE_VISIBILITY],[yes])
m4_foreach([pct_arg],[$*],[
m4_case(pct_arg,
@@
-50,6
+51,10
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
[src-in-src], [
m4_undefine([PCT_SRC_IN_SRC])
m4_define([PCT_SRC_IN_SRC],[yes])
[src-in-src], [
m4_undefine([PCT_SRC_IN_SRC])
m4_define([PCT_SRC_IN_SRC],[yes])
+ ],
+ [version-from-vc], [
+ m4_undefine([PCT_VERSION_FROM_VC])
+ m4_define([PCT_VERSION_FROM_VC],[yes])
])
])
])
])
@@
-72,6
+77,11
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
AC_REQUIRE([PANDORA_MAC_GCC42])
AC_REQUIRE([PANDORA_64BIT])
AC_REQUIRE([PANDORA_MAC_GCC42])
AC_REQUIRE([PANDORA_64BIT])
+ m4_if(PCT_VERSION_FROM_VC,yes,[
+ PANDORA_VC_VERSION
+ ])
+ PANDORA_VERSION
+
dnl Once we can use a modern autoconf, we can use this
dnl AC_PROG_CC_C99
AC_REQUIRE([AC_PROG_CXX])
dnl Once we can use a modern autoconf, we can use this
dnl AC_PROG_CC_C99
AC_REQUIRE([AC_PROG_CXX])
@@
-88,7
+98,10
@@
AC_DEFUN([PANDORA_CANONICAL_TARGET],[
PANDORA_LIBTOOL
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
PANDORA_LIBTOOL
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
- AM_LDFLAGS="${AM_LDFLAGS} -Wl,--default-symver"
+ ${LD} --help | grep default-symver >/dev/null 2>&1
+ AS_IF([test $? -eq 0],[
+ AM_LDFLAGS="${AM_LDFLAGS} -Wl,--default-symver"
+ ])
])
dnl autoconf doesn't automatically provide a fail-if-no-C++ macro
])
dnl autoconf doesn't automatically provide a fail-if-no-C++ macro