projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
codename: client meltdown
[m6w6/ext-http]
/
config9.m4
diff --git
a/config9.m4
b/config9.m4
index c0950fb098f85b60b903ca5af09ee173a40eba8c..e32d14660864a7a48016764e29e31c3273c41086 100644
(file)
--- a/
config9.m4
+++ b/
config9.m4
@@
-339,7
+339,7
@@
dnl ----
AC_MSG_CHECKING([for libevent version, roughly])
if test -f "$EVENT_DIR/include/event2/event.h"; then
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.h | $AWK '{print $3}'`"
+ EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event
-config
.h | $AWK '{print $3}'`"
AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
else
AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
else
AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
@@
-381,7
+381,7
@@
dnl ----
fi
done
if test "x$HTTP_EXT_RAPHF_INCDIR" = "x"; then
fi
done
if test "x$HTTP_EXT_RAPHF_INCDIR" = "x"; then
- AC_MSG_
FAILURE
([not found])
+ AC_MSG_
ERROR
([not found])
else
AC_MSG_RESULT([$HTTP_EXT_RAPHF_INCDIR])
AC_DEFINE([PHP_HTTP_HAVE_PHP_RAPHF_H], [1], [Have ext/raphf support])
else
AC_MSG_RESULT([$HTTP_EXT_RAPHF_INCDIR])
AC_DEFINE([PHP_HTTP_HAVE_PHP_RAPHF_H], [1], [Have ext/raphf support])
@@
-407,7
+407,7
@@
dnl ----
fi
done
if test "x$HTTP_EXT_PROPRO_INCDIR" = "x"; then
fi
done
if test "x$HTTP_EXT_PROPRO_INCDIR" = "x"; then
- AC_MSG_
FAILURE
([not found])
+ AC_MSG_
ERROR
([not found])
else
AC_MSG_RESULT([$HTTP_EXT_PROPRO_INCDIR])
AC_DEFINE([PHP_HTTP_HAVE_PHP_PROPRO_H], [1], [Have ext/propro support])
else
AC_MSG_RESULT([$HTTP_EXT_PROPRO_INCDIR])
AC_DEFINE([PHP_HTTP_HAVE_PHP_PROPRO_H], [1], [Have ext/propro support])
@@
-462,13
+462,7
@@
dnl ----
php_http_buffer.c \
php_http.c \
php_http_client.c \
php_http_buffer.c \
php_http.c \
php_http_client.c \
- php_http_curl_client.c \
- php_http_client_datashare.c \
- php_http_curl_client_datashare.c \
- php_http_client_factory.c \
- php_http_client_interface.c \
- php_http_client_pool.c \
- php_http_curl_client_pool.c \
+ php_http_client_curl.c \
php_http_client_request.c \
php_http_client_response.c \
php_http_cookie.c \
php_http_client_request.c \
php_http_client_response.c \
php_http_cookie.c \
@@
-503,6
+497,10
@@
dnl ----
HTTP_SHARED_DEP([iconv])
HTTP_SHARED_DEP([json])
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_SUBST([HTTP_SHARED_LIBADD])
PHP_HTTP_HEADERS="
PHP_SUBST([HTTP_SHARED_LIBADD])
PHP_HTTP_HEADERS="