Merge branch 'make-igbinary-optional'

Author: nicolasff

config.m4

@@ -8,6 +8,8 @@ dnl Make sure that the comment is aligned:
 PHP_ARG_ENABLE(redis-session, whether to enable sessions,
 [  --disable-redis-session      Disable session support], yes, no)
 
+PHP_ARG_ENABLE(redis-igbinary, whether to enable igbinary serializer support,
+[  --enable-redis-igbinary      Enable igbinary serializer support], no, no)
 
 
 if test "$PHP_REDIS" != "no"; then
@@ -16,6 +18,46 @@ if test "$PHP_REDIS" != "no"; then
     AC_DEFINE(PHP_SESSION,1,[redis sessions])
   fi
 
+dnl Check for igbinary
+  if test "$PHP_REDIS_IGBINARY" != "no"; then
+    AC_MSG_CHECKING([for igbinary includes])
+    igbinary_inc_path=""
+
+    if test -f "$abs_srcdir/include/php/ext/igbinary/igbinary.h"; then
+      igbinary_inc_path="$abs_srcdir/include/php"
+    elif test -f "$abs_srcdir/ext/igbinary/igbinary.h"; then
+      igbinary_inc_path="$abs_srcdir"
+    elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then
+      igbinary_inc_path="$phpincludedir"
+    else
+      for i in php php4 php5 php6; do
+        if test -f "$prefix/include/$i/ext/igbinary/igbinary.h"; then
+          igbinary_inc_path="$prefix/include/$i"
+        fi
+      done
+    fi
+
+    if test "$igbinary_inc_path" = ""; then
+      AC_MSG_ERROR([Cannot find igbinary.h])
+    else
+      AC_MSG_RESULT([$igbinary_inc_path])
+    fi
+  fi
+
+  AC_MSG_CHECKING([for redis igbinary support])
+  if test "$PHP_REDIS_IGBINARY" != "no"; then
+    AC_MSG_RESULT([enabled])
+    AC_DEFINE(HAVE_REDIS_IGBINARY,1,[Whether redis igbinary serializer is enabled])
+    IGBINARY_INCLUDES="-I$igbinary_inc_path"
+    ifdef([PHP_ADD_EXTENSION_DEP],
+    [
+      PHP_ADD_EXTENSION_DEP(redis, igbinary)
+    ])
+  else
+    IGBINARY_INCLUDES=""
+    AC_MSG_RESULT([disabled])
+  fi
+
   dnl # --with-redis -> check with-path
   dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
   dnl SEARCH_FOR="/include/redis.h"  # you most likely want to change this
@@ -55,5 +97,5 @@ if test "$PHP_REDIS" != "no"; then
   dnl
   dnl PHP_SUBST(REDIS_SHARED_LIBADD)
 
-  PHP_NEW_EXTENSION(redis, redis.c library.c redis_session.c redis_array.c redis_array_impl.c igbinary/igbinary.c igbinary/hash_si.c igbinary/hash_function.c, $ext_shared)
+  PHP_NEW_EXTENSION(redis, redis.c library.c redis_session.c redis_array.c redis_array_impl.c, $ext_shared)
 fi