diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-16 22:33:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-16 22:33:06 +0100 |
| commit | ff7c9990d42ff09d59bbd0bc64ca56655cc81ff2 (patch) | |
| tree | f9fa44df11b90aaf47e7d0a2cbad3c3f7b3d456e | |
| parent | 388a6bab4cbda2f890caf05344ee15f76b09a12b (diff) | |
| parent | 340255a69433d6af44ce484af7ba686528f2b9e1 (diff) | |
| download | php-git-ff7c9990d42ff09d59bbd0bc64ca56655cc81ff2.tar.gz | |
Merge branch 'PHP-7.2'
| -rw-r--r-- | ext/curl/config.m4 | 2 | ||||
| -rwxr-xr-x | makedist | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 index 9db0decd6c..8e688c1a11 100644 --- a/ext/curl/config.m4 +++ b/ext/curl/config.m4 @@ -14,7 +14,7 @@ if test "$PHP_CURL" != "no"; then dnl using pkg-config output 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 AC_MSG_RESULT(using default path) elif test -r $PHP_CURL/$PHP_LIBDIR/pkgconfig/libcurl.pc; then @@ -40,7 +40,7 @@ if test "${2}" -lt "13" -o "${2}" -eq "13" -a "${3}" -lt "5"; then fi IFS="$old_IFS" -if test "x$PHPROOT" == "x"; then +if test "x$PHPROOT" = "x"; then PHPROOT=git@git.php.net:php-src.git; fi |