Enable conditional compilation for igbinary option

nicolasff · nicolasff · commit 9138299c0ccd · 2012-09-02T11:19:14.000+01:00
diff --git a/library.c b/library.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "common.h"
 #include "php_network.h"
 #include <sys/types.h>
@@ -7,8 +10,9 @@
 #endif
 #include <ext/standard/php_smart_str.h>
 #include <ext/standard/php_var.h>
-
+#ifdef HAVE_REDIS_IGBINARY
 #include "igbinary/igbinary.h"
+#endif
 #include <zend_exceptions.h>
 #include "php_redis.h"
 #include "library.h"
@@ -1300,11 +1304,13 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_
 			return 1;
 
 		case REDIS_SERIALIZER_IGBINARY:
+#ifdef HAVE_REDIS_IGBINARY
 			if(igbinary_serialize(&val8, (size_t *)&sz, z TSRMLS_CC) == 0) { /* ok */
 				*val = (char*)val8;
 				*val_len = (int)sz;
 				return 1;
 			}
+#endif
 			return 0;
 	}
 	return 0;
@@ -1345,13 +1351,15 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
 			return ret;
 
 		case REDIS_SERIALIZER_IGBINARY:
+#ifdef HAVE_REDIS_IGBINARY
 			if(!*return_value) {
 				MAKE_STD_ZVAL(*return_value);
 			}
 			if(igbinary_unserialize((const uint8_t *)val, (size_t)val_len, return_value TSRMLS_CC) == 0) {
 				return 1;
 			}
 			efree(*return_value);
+#endif
 			return 0;
 			break;
 	}
diff --git a/redis.c b/redis.c
@@ -434,7 +434,9 @@ PHP_MINIT_FUNCTION(redis)
     /* serializer */
     add_constant_long(redis_ce, "SERIALIZER_NONE", REDIS_SERIALIZER_NONE);
     add_constant_long(redis_ce, "SERIALIZER_PHP", REDIS_SERIALIZER_PHP);
+#ifdef HAVE_REDIS_IGBINARY
     add_constant_long(redis_ce, "SERIALIZER_IGBINARY", REDIS_SERIALIZER_IGBINARY);
+#endif
 
 	zend_declare_class_constant_stringl(redis_ce, "AFTER", 5, "after", 5 TSRMLS_CC);
 	zend_declare_class_constant_stringl(redis_ce, "BEFORE", 6, "before", 6 TSRMLS_CC);
@@ -5653,7 +5655,11 @@ PHP_METHOD(Redis, setOption) {
     switch(option) {
             case REDIS_OPT_SERIALIZER:
 					val_long = atol(val_str);
-                    if(val_long == REDIS_SERIALIZER_NONE || val_long == REDIS_SERIALIZER_IGBINARY || val_long == REDIS_SERIALIZER_PHP) {
+                    if(val_long == REDIS_SERIALIZER_NONE
+#ifdef HAVE_REDIS_IGBINARY
+						 	|| val_long == REDIS_SERIALIZER_IGBINARY
+#endif
+							|| val_long == REDIS_SERIALIZER_PHP) {
                             redis_sock->serializer = val_long;
                             RETURN_TRUE;
                     } else {
