X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=20e7d6c9317dac3d9417ec31a678ea9df9aac068;hp=85a7ec4ceb3e7b5eee9668015475e005a94a6ffa;hb=791511f3bc18cdc68b3f27b43d9396cf56d99e5a;hpb=4ffb062b7475b0d7bd4737a959bebd9f557d8a95 diff --git a/config9.m4 b/config9.m4 index 85a7ec4..20e7d6c 100644 --- a/config9.m4 +++ b/config9.m4 @@ -10,6 +10,8 @@ PHP_ARG_WITH([http-libcurl-dir], [], [ --with-http-libcurl-dir[=DIR] HTTP: where to find libcurl], $PHP_HTTP, $PHP_HTTP) PHP_ARG_WITH([http-libevent-dir], [], [ --with-http-libevent-dir[=DIR] HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, "") +PHP_ARG_WITH([http-libidn-dir], [], +[ --with-http-libidn-dir=[=DIR] HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, "") if test "$PHP_HTTP" != "no"; then @@ -68,7 +70,6 @@ if test "$PHP_HTTP" != "no"; then AC_DEFUN([HTTP_HAVE_PHP_EXT], [ extname=$1 haveext=$[PHP_]translit($1,a-z_-,A-Z__) - AC_MSG_CHECKING([for ext/$extname support]) if test -x "$PHP_EXECUTABLE"; then grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` @@ -96,13 +97,37 @@ if test "$PHP_HTTP" != "no"; then dnl ---- dnl STDC dnl ---- - AC_CHECK_HEADERS([netdb.h unistd.h]) + 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 arpa/inet.h]) PHP_CHECK_FUNC(gethostname, nsl) PHP_CHECK_FUNC(getdomainname, nsl) - PHP_CHECK_FUNC(getservbyport, nsl) - PHP_CHECK_FUNC(getservbyport_r, nsl) - PHP_CHECK_FUNC(getservbyname, nsl) - PHP_CHECK_FUNC(getservbyname_r, nsl) + PHP_CHECK_FUNC(mbrtowc) + PHP_CHECK_FUNC(mbtowc) + PHP_CHECK_FUNC(iswalnum) + PHP_CHECK_FUNC(inet_pton) + +dnl ---- +dnl IDN +dnl ---- + + AC_MSG_CHECKING([for idna.h]) + IDNA_DIR= + for i in "$PHP_HTTP_LIBIDN_DIR" "$IDN_DIR" /usr/local /usr /opt; do + if test -f "$i/include/idna.h"; then + IDNA_DIR=$i + break; + fi + done + if test "x$IDNA_DIR" = "x"; then + AC_MSG_RESULT([not found]) + else + AC_MSG_RESULT([found in $IDNA_DIR]) + AC_DEFINE([PHP_HTTP_HAVE_IDN], [1], [Have libidn support]) + PHP_ADD_INCLUDE($IDNA_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(idn, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) + fi dnl ---- dnl ZLIB @@ -177,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 + + 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 @@ -185,15 +218,15 @@ dnl ---- save_INCLUDES="$INCLUDES" INCLUDES= save_LIBS="$LIBS" - LIBS= + LIBS=-lcurl 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` - CURL_SSL_LIBS=() + CURL_SSL_LIBS="" if test "$CURL_SSL" = "SSL"; then AC_MSG_RESULT([yes]) AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ]) @@ -215,7 +248,7 @@ dnl ---- AC_CHECK_HEADER([openssl/ssl.h], [ AC_CHECK_HEADER([openssl/crypto.h], [ AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ]) - CURL_SSL_LIBS=(ssl crypto) + CURL_SSL_LIBS="ssl crypto" ]) ]) ], [ @@ -241,7 +274,7 @@ dnl ---- AC_CHECK_HEADER([gnutls.h], [ AC_CHECK_HEADER([gcrypt.h], [ AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ]) - CURL_SSL_LIBS=(gnutls gcrypt) + CURL_SSL_LIBS="gnutls gcrypt" ]) ]) ], [ @@ -271,15 +304,48 @@ dnl ---- ], [ AC_MSG_RESULT([no]) ]) + + AC_MSG_CHECKING([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP or literal "SRP"]) + AC_TRY_RUN([ + #include + int main(int argc, char *argv[]) { + CURL *ch = curl_easy_init(); + return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, CURL_TLSAUTH_SRP); + } + ], [ + AC_MSG_RESULT([CURL_TLSAUTH_SRP]) + AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], [CURL_TLSAUTH_SRP], [ ]) + AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [CURL_TLSAUTH_NONE], [ ]) + ], [ + AC_TRY_RUN([ + #include + int main(int argc, char *argv[]) { + CURL *ch = curl_easy_init(); + return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, "SRP"); + } + ], [ + AC_MSG_RESULT(["SRP"]) + AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], ["SRP"], [ ]) + AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [""], [ ]) + ], [ + AC_MSG_RESULT([neither]) + ], [ + AC_MSG_RESULT([neither]) + ]) + ], [ + AC_MSG_RESULT([neither]) + ]) INCLUDES="$save_INCLUDES" LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS" - for CURL_SSL_LIB in "${CURL_SSL_LIBS[[@]]}"; do - PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL_LIB], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD) - done + if test -n "$CURL_SSL_LIBS"; then + for CURL_SSL_LIB in $CURL_SSL_LIBS; do + PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL_LIB], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD) + done + fi dnl end compile tests @@ -331,7 +397,7 @@ dnl ---- AC_MSG_CHECKING([for libevent version, roughly]) if test -f "$EVENT_DIR/include/event2/event.h"; then - EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event-config.h | $AWK '{print $3}'`" + EVENT_VER="`$AWK '/_EVENT_VERSION/ {gsub(/\"/,\"\",$3); print $3}' < $EVENT_DIR/include/event2/event-config.h`" AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ]) else AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ]) @@ -379,7 +445,7 @@ dnl ---- PHP_ADD_INCLUDE([$HTTP_EXT_RAPHF_INCDIR]) fi ], [ - AC_MSG_ERROR([Please install pecl/raphf]) + AC_MSG_ERROR([Please install pecl/raphf and activate extension=raphf.$SHLIB_DL_SUFFIX_NAME in your php.ini]) ]) dnl ---- @@ -407,7 +473,7 @@ dnl ---- PHP_ADD_INCLUDE([$HTTP_EXT_PROPRO_INCDIR]) fi ], [ - AC_MSG_ERROR([Please install pecl/propro]) + AC_MSG_ERROR([Please install pecl/propro and activate extension=propro.$SHLIB_DL_SUFFIX_NAME in your php.ini]) ]) PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],