From: Michael Wallner <mike@php.net>
Date: Thu, 24 Jul 2008 08:50:41 +0000 (+0000)
Subject: disable build with libmagic
X-Git-Tag: RELEASE_1_6_2~15
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=ddedbe6192a32e1ca52d19217ac3d7f4f95396db;p=m6w6%2Fext-http

disable build with libmagic
---

diff --git a/config.w32 b/config.w32
index 95c1e99..d515e5c 100644
--- a/config.w32
+++ b/config.w32
@@ -116,13 +116,14 @@ if (PHP_HTTP != "no") {
 	} else {
 		WARNING("curl convenience functions not enabled; libraries and headers not found");
 	}
-
-	MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
-	if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&
-			CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
-		AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
-		AC_DEFINE("USE_MAGIC_STATIC", "", "");
-	} else {
-		WARNING("content type guessing not enabled; libraries and headers not found");
-	}
+/*
+//	MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib";
+//	if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") &&
+//			CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) {
+//		AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library");
+//		AC_DEFINE("USE_MAGIC_STATIC", "", "");
+//	} else {
+//		WARNING("content type guessing not enabled; libraries and headers not found");
+//	}
+*/
 }