Skip to content

Commit aff75ff

Browse files
michael-grunderyatsukhnenko
authored andcommitted
We're only compatible with PHP7 now \o/
This update fixes merge conflicts that would have prevented us from merging the msgpack PR (phpredis#1050).
1 parent 52bae8a commit aff75ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dnl Check for igbinary
3838
elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then
3939
igbinary_inc_path="$phpincludedir"
4040
else
41-
for i in php php4 php5 php6 php7; do
41+
for i in php php7; do
4242
if test -f "$prefix/include/$i/ext/igbinary/igbinary.h"; then
4343
igbinary_inc_path="$prefix/include/$i"
4444
fi
@@ -117,7 +117,7 @@ dnl Check for msgpack
117117
elif test -f "$phpincludedir/ext/msgpack/php_msgpack.h"; then
118118
msgpack_inc_path="$phpincludedir"
119119
else
120-
for i in php php4 php5 php6 php7; do
120+
for i in php php7; do
121121
if test -f "$prefix/include/$i/ext/msgpack/php_msgpack.h"; then
122122
msgpack_inc_path="$prefix/include/$i"
123123
fi

0 commit comments

Comments
 (0)