Improved mime magic file detection

# Patch from BSD ports

diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index f1c15c006bd070914839234f3fdd0c43b3267194..686f6e2780251ddd40655c006d725103d02fcf1b 100644 (file)
--- 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)