X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=9b6176f48f49105e89a250f861d66692847c9f2e;hp=81818fb465e42ca1af6d15a4a25a26f24f0f6208;hb=763dd73982474575c18acdc8db4cdc6eb6864ff3;hpb=03848def2b38db9a52ab905405d9ea9ffd130e85

diff --git a/config.m4 b/config.m4
index 81818fb..9b6176f 100644
--- 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
@@ -83,20 +84,20 @@ dnl ----
 		
 		AC_MSG_CHECKING([for SSL support in libcurl])
 		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
-		if test "$CURL_SSL" == "SSL"; then
+		if test "$CURL_SSL" = "SSL"; then
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
 			
 			AC_MSG_CHECKING([for SSL library used])
 			CURL_SSL_FLAVOUR=
 			for i in $CURL_LIBS; do
-				if test "$i" == "-lssl"; then
+				if test "$i" = "-lssl"; then
 					CURL_SSL_FLAVOUR="openssl"
 					AC_MSG_RESULT([openssl])
 					AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
 					AC_CHECK_HEADERS([openssl/crypto.h])
 					break
-				elif test "$i" == "-lgnutls"; then
+				elif test "$i" = "-lgnutls"; then
 					CURL_SSL_FLAVOUR="gnutls"
 					AC_MSG_RESULT([gnutls])
 					AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
@@ -190,24 +191,22 @@ dnl ----
 		http_response_object.c http_exception_object.c http_requestpool_object.c \
 		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])
+		http_info_api.c http_request_method_api.c http_encoding_api.c \
+		http_filter_api.c"
+	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, adds install-http target
+	PHP_ADD_MAKEFILE_FRAGMENT
+	dnl within src dir, installs http headers
+	ifdef([PHP_INSTALL_HEADERS], [PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADER_FILES)], [ ])
 
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi