scottmac Thu Jul 31 00:33:02 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/fileinfo config.w32 /php-src/ext/fileinfo/libmagic config.h Log: MFH: get fileinfo building again on Windows http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.1&r2=1.1.2.1&diff_format=u Index: php-src/ext/fileinfo/config.w32 diff -u php-src/ext/fileinfo/config.w32:1.1 php-src/ext/fileinfo/config.w32:1.1.2.1 --- php-src/ext/fileinfo/config.w32:1.1 Wed Sep 7 11:16:57 2005 +++ php-src/ext/fileinfo/config.w32 Thu Jul 31 00:33:02 2008 @@ -1,13 +1,10 @@ -// $Id: config.w32,v 1.1 2005/09/07 11:16:57 edink Exp $ +// $Id: config.w32,v 1.1.2.1 2008/07/31 00:33:02 scottmac Exp $ // vim:ft=javascript 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"); } - http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/config.h?r1=1.3&r2=1.3.2.1&diff_format=u Index: php-src/ext/fileinfo/libmagic/config.h diff -u php-src/ext/fileinfo/libmagic/config.h:1.3 php-src/ext/fileinfo/libmagic/config.h:1.3.2.1 --- php-src/ext/fileinfo/libmagic/config.h:1.3 Thu Jul 24 13:40:21 2008 +++ php-src/ext/fileinfo/libmagic/config.h Thu Jul 31 00:33:02 2008 @@ -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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php