MFH: get fileinfo building again on Windows

diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32
index 08d09e61f5ca10e0d9a88235c5a59cbab8a3f001..7f00505a0ea49c859fdc2a27bfe79cbece6fc191 100644 (file)
--- a/ext/fileinfo/config.w32
+++ b/ext/fileinfo/config.w32
@@ -3,11 +3,8 @@
 
 ARG_WITH("fileinfo", "fileinfo support", "no");
 
-if (PHP_FILEINFO != 'no' && 
-               CHECK_HEADER_ADD_INCLUDE('magic.h', 'CFLAGS_FILEINFO') &&
-               CHECK_LIB(PHP_DEBUG != 'no'?'libmagic-staticd.lib':'libmagic-static.lib', 
-                       'fileinfo', PHP_FILEINFO)) {
-       EXTENSION('fileinfo', 'fileinfo.c');
-       AC_DEFINE('USE_MAGIC_STATIC', '', '');
+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");
 }
-

diff --git a/ext/fileinfo/libmagic/config.h b/ext/fileinfo/libmagic/config.h
index c47117bf101e5512ccac8f3660f00d7b7ef3fa6f..7e093b0e35ebaec4abf0583421628b9fef616c83 100644 (file)
--- a/ext/fileinfo/libmagic/config.h
+++ b/ext/fileinfo/libmagic/config.h
@@ -1,4 +1,9 @@
-#include <php_config.h>
+#ifdef PHP_WIN32
+# include "config.w32.h"
+#else
+# include <php_config.h>
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif