projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update expectations how history requests look like
[m6w6/ext-http]
/
config9.m4
diff --git
a/config9.m4
b/config9.m4
index cd0ae7e5f4f8296e83c9c8bb6b3e9b4704d1a3e7..8476d9782cb5330b0830dadf2b1b92cf83f2a7ed 100644
(file)
--- a/
config9.m4
+++ b/
config9.m4
@@
-100,12
+100,13
@@
dnl ----
AC_TYPE_OFF_T
AC_TYPE_MBSTATE_T
dnl getdomainname() is declared in netdb.h on some platforms: AIX, OSF
AC_TYPE_OFF_T
AC_TYPE_MBSTATE_T
dnl getdomainname() is declared in netdb.h on some platforms: AIX, OSF
- AC_CHECK_HEADERS([netdb.h unistd.h wchar.h wctype.h])
+ AC_CHECK_HEADERS([netdb.h unistd.h wchar.h wctype.h
arpa/inet.h
])
PHP_CHECK_FUNC(gethostname, nsl)
PHP_CHECK_FUNC(getdomainname, nsl)
PHP_CHECK_FUNC(mbrtowc)
PHP_CHECK_FUNC(mbtowc)
PHP_CHECK_FUNC(iswalnum)
PHP_CHECK_FUNC(gethostname, nsl)
PHP_CHECK_FUNC(getdomainname, nsl)
PHP_CHECK_FUNC(mbrtowc)
PHP_CHECK_FUNC(mbtowc)
PHP_CHECK_FUNC(iswalnum)
+ PHP_CHECK_FUNC(inet_pton)
dnl ----
dnl IDN
dnl ----
dnl IDN
@@
-201,6
+202,14
@@
dnl ----
if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
fi
if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
fi
+
+ AC_MSG_CHECKING([for HTTP2 support in libcurl])
+ if $CURL_CONFIG --features | $EGREP -q HTTP2; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([PHP_HTTP_HAVE_HTTP2], [1], [ ])
+ else
+ AC_MSG_RESULT([no])
+ fi
dnl
dnl compile tests
dnl
dnl compile tests
@@
-209,11
+218,11
@@
dnl ----
save_INCLUDES="$INCLUDES"
INCLUDES=
save_LIBS="$LIBS"
save_INCLUDES="$INCLUDES"
INCLUDES=
save_LIBS="$LIBS"
- LIBS=
+ LIBS=
-lcurl
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
save_LDFLAGS="$LDFLAGS"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$
LDFLAGS `$CURL_CONFIG --libs` $
ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+ LDFLAGS="$ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`