diff options
| -rw-r--r-- | ext/fileinfo/config.w32 | 11 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/config.h | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32 index 08d09e61f5..7f00505a0e 100644 --- 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 c47117bf10..7e093b0e35 100644 --- 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 |