ws

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 81818fb465e42ca1af6d15a4a25a26f24f0f6208..ff1f707aab3d0f413dd1235ea628bc788082b77a 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,5 +1,6 @@
 dnl config.m4 for pecl/http
 dnl $Id$
+dnl vim: noet ts=1 sw=1
 
 PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
 [  --enable-http           Enable extended HTTP support])
@@ -29,7 +30,7 @@ dnl ----
        AC_MSG_CHECKING([for zlib.h])
        ZLIB_DIR=
        for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
-               if test -r "$i/include/zlib.h"; then
+               if test -f "$i/include/zlib.h"; then
                        ZLIB_DIR=$i
                        break;
                fi
@@ -52,7 +53,7 @@ dnl ----
                AC_MSG_CHECKING([for curl/curl.h])
                CURL_DIR=
                for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
-                       if test -r "$i/include/curl/curl.h"; then
+                       if test -f "$i/include/curl/curl.h"; then
                                CURL_DIR=$i
                                break
                        fi
@@ -191,23 +192,20 @@ dnl ----
                http_api.c http_cache_api.c http_request_api.c http_date_api.c \
                http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
                http_info_api.c http_request_method_api.c http_encoding_api.c"
-       PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
+       PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
        PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
        PHP_SUBST([HTTP_SHARED_LIBADD])
 
-       HTTP_HEADER_FILES="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
+       PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
                php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
                php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
-               php_http_encodig_api.h"
-       PHP_SUBST([HTTP_HEADER_FILES])
+               php_http_encoding_api.h phpstr/phpstr.h"
+       PHP_SUBST([PHP_HTTP_HEADERS])
 
-       ifdef([PHP_INSTALL_HEADERS],
-       [
-               PHP_INSTALL_HEADERS(ext/http, $HTTP_HEADER_FILES)
-               PHP_INSTALL_HEADERS(ext/http/phpstr, [phpstr/phpstr.h])
-       ], [
-               PHP_ADD_MAKEFILE_FRAGMENT
-       ])
+       dnl outside src dir
+       PHP_ADD_MAKEFILE_FRAGMENT
+       dnl within src dir
+       ifdef([PHP_INSTALL_HEADERS], [PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADER_FILES)], [ ])
 
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi