[svn-commits] russell: branch snuffy/func_memcache r230769 - in /team/snuffy/func_memcache:...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Nov 21 09:48:26 CST 2009
Author: russell
Date: Sat Nov 21 09:48:24 2009
New Revision: 230769
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230769
Log:
In one of snuffy's last commits to this branch, he said "autoconf person would be nice."
So, here you go!
Modified:
team/snuffy/func_memcache/build_tools/menuselect-deps.in
team/snuffy/func_memcache/configure
team/snuffy/func_memcache/configure.ac
team/snuffy/func_memcache/funcs/func_memcache.c
team/snuffy/func_memcache/include/asterisk/autoconfig.h.in
team/snuffy/func_memcache/makeopts.in
Modified: team/snuffy/func_memcache/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/team/snuffy/func_memcache/build_tools/menuselect-deps.in?view=diff&rev=230769&r1=230768&r2=230769
==============================================================================
--- team/snuffy/func_memcache/build_tools/menuselect-deps.in (original)
+++ team/snuffy/func_memcache/build_tools/menuselect-deps.in Sat Nov 21 09:48:24 2009
@@ -24,6 +24,7 @@
LIBXML2=@PBX_LIBXML2@
LTDL=@PBX_LTDL@
LUA=@PBX_LUA@
+MEMCACHED=@PBX_MEMCACHED@
MISDN=@PBX_MISDN@
MYSQLCLIENT=@PBX_MYSQLCLIENT@
NBS=@PBX_NBS@
Modified: team/snuffy/func_memcache/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/snuffy/func_memcache/configure.ac?view=diff&rev=230769&r1=230768&r2=230769
==============================================================================
--- team/snuffy/func_memcache/configure.ac (original)
+++ team/snuffy/func_memcache/configure.ac Sat Nov 21 09:48:24 2009
@@ -277,6 +277,7 @@
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
+AST_EXT_LIB_SETUP([MEMCACHED], [memcached], [memcached])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
AST_EXT_LIB_SETUP([MYSQLCLIENT], [mysqlclient], [mysqlclient])
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
@@ -1532,6 +1533,8 @@
# Some distributions (like SuSE) remove the 5.1 suffix.
AST_EXT_LIB_CHECK([LUA], [lua], [luaL_register], [lua.h], [-lm])
+AST_EXT_LIB_CHECK([MEMCACHED], [memcached], [memcached_create], [libmemcached/memcached.h])
+
AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
# This is a bit complex... in reality, Asterisk's AIS support is dependent on finding
Modified: team/snuffy/func_memcache/funcs/func_memcache.c
URL: http://svnview.digium.com/svn/asterisk/team/snuffy/func_memcache/funcs/func_memcache.c?view=diff&rev=230769&r1=230768&r2=230769
==============================================================================
--- team/snuffy/func_memcache/funcs/func_memcache.c (original)
+++ team/snuffy/func_memcache/funcs/func_memcache.c Sat Nov 21 09:48:24 2009
@@ -22,6 +22,10 @@
*
* \ingroup functions
*/
+
+/*** MODULEINFO
+ <depend>memcached</depend>
+ ***/
#include "asterisk.h"
Modified: team/snuffy/func_memcache/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/snuffy/func_memcache/include/asterisk/autoconfig.h.in?view=diff&rev=230769&r1=230768&r2=230769
==============================================================================
--- team/snuffy/func_memcache/include/asterisk/autoconfig.h.in (original)
+++ team/snuffy/func_memcache/include/asterisk/autoconfig.h.in Sat Nov 21 09:48:24 2009
@@ -495,6 +495,12 @@
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
+/* Define to 1 if you have the memcached library. */
+#undef HAVE_MEMCACHED
+
+/* Define to the version of the memcached library. */
+#undef HAVE_MEMCACHED_VERSION
+
/* Define to 1 if you have the `memchr' function. */
#undef HAVE_MEMCHR
@@ -938,7 +944,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_blksize'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1269,11 +1275,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -1290,11 +1296,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
@@ -1316,20 +1317,30 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1346,20 +1357,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: team/snuffy/func_memcache/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/snuffy/func_memcache/makeopts.in?view=diff&rev=230769&r1=230768&r2=230769
==============================================================================
--- team/snuffy/func_memcache/makeopts.in (original)
+++ team/snuffy/func_memcache/makeopts.in Sat Nov 21 09:48:24 2009
@@ -136,6 +136,9 @@
LUA_INCLUDE=@LUA_INCLUDE@
LUA_LIB=@LUA_LIB@
+MEMCACHED_INCLUDE=@MEMCACHED_INCLUDE@
+MEMCACHED_LIB=@MEMCACHED_LIB@
+
MYSQLCLIENT_INCLUDE=@MYSQLCLIENT_INCLUDE@
MYSQLCLIENT_LIB=@MYSQLCLIENT_LIB@
More information about the svn-commits
mailing list