archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.2'

Browse source
This commit is contained in:
Nikita Popov 2017-12-16 22:33:06 +01:00
commit ff7c9990d4
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/curl/config.m4
View file

@ -14,7 +14,7 @@ if test "$PHP_CURL" != "no"; then
dnl using pkg-config output dnl using pkg-config output
AC_MSG_CHECKING(for libcurl.pc) AC_MSG_CHECKING(for libcurl.pc)
if test "$PHP_CURL" == "yes" -o "$PHP_CURL" == "/usr"; then if test "$PHP_CURL" = "yes" -o "$PHP_CURL" = "/usr"; then
PKNAME=libcurl PKNAME=libcurl
AC_MSG_RESULT(using default path) AC_MSG_RESULT(using default path)
elif test -r $PHP_CURL/$PHP_LIBDIR/pkgconfig/libcurl.pc; then elif test -r $PHP_CURL/$PHP_LIBDIR/pkgconfig/libcurl.pc; then

2
makedist
View file

@ -40,7 +40,7 @@ if test "${2}" -lt "13" -o "${2}" -eq "13" -a "${3}" -lt "5"; then
fi fi
IFS="$old_IFS" IFS="$old_IFS"
if test "x$PHPROOT" == "x"; then if test "x$PHPROOT" = "x"; then
PHPROOT=git@git.php.net:php-src.git; PHPROOT=git@git.php.net:php-src.git;
fi fi