- move around
authorMichael Wallner <mike@php.net>
Fri, 2 Sep 2005 14:55:43 +0000 (14:55 +0000)
committerMichael Wallner <mike@php.net>
Fri, 2 Sep 2005 14:55:43 +0000 (14:55 +0000)
config.w32

index 79817229b68541307b3df838eb8cd370bda38dca..1a73d7450f32c1ed6a0cf25e619389ff1310cb23 100644 (file)
@@ -5,13 +5,6 @@ ARG_ENABLE("http", "whether to enable extended HTTP support", "no");
 
 if (PHP_HTTP != "no") {
 
 
 if (PHP_HTTP != "no") {
 
-       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",
                "missing.c http.c http_functions.c http_exception_object.c "+
                "http_util_object.c http_message_object.c http_requestpool_object.c "+
        EXTENSION("http",
                "missing.c http.c http_functions.c http_exception_object.c "+
                "http_util_object.c http_message_object.c http_requestpool_object.c "+
@@ -24,6 +17,14 @@ if (PHP_HTTP != "no") {
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
+
+       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");
+       }
+
     if (CHECK_LIB("libcurl.lib", "http", PHP_HTTP) &&
             CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_HTTP") &&
             CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&
     if (CHECK_LIB("libcurl.lib", "http", PHP_HTTP) &&
             CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_HTTP") &&
             CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) &&