Skip to content

Commit 5bfd3d1

Browse files
committed
zip patch
1 parent 40968dd commit 5bfd3d1

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

ext/zip/config.m4

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ if test "$PHP_ZIP" != "no"; then
2626
elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
2727
PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
2828
PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
29+
elif test -f "$PHP_ZLIB_DIR/develop/headers/zlib.h"; then
30+
PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
31+
PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers"
2932
else
3033
AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
3134
fi
3235
else
33-
for i in /usr/local /usr; do
36+
for i in /usr/local /usr /system; do
3437
if test -f "$i/include/zlib/zlib.h"; then
3538
PHP_ZLIB_DIR="$i"
3639
PHP_ZLIB_INCDIR="$i/include/zlib"
3740
elif test -f "$i/include/zlib.h"; then
3841
PHP_ZLIB_DIR="$i"
3942
PHP_ZLIB_INCDIR="$i/include"
43+
elif test -f "$i/develop/headers/zlib.h"; then
44+
PHP_ZLIB_DIR="$i"
45+
PHP_ZLIB_INCDIR="$i/develop/headers"
4046
fi
4147
done
4248
fi
@@ -73,13 +79,19 @@ if test "$PHP_ZIP" != "no"; then
7379
fi
7480

7581
else
76-
for i in /usr/local /usr; do
82+
for i in /usr/local /usr /system; do
7783
if test -r $i/include/zip.h; then
7884
LIBZIP_CFLAGS="-I$i/include"
7985
LIBZIP_LIBDIR="$i/$PHP_LIBDIR"
8086
AC_MSG_RESULT(in default path: found in $i)
8187
break
8288
fi
89+
if test -r $i/develop/headers/zip.h; then
90+
LIBZIP_CFLAGS="-I$i/develop/headers"
91+
LIBZIP_LIBDIR="$i/$PHP_LIBDIR"
92+
AC_MSG_RESULT(in default path: found in $i)
93+
break
94+
fi
8395
done
8496
fi
8597

0 commit comments

Comments
 (0)