diff options
| author | Jani Taskinen <jani@php.net> | 2008-07-25 09:16:09 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-07-25 09:16:09 +0000 |
| commit | 419a40f14aef0ffe9ee2df40ce61263977962ef5 (patch) | |
| tree | b874a2d9b2f95aad3440d8a635b0d9d7207dd55a /ext/fileinfo/config.m4 | |
| parent | a1981bf2d836359fda9cac2394c695a3f61e7fac (diff) | |
| download | php-git-419a40f14aef0ffe9ee2df40ce61263977962ef5.tar.gz | |
- Enable fileinfo by default
Diffstat (limited to 'ext/fileinfo/config.m4')
| -rw-r--r-- | ext/fileinfo/config.m4 | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 index 7a5a170caa..0229bbebfc 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -1,23 +1,10 @@ dnl $Id$ 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 @@ if test "$PHP_FILEINFO" != "no"; then 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 |