X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=25570f4febfb32f2ad53d03fde08660394b04fea;hp=f57308b27a460e333f4d7f30e02bd68b63b61c48;hb=b73ce1c6b6bd39c8962116e7f26c2ca9a106c8e9;hpb=074b1d2872d6ce1c7e35fe365aee9cf39ecace24

diff --git a/config.m4 b/config.m4
index f57308b..25570f4 100644
--- a/config.m4
+++ b/config.m4
@@ -5,6 +5,8 @@ PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
 [  --enable-http           Enable extended HTTP support])
 PHP_ARG_WITH([curl], [for CURL support],
 [  --with-curl[=DIR]       Include CURL support])
+PHP_ARG_WITH([mhash], [for mhash support],
+[  --with-mhash[=DIR]      Include mhash support])
 
 if test "$PHP_HTTP" != "no"; then
 
@@ -68,10 +70,43 @@ dnl ----
 
 	fi
 
+dnl ----
+dnl MHASH
+dnl ----
+
+	if test "$PHP_MHASH" != "no"; then
+		for i in $PHP_MHASH /usr/local /usr /opt/mhash; do
+			test -f $i/include/mhash.h && MHASH_DIR=$i && break
+		done
+	
+		if test -z "$MHASH_DIR"; then
+			AC_MSG_ERROR(Please reinstall libmhash - cannot find mhash.h)
+		fi
+	
+		PHP_ADD_INCLUDE($MHASH_DIR/include)
+		PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD)
+		AC_DEFINE(HAVE_LIBMHASH,1,[HAve mhash support])
+	fi
+
 dnl ----
 dnl DONE
 dnl ----
-	PHP_NEW_EXTENSION([http], [http.c http_api.c http_curl_api.c http_functions.c http_methods.c], [$ext_shared])
+	PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \
+		http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \
+		http_response_object.c http_exception_object.c http_requestpool_object.c \
+		http_api.c http_auth_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"
+	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
+	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
+	PHP_ADD_MAKEFILE_FRAGMENT
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
+
+dnl ---
+dnl odd warnings
+dnl ---
+dnl		CFLAGS=" -g -O2 -W -Wchar-subscripts -Wformat=2 -Wno-format-y2k -Wimplicit -Wmissing-braces -Wunused-variable -Wbad-function-cast -Wpointer-arith -Wsign-compare -Winline"
+dnl		PHP_SUBST([CFLAGS])
+
 fi