Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove duplicate AC_PROG_CPP call
This commit is contained in:
Peter Kokot 2019-07-18 02:15:32 +02:00
commit e504716320
2 changed files with 11 additions and 1 deletions

View File

@ -30,7 +30,6 @@ if test "$PHP_CURL" != "no"; then
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $CURL_LIBS"
AC_PROG_CPP
AC_MSG_CHECKING([for openssl support in libcurl])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <strings.h>

11
ž Normal file
View File

@ -0,0 +1,11 @@
Update changelog
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch PHP-7.4
# Your branch is ahead of 'origin/PHP-7.4' by 1 commit.
# (use "git push" to publish your local commits)
#
# Changes to be committed:
# modified: UPGRADING.INTERNALS
#