cvs: php-src(PHP_5_3) /ext/fileinfo Makefile.frag config.m4 fileinfo.c

jani Fri Jul 25 09:16:23 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/fileinfo Makefile.frag Modified files: /php-src/ext/fileinfo config.m4 fileinfo.c Log: MFH: enable fileinfo by default http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.11&r2=1.11.2.1&diff_format=u Index: php-src/ext/fileinfo/config.m4 diff -u php-src/ext/fileinfo/config.m4:1.11 php-src/ext/fileinfo/config.m4:1.11.2.1 --- php-src/ext/fileinfo/config.m4:1.11 Thu Jul 24 14:22:30 2008 +++ php-src/ext/fileinfo/config.m4 Fri Jul 25 09:16:22 2008 @@ -1,23 +1,10 @@ -dnl $Id: config.m4,v 1.11 2008/07/24 14:22:30 tony2001 Exp $ +dnl $Id: config.m4,v 1.11.2.1 2008/07/25 09:16:22 jani Exp $ dnl config.m4 for extension fileinfo -PHP_ARG_WITH(fileinfo, for fileinfo support, -[ --with-fileinfo=DIR Include fileinfo support]) +PHP_ARG_ENABLE(fileinfo, for fileinfo support, +[ --disable-fileinfo Disable fileinfo support], yes) if test "$PHP_FILEINFO" != "no"; then - MAGIC_MIME_DIRS="/usr/local/share/file /usr/share/file /usr/share/misc/file /etc /usr/share/misc" - MAGIC_MIME_FILENAMES="magic magic.mime" - - for i in $MAGIC_MIME_DIRS; do - for j in $MAGIC_MIME_FILENAMES; do - if test -f "$i/$j"; then - PHP_DEFAULT_MAGIC_FILE="$i/$j" - break - fi - done - done - - AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic file path]) libmagic_sources=" \ libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ @@ -26,8 +13,9 @@ libmagic/readelf.c libmagic/softmagic.c" PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) - PHP_SUBST(FILEINFO_SHARED_LIBADD) PHP_ADD_BUILD_DIR($ext_builddir/libmagic) AC_CHECK_FUNCS([utimes]) + + PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20&r2=1.20.2.1&diff_format=u Index: php-src/ext/fileinfo/fileinfo.c diff -u php-src/ext/fileinfo/fileinfo.c:1.20 php-src/ext/fileinfo/fileinfo.c:1.20.2.1 --- php-src/ext/fileinfo/fileinfo.c:1.20 Thu Jul 24 15:07:37 2008 +++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 09:16:22 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fileinfo.c,v 1.20 2008/07/24 15:07:37 tony2001 Exp $ */ +/* $Id: fileinfo.c,v 1.20.2.1 2008/07/25 09:16:22 jani Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -44,10 +44,6 @@ struct magic_set *magic; }; -#ifndef PHP_DEFAULT_MAGIC_FILE -#define PHP_DEFAULT_MAGIC_FILE NULL -#endif - #ifdef ZEND_ENGINE_2 /* {{{ */ static zend_object_handlers finfo_object_handlers; http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/Makefile.frag?view=markup&rev=1.1 Index: php-src/ext/fileinfo/Makefile.frag +++ php-src/ext/fileinfo/Makefile.frag $(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c