Merge lp:~trond-norbye/libmemcached/deprecated into lp:~tangent-org/libmemcached/trunk

[Trond Norbye]

[Trond Norbye (trond-norbye)]

New configure flag: --enable-deprecated

By default we don't compile in the deprecated interface (so that continuing
to use it will be a bit more painful ;-) I had to create a new file to keep
track of the #defines, because the clients of libmemcached doesn't see
libmemcached_config.h.

By using the new preprocessor macro (MEMCACHED_ENABLE_DEPRECATED) we can now properly mark code as deprecated :-)

[lp:~trond-norbye/libmemcached/deprecated]

536. By Brian Aker <brian@gaz> on 2009-06-13

Merge of configure

537. By Brian Aker <brian@gaz> on 2009-06-14

Merge Trond

538. By Brian Aker <email address hidden> on 2009-06-17

Merging Trond

=== modified file '.bzrignore'
--- .bzrignore	2009-05-28 18:04:05 +0000
+++ .bzrignore	2009-06-11 07:31:09 +0000
@@ -105,6 +105,7 @@
 libmemcached/libmemcached.la
 libmemcached/libmemcached_config.h
 libmemcached/libmemcached_config.h.in
+libmemcached/memcached_configure.h
 libmemcached/md5.lo
 libmemcached/memcached.lo
 libmemcached/memcached_analyze.lo

=== modified file 'configure.ac'
--- configure.ac	2009-06-01 01:32:23 +0000
+++ configure.ac	2009-06-11 07:31:09 +0000
@@ -84,6 +84,7 @@
 sinclude(m4/setsockopt.m4)
 sinclude(m4/hsieh.m4)
 sinclude(m4/util.m4)
+sinclude(m4/deprecated.m4)
 
 dnl This is likely subverted by vpath builds. How do we find the original
 dnl source dir in the configure step of a vpath build?
@@ -158,6 +159,7 @@
   tests/Makefile
   docs/Makefile
   libmemcached/Makefile
+  libmemcached/memcached_configure.h
   libmemcachedutil/Makefile
   support/Makefile
   support/libmemcached.pc

=== modified file 'libmemcached/Makefile.am'
--- libmemcached/Makefile.am	2009-05-20 18:34:42 +0000
+++ libmemcached/Makefile.am	2009-06-11 07:31:09 +0000
@@ -1,4 +1,5 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver
+EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
+             memcached_configure.h.in
 
 BUILT_SOURCES= @DTRACE_HEADER@
 

=== modified file 'libmemcached/memcached.h'
--- libmemcached/memcached.h	2009-06-01 01:32:23 +0000
+++ libmemcached/memcached.h	2009-06-11 07:31:09 +0000
@@ -21,6 +21,7 @@
 #ifdef MEMCACHED_INTERNAL
 #include <libmemcached/libmemcached_config.h>
 #endif
+#include <libmemcached/memcached_configure.h>
 #include <libmemcached/memcached_constants.h>
 #include <libmemcached/memcached_types.h>
 #include <libmemcached/memcached_watchpoint.h>

=== added file 'libmemcached/memcached_configure.h.in'
--- libmemcached/memcached_configure.h.in	1970-01-01 00:00:00 +0000
+++ libmemcached/memcached_configure.h.in	2009-06-11 07:31:09 +0000
@@ -0,0 +1,22 @@
+/*
+ * Summary: Preprocessor symbols set from configure we need install-time
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Trond Norbye
+ */
+
+#ifndef MEMCACHED_CONFIGURE_H
+#define MEMCACHED_CONFIGURE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+@DEPRECATED@
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MEMCACHED_CONFIGURE_H */

=== added file 'm4/deprecated.m4'
--- m4/deprecated.m4	1970-01-01 00:00:00 +0000
+++ m4/deprecated.m4	2009-06-11 07:31:09 +0000
@@ -0,0 +1,18 @@
+dnl ---------------------------------------------------------------------------
+dnl Macro: deprecated
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE([deprecated],
+  [AS_HELP_STRING([--enable-deprecated],
+     [Enable deprecated interface @<:@default=off@:>@])],
+  [ac_enable_deprecated="$enableval"],
+  [ac_enable_deprecated="no"])
+
+if test "x$ac_enable_deprecated" = "xyes"
+then
+   DEPRECATED="#define MEMCACHED_ENABLE_DEPRECATED 1"
+fi
+
+AC_SUBST(DEPRECATED)
+dnl ---------------------------------------------------------------------------
+dnl End Macro: deprecated
+dnl ---------------------------------------------------------------------------