pajoye          Thu Jul 31 13:13:20 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/fileinfo       config.w32 
  Log:
  - update config to match config.m4
    (still does not build but will be fixed for alpha2)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.1.2.1 
php-src/ext/fileinfo/config.w32:1.1.2.2
--- php-src/ext/fileinfo/config.w32:1.1.2.1     Thu Jul 31 00:33:02 2008
+++ php-src/ext/fileinfo/config.w32     Thu Jul 31 13:13:20 2008
@@ -1,10 +1,22 @@
-// $Id: config.w32,v 1.1.2.1 2008/07/31 00:33:02 scottmac Exp $
+// $Id: config.w32,v 1.1.2.2 2008/07/31 13:13:20 pajoye Exp $
 // 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";
+       }
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to