save funccall

[m6w6/ext-http] / config9.m4

diff --git a/config9.m4 b/config9.m4
index aff67ca6656c71463addfca0f9fd68f82c09741e..ce63132d6fd090cd2fdd32c6d84ff2089eddb88a 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -187,10 +187,9 @@ dnl ----
                        save_LIBS="$LIBS"
                        LIBS=
                        save_CFLAGS="$CFLAGS"
-                       CFLAGS=`$CURL_CONFIG --cflags`
+                       CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
                        save_LDFLAGS="$LDFLAGS"
-                       LDFLAGS=`$CURL_CONFIG --libs`
-                       LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+                       LDFLAGS="$LDFLAGS `$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
                
                        AC_MSG_CHECKING([for SSL support in libcurl])
                        CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
@@ -289,50 +288,45 @@ dnl ----
        if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
                AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
        else
-               HTTP_HAVE_PHP_EXT([event], [
-                       AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
+               AC_MSG_CHECKING([for event2/event.h])
+               EVENT_DIR=
+               for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
+                       if test -f "$i/include/event.h"; then
+                               EVENT_DIR=$i
+                               break
+                       fi
+               done
+               if test "x$EVENT_DIR" = "x"; then
+                       AC_MSG_RESULT([not found])
+                       AC_MSG_WARN([continuing without libevent support])
                        AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
-               ], [
-                       AC_MSG_CHECKING([for event2/event.h])
-                       EVENT_DIR=
-                       for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
-                               if test -f "$i/include/event.h"; then
-                                       EVENT_DIR=$i
-                                       break
-                               fi
-                       done
-                       if test "x$EVENT_DIR" = "x"; then
-                               AC_MSG_RESULT([not found])
-                               AC_MSG_WARN([continuing without libevent support])
-                               AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
+               else
+                       AC_MSG_RESULT([found in $EVENT_DIR])
+                       
+                       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}'`"
+                               AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
                        else
-                               AC_MSG_RESULT([found in $EVENT_DIR])
-                               
-                               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}'`"
-                                       AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
-                               else
-                                       AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
-                                       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
+                               AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
+                               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.1b or lower"
+                                               EVENT_VER="1.2 or greater"
                                        fi
+                               else
+                                       EVENT_VER="1.1b or lower"
                                fi
-                               AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
-                               AC_MSG_RESULT([$EVENT_VER])
-                               
-                               PHP_ADD_INCLUDE($EVENT_DIR/include)
-                               PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-                               AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
                        fi
-               ])
+                       AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
+                       AC_MSG_RESULT([$EVENT_VER])
+                       
+                       PHP_ADD_INCLUDE($EVENT_DIR/include)
+                       PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                       AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
+               fi
        fi
 
 dnl ----