install tweaks

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 7582cd9d76d1b446d2f15e3579335834d4fa83d7..403fafa5765519cd221e43c8ff7232af4f9622aa 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -195,19 +195,16 @@ dnl ----
        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