summaryrefslogtreecommitdiffstats
path: root/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch
blob: bedc8be40870d52ae95a12d139ac9a619abda4c9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
From c3f9d604adc77bc16601cebd0aabecaf21fb563b Mon Sep 17 00:00:00 2001
From: Timandes White <timands@gmail.com>
Date: Thu, 19 Jul 2018 11:07:12 +0800
Subject: [PATCH] Fix path of zookeeper_version.h in config.m4

---
 config.m4 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config.m4 b/config.m4
index 5465685..7191109 100644
--- a/config.m4
+++ b/config.m4
@@ -106,13 +106,17 @@ if test "$PHP_ZOOKEEPER" != "no"; then
         AC_DEFINE(HAVE_PTHREAD,1,[ ])
     ])
 
-    ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}')
+    AC_MSG_CHECKING([whether ZooKeeper Config is enabled])
+    ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}')
     PHP_ZOOKEEPER_CONFIG_FILES=""
     if test ${ZOO_MINOR_VERSION} -eq 5; then
       PHP_ZOOKEEPER_CONFIG_FILES="php_zookeeper_config_class.c"
-      AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
+      AC_MSG_RESULT([enabled])
+    else
+      AC_MSG_RESULT([disabled])
     fi
 
+    AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library])
     PHP_SUBST(ZOOKEEPER_SHARED_LIBADD)
     PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c ${PHP_ZOOKEEPER_CONFIG_FILES} php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES)