Skip to content

Commit aa110fe

Browse files
Cleanup version check output
1 parent 6973478 commit aa110fe

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

config.m4

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,15 @@ if test "$PHP_REDIS" != "no"; then
135135
fi
136136
fi
137137

138-
AC_MSG_CHECKING([for redis msgpack support])
139138
if test "$PHP_REDIS_MSGPACK" != "no"; then
140-
AC_MSG_CHECKING([for php_msgpack version >= 2.0.3])
139+
AC_MSG_CHECKING([for php msgpack version >= 2.0.3])
141140
MSGPACK_VERSION=`$EGREP "define PHP_MSGPACK_VERSION" $msgpack_inc_path/ext/msgpack/php_msgpack.h | $SED -e 's/[[^0-9\.]]//g'`
142-
AC_MSG_RESULT([$MSGPACK_VERSION])
143141
if test `echo $MSGPACK_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000 + $2*100 + $3*10 + $4}'` -lt 2030; then
144-
AC_MSG_ERROR([php msgpack version >= 2.0.3 required])
142+
AC_MSG_ERROR([version $MSGPACK_VERSION is too old])
143+
else
144+
AC_MSG_RESULT([yes])
145145
fi
146146

147-
AC_MSG_RESULT([enabled])
148147
AC_DEFINE(HAVE_REDIS_MSGPACK,1,[Whether redis msgpack serializer is enabled])
149148
MSGPACK_INCLUDES="-I$msgpack_inc_path"
150149
MSGPACK_EXT_DIR="$msgpack_inc_path/ext"
@@ -155,7 +154,6 @@ if test "$PHP_REDIS" != "no"; then
155154
PHP_ADD_INCLUDE($MSGPACK_EXT_DIR)
156155
else
157156
MSGPACK_INCLUDES=""
158-
AC_MSG_RESULT([disabled])
159157
fi
160158

161159
if test "$PHP_REDIS_LZF" != "no"; then

0 commit comments

Comments
 (0)