X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=b82a3a77a316234bf1767175314ab392ba71288a;hp=5f06a5cdb4395381257d5f55961772ce53a4acc6;hb=468e8d748d365811af4ce890fd8fc4c1f88cc08a;hpb=c7ff6df7b3f488c2d2cb5df1d3e64ff4ffbb2557 diff --git a/config9.m4 b/config9.m4 index 5f06a5c..b82a3a7 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\$` @@ -97,10 +98,93 @@ dnl ---- dnl STDC dnl ---- 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]) + 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(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([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) + AC_MSG_CHECKING([for libidn version]) + IDNA_VER=$(pkg-config --version libidn 2>/dev/null || echo unknown) + AC_MSG_RESULT([$IDNA_VER]) + AC_DEFINE_UNQUOTED([PHP_HTTP_LIBIDN_VERSION], "$IDNA_VER", [ ]) + else + AC_MSG_RESULT([not found]) + AC_MSG_CHECKING([for idn2.h]) + IDNA_DIR= + for i in "$PHP_HTTP_LIBIDN_DIR" "$IDN_DIR" /usr/local /usr /opt; do + if test -f "$i/include/idn2.h"; then + IDNA_DIR=$i + break; + fi + done + if test "x$IDNA_DIR" != "x"; then + AC_MSG_RESULT([found in $IDNA_DIR]) + AC_DEFINE([PHP_HTTP_HAVE_IDN2], [1], [Have libidn2 support]) + PHP_ADD_INCLUDE($IDNA_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(idn2, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) + AC_MSG_CHECKING([for libidn2 version]) + IDNA_VER=`$EGREP "define IDN2_VERSION " $IDNA_DIR/include/idn2.h | $SED -e's/^.*VERSION //g' -e 's/[[^0-9\.]]//g'` + AC_MSG_RESULT([$IDNA_VER]) + AC_DEFINE_UNQUOTED([PHP_HTTP_LIBIDN2_VERSION], "$IDNA_VER", [ ]) + else + AC_MSG_RESULT([not found]) + AC_CHECK_HEADERS([unicode/uidna.h]) + case $host_os in + darwin*) + PHP_CHECK_FUNC(uidna_IDNToASCII, icucore);; + *) + AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) + if test ! -x "$ICU_CONFIG"; then + ICU_CONFIG="icu-config" + fi + AC_MSG_CHECKING([for uidna_IDNToASCII]) + if ! test -x "$ICU_CONFIG"; then + ICU_CONFIG=icu-config + fi + if $ICU_CONFIG --exists 2>/dev/null >&2; then + save_LIBS=$LIBS + LIBS=$($ICU_CONFIG --ldflags) + AC_TRY_RUN([ + #include + int main(int argc, char *argv[]) { + return uidna_IDNToASCII(0, 0, 0, 0, 0, 0, 0); + } + ], [ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_UIDNA_IDNTOASCII], [1], [ ]) + LIBS=$save_LIBS + PHP_EVAL_LIBLINE(`$ICU_CONFIG --ldflags`, HTTP_SHARED_LIBADD) + ], [ + LIBS=$save_LIBS + AC_MSG_RESULT([no]) + ]) + fi + ;; + esac + fi + fi dnl ---- dnl ZLIB @@ -175,6 +259,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 @@ -183,15 +275,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], [ ]) @@ -213,7 +305,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" ]) ]) ], [ @@ -239,7 +331,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" ]) ]) ], [ @@ -269,15 +361,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 @@ -377,7 +502,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 ---- @@ -405,7 +530,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], @@ -437,12 +562,6 @@ dnl ---- fi ]) -dnl ---- -dnl JSON -dnl ---- - HTTP_HAVE_PHP_EXT([json]) - - dnl ---- dnl ICONV dnl ---- @@ -479,7 +598,6 @@ dnl ---- php_http_options.c \ php_http_params.c \ php_http_querystring.c \ - php_http_strlist.c \ php_http_url.c \ php_http_version.c \ " @@ -488,11 +606,10 @@ dnl ---- dnl shared extension deps HTTP_SHARED_DEP([hash]) HTTP_SHARED_DEP([iconv]) - HTTP_SHARED_DEP([json]) dnl extension deps PHP_ADD_EXTENSION_DEP([http], [raphf], true) - PHP_ADD_EXTENSION_DEP([http], [propo], true) + PHP_ADD_EXTENSION_DEP([http], [propro], true) PHP_SUBST([HTTP_SHARED_LIBADD]) @@ -531,11 +648,15 @@ dnl ---- php_http_options.h \ php_http_params.h \ php_http_querystring.h \ - php_http_strlist.h \ + php_http_response_codes.h \ php_http_url.h \ + php_http_utf8.h \ php_http_version.h \ " PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS) AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) + if $HTTP_HAVE_A_REQUEST_LIB; then + AC_DEFINE([PHP_HTTP_HAVE_CLIENT], [1], [Have HTTP client support]) + fi fi