Build fixes

Author: mkoppanen

config.m4

@@ -349,13 +349,13 @@ if test "$PHP_MEMCACHED" != "no"; then
     LIBEVENT_INCLUDES=""
     if test "$PHP_MEMCACHED_PROTOCOL" != "no"; then
 
-      AC_MSG_CHECKING([for libmemcachedprotocol location])
+      AC_MSG_CHECKING([for libmemcachedprotocol])
       if test "$PHP_LIBMEMCACHED_DIR" != "no" && test "$PHP_LIBMEMCACHED_DIR" != "yes"; then
         if ! test -r "$PHP_LIBMEMCACHED_DIR/include/libmemcachedprotocol-0.0/handler.h"; then
           AC_MSG_ERROR([Can't find libmemcachedprotocol headers under "$PHP_LIBMEMCACHED_DIR"])
         fi
       fi
-      AC_MSG_CHECKING([found])
+      AC_MSG_RESULT([found])
 
       PHP_ADD_LIBRARY_WITH_PATH(memcachedprotocol, $PHP_LIBMEMCACHED_DIR/$PHP_LIBDIR, MEMCACHED_SHARED_LIBADD)
 
@@ -365,6 +365,7 @@ if test "$PHP_MEMCACHED" != "no"; then
         AC_MSG_ERROR([Please reinstall the pkg-config distribution])
       fi
 
+      AC_MSG_CHECKING([for libevent])
       if $PKG_CONFIG --exists libevent; then
         PHP_MEMCACHED_LIBEVENT_VERSION=`$PKG_CONFIG libevent --modversion`
         PHP_MEMCACHED_LIBEVENT_PREFIX=`$PKG_CONFIG libevent --variable=prefix`
@@ -379,6 +380,7 @@ if test "$PHP_MEMCACHED" != "no"; then
         AC_MSG_ERROR(Unable to find libevent installation)
       fi
       PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} php_memcached_server.c"
+      AC_DEFINE(HAVE_MEMCACHED_PROTOCOL,1,[Whether memcached protocol is enabled])
     fi
 
     PHP_SUBST(MEMCACHED_SHARED_LIBADD)

php_memcached.c

@@ -214,11 +214,15 @@ typedef struct {
 	int memc_errno;
 } php_memc_t;
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
+
 typedef struct {
 	zend_object zo;
 	php_memc_proto_handler_t *handler;
 } php_memc_server_t;
 
+#endif
+
 enum {
 	MEMC_OP_SET,
 	MEMC_OP_TOUCH,
@@ -229,11 +233,15 @@ enum {
 };
 
 static zend_class_entry *memcached_ce = NULL;
-static zend_class_entry *memcached_server_ce = NULL;
+
 static zend_class_entry *memcached_exception_ce = NULL;
 
 static zend_object_handlers memcached_object_handlers;
+
+#ifdef HAVE_MEMCACHED_PROTOCOL
 static zend_object_handlers memcached_server_object_handlers;
+static zend_class_entry *memcached_server_ce = NULL;
+#endif
 
 struct callbackContext
 {
@@ -2653,6 +2661,7 @@ zend_object_value php_memc_new(zend_class_entry *ce TSRMLS_DC)
 	return retval;
 }
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
 static
 void php_memc_server_free_storage(php_memc_server_t *intern TSRMLS_DC)
 {
@@ -2681,6 +2690,7 @@ zend_object_value php_memc_server_new(zend_class_entry *ce TSRMLS_DC)
 
 	return retval;
 }
+#endif
 
 ZEND_RSRC_DTOR_FUNC(php_memc_dtor)
 {
@@ -3415,6 +3425,8 @@ static int php_memc_do_result_callback(zval *zmemc_obj, zend_fcall_info *fci,
 }
 /* }}} */
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
+
 static
 void s_destroy_cb (zend_fcall_info *fci)
 {
@@ -3484,6 +3496,7 @@ PHP_METHOD(MemcachedServer, on)
 	RETURN_BOOL(rc);
 }
 
+#endif
 
 /* {{{ methods arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, 0, 0, 0)
@@ -3853,6 +3866,7 @@ static zend_function_entry memcached_class_methods[] = {
 #undef MEMC_ME
 /* }}} */
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
 /* {{{ */
 #define MEMC_SE_ME(name, args) PHP_ME(MemcachedServer, name, args, ZEND_ACC_PUBLIC)
 static
@@ -3863,7 +3877,7 @@ zend_function_entry memcached_server_class_methods[] = {
 };
 #undef MEMC_SE_ME
 /* }}} */
-
+#endif
 
 /* {{{ memcached_module_entry
  */
@@ -4066,6 +4080,7 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
 	 */
 	REGISTER_MEMC_CLASS_CONST_LONG(GET_PRESERVE_ORDER, MEMC_GET_PRESERVE_ORDER);
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
 	/*
 	 * Server callbacks
 	 */
@@ -4101,7 +4116,7 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
 	REGISTER_MEMC_CLASS_CONST_LONG(RESPONSE_EINTERNAL,       PROTOCOL_BINARY_RESPONSE_EINTERNAL);
 	REGISTER_MEMC_CLASS_CONST_LONG(RESPONSE_EBUSY,           PROTOCOL_BINARY_RESPONSE_EBUSY);
 	REGISTER_MEMC_CLASS_CONST_LONG(RESPONSE_ETMPFAIL,        PROTOCOL_BINARY_RESPONSE_ETMPFAIL);
-
+#endif
 
 	#undef REGISTER_MEMC_CLASS_CONST_LONG
 
@@ -4125,19 +4140,21 @@ PHP_MINIT_FUNCTION(memcached)
 	memcpy(&memcached_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	memcached_object_handlers.clone_obj = NULL;
 
-	memcpy(&memcached_server_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-	memcached_server_object_handlers.clone_obj = NULL;
-
 	le_memc = zend_register_list_destructors_ex(NULL, php_memc_dtor, "Memcached persistent connection", module_number);
 	le_memc_sess = zend_register_list_destructors_ex(NULL, php_memc_sess_dtor, "Memcached  Sessions persistent connection", module_number);
 
 	INIT_CLASS_ENTRY(ce, "Memcached", memcached_class_methods);
 	memcached_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	memcached_ce->create_object = php_memc_new;
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
+	memcpy(&memcached_server_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+	memcached_server_object_handlers.clone_obj = NULL;
+
 	INIT_CLASS_ENTRY(ce, "MemcachedServer", memcached_server_class_methods);
 	memcached_server_ce = zend_register_internal_class(&ce TSRMLS_CC);
 	memcached_server_ce->create_object = php_memc_server_new;
+#endif
 
 	INIT_CLASS_ENTRY(ce, "MemcachedException", NULL);
 	memcached_exception_ce = zend_register_internal_class_ex(&ce, php_memc_get_exception_base(0 TSRMLS_CC), NULL TSRMLS_CC);

php_memcached.h

@@ -58,6 +58,7 @@ enum memcached_serializer {
 # endif
 #endif
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
 typedef enum {
 	MEMC_SERVER_ON_MIN       = -1,
 	MEMC_SERVER_ON_CONNECT   = 0,
@@ -83,6 +84,7 @@ typedef struct {
 	zend_fcall_info fci;
 	zend_fcall_info_cache fci_cache;
 } php_memc_server_cb_t;
+#endif
 
 ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 #ifdef HAVE_MEMCACHED_SESSION
@@ -119,10 +121,11 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 #if HAVE_MEMCACHED_SASL
 	bool use_sasl;
 #endif
-
+#ifdef HAVE_MEMCACHED_PROTOCOL
 	struct {
 		php_memc_server_cb_t callbacks [14];
 	} server;
+#endif
 ZEND_END_MODULE_GLOBALS(php_memcached)
 
 PHP_MEMCACHED_API zend_class_entry *php_memc_get_ce(void);

php_memcached_server.h

@@ -17,6 +17,8 @@
 #ifndef _PHP_MEMCACHED_SERVER_H_
 # define _PHP_MEMCACHED_SERVER_H_
 
+#ifdef HAVE_MEMCACHED_PROTOCOL
+
 #include <libmemcachedprotocol-0.0/handler.h>
 
 /*
@@ -33,5 +35,6 @@ void php_memc_proto_handler_destroy (php_memc_proto_handler_t **ptr);
 
 zend_bool php_memc_proto_handler_run (php_memc_proto_handler_t *h, const char *address);
 
+#endif
 
 #endif