From: Pierre Joye <pajoye@php.net>
Date: Thu, 31 Jul 2008 13:14:22 +0000 (+0000)
Subject:  - MFB: update config to match config.m4
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~940
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3c5be8d1363de52e84e7e0aeceb138e8d54806c;p=php

 - MFB: update config to match config.m4
   (still does not build but will be fixed for alpha2)
---

diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32
index 7f00505a0e..f94929c81f 100644
--- a/ext/fileinfo/config.w32
+++ b/ext/fileinfo/config.w32
@@ -1,10 +1,22 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_WITH("fileinfo", "fileinfo support", "no");
+ARG_ENABLE("fileinfo", "fileinfo support", "no");
 
 if (PHP_FILEINFO != 'no') {
-	EXTENSION('fileinfo', 'fileinfo.c', null, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
-	ADD_SOURCES(configure_module_dirname + "/libmagick", "apprentice.c apptype.c ascmagic.c \
-	compress.c fsmagic.c funcs.c getopt_long.c is_tar.c magic.c print.c readelf.c softmagic.c", "fileinfo");
+
+		if (CHECK_HEADER_ADD_INCLUDE("dirent.h", "CFLAGS_FILEINFO") && 
+		CHECK_LIB("dirent_a.lib", "fileinfo", PHP_FILEINFO)) {
+
+		LIBMAGIC_SOURCES=" apprentice.c apptype.c ascmagic.c \
+			compress.c fsmagic.c funcs.c is_tar.c \
+			magic.c print.c \
+			readelf.c softmagic.c";
+
+		EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
+		ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, "fileinfo");
+	} else {
+		WARNING("fileinfo not enabled; libraries and headers not found");
+		PHP_FILEINFO = "no";
+	}
 }