- libevent diagnostics

[m6w6/ext-http] / config9.m4

diff --git a/config9.m4 b/config9.m4
index c11d6c0640131d7fcf981f2dc5dd09b99ce7ddad..bebb5a70c22836640bc2f526cb32bd9ba9b9748e 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -277,7 +277,7 @@ dnl ----
                if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then
                        AC_MSG_CHECKING([for event.h])
                        EVENT_DIR=
                if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then
                        AC_MSG_CHECKING([for event.h])
                        EVENT_DIR=

-                       for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
+                       for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do

                                if test -f "$i/include/event.h"; then
                                        EVENT_DIR=$i
                                        break
                                if test -f "$i/include/event.h"; then
                                        EVENT_DIR=$i
                                        break


@@ -288,6 +288,19 @@ dnl ----
                                AC_MSG_WARN([continuing without libevent support])
                        else
                                AC_MSG_RESULT([found in $EVENT_DIR])
                                AC_MSG_WARN([continuing without libevent support])
                        else
                                AC_MSG_RESULT([found in $EVENT_DIR])

+                               
+                               AC_MSG_CHECKING([for libevent version, roughly])
+                               EVENT_VER="1.1b or lower"
+                               if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
+                                       if test -f "$EVENT_DIR/include/evrpc.h"; then
+                                               EVENT_VER="1.4 or greater"
+                                       else
+                                               EVENT_VER="1.2 or greater"
+                                       fi
+                               fi
+                               AC_DEFINE_UNQUOTED([HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
+                               AC_MSG_RESULT([$EVENT_VER])
+                               

                                AC_MSG_CHECKING([for libcurl version >= 7.16.0])
                                AC_MSG_RESULT([$CURL_VERSION])
                                if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
                                AC_MSG_CHECKING([for libcurl version >= 7.16.0])
                                AC_MSG_RESULT([$CURL_VERSION])
                                if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then