From: Michael Wallner <mike@php.net>
Date: Fri, 2 Sep 2005 14:49:54 +0000 (+0000)
Subject: - no need for additional configure argument; just check and enable
X-Git-Tag: RELEASE_0_13_0~31
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a52c5612eddc62880c3ff4b8b43f991f8d1e2523;p=m6w6%2Fext-http

- no need for additional configure argument; just check and enable
---

diff --git a/config.w32 b/config.w32
index 1c8b589..7981722 100644
--- a/config.w32
+++ b/config.w32
@@ -2,17 +2,14 @@
 // $Id$
 
 ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
-ARG_WITH("mhash", "mhash support", "no");
 
 if (PHP_HTTP != "no") {
 
-	if (PHP_MHASH != "no") {
-		if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
-				CHECK_LIB('libmhash.lib', 'http')) {
-			AC_DEFINE('HAVE_LIBMHASH', 1 , "Have mhash library");
-		} else {
-			WARNING("mhash not enabled; libraries and headers not found");
-		}
+	if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&
+			CHECK_LIB('libmhash.lib', 'http', PHP_HTTP)) {
+		AC_DEFINE('HTTP_HAVE_MHASH', 1 , "Have mhash library");
+	} else {
+		WARNING("mhash etag generator not enabled; libraries and headers not found");
 	}
 
 	EXTENSION("http",
@@ -26,7 +23,7 @@ if (PHP_HTTP != "no") {
 		null,
 		"/I\"" + configure_module_dirname + "/phpstr\"");
 	ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
-	AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support")
+	AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
     if (CHECK_LIB("libcurl.lib", "http", PHP_HTTP) &&
             CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_HTTP") &&
             CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&