blob: 84200cd4df312e2901e70abd598361684a79d9a6 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- config.m4.orig 2011-12-30 09:41:22 UTC
+++ config.m4
@@ -38,8 +38,18 @@ if test "x${PHP_PDO_CASSANDRA}" != "xno"
PHP_THRIFT_VERSION=`${PKG_CONFIG} thrift --modversion`
AC_MSG_RESULT([found version ${PHP_THRIFT_VERSION}])
+ ac_IFS=$IFS
+ IFS="."
+ set $PHP_THRIFT_VERSION
+ IFS=$ac_IFS
+ dnl workaround for changes of THRIFT-1968
+ THRIFT_VERSION=`expr [$]1 \* 10000 + [$]2 \* 100 + [$]3`
+ if test "$THRIFT_VERSION" -ge "901"; then
+ PHP_THRIFT_INCS="-I`${PKG_CONFIG} thrift --variable=includedir`/thrift"
+ else
+ PHP_THRIFT_INCS=`${PKG_CONFIG} thrift --cflags`
+ fi
PHP_THRIFT_LIBS=`${PKG_CONFIG} thrift --libs`
- PHP_THRIFT_INCS=`${PKG_CONFIG} thrift --cflags`
PHP_EVAL_LIBLINE(${PHP_THRIFT_LIBS}, PDO_CASSANDRA_SHARED_LIBADD)
PHP_EVAL_INCLINE(${PHP_THRIFT_INCS})
|
