diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-11-07 21:28:23 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-11-07 21:28:23 +0000 |
| commit | d3ed72e0cec82282b6d7b74ca71c84e3339470a7 (patch) | |
| tree | ddf4c573002ff3cf4276b71bb358487960f1ddc0 /ext/fileinfo/config.m4 | |
| parent | 0b785996cf8c59ed753b70be76d933d39317055f (diff) | |
| download | php-git-d3ed72e0cec82282b6d7b74ca71c84e3339470a7.tar.gz | |
Improved mime magic file detection
# Patch from BSD ports
Diffstat (limited to 'ext/fileinfo/config.m4')
| -rw-r--r-- | ext/fileinfo/config.m4 | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 index f1c15c006b..686f6e2780 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -47,13 +47,18 @@ if test "$PHP_FILEINFO" != "no"; then -L$FILEINFO_DIR/lib ]) - MAGIC_MIME_LOCATIONS="/usr/local/share/file/magic /usr/share/file/magic /usr/share/misc/file/magic /etc/magic /usr/share/misc" - for i in $MAGIC_MIME_LOCATIONS; do - if test -f $i; then - PHP_DEFAULT_MAGIC_FILE=$i - break - fi + 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]) PHP_SUBST(FILEINFO_SHARED_LIBADD) |