MFH(r-1.10): rearranged search order for the magic file to avoid further

confusions

diff --git a/ext/mime_magic/config.m4 b/ext/mime_magic/config.m4
index e65565724de98c83e29af0217f7630f6324a13f8..b47b1ba97b965962ac8378e60f8c0aa702f038ae 100644 (file)
--- a/ext/mime_magic/config.m4
+++ b/ext/mime_magic/config.m4
@@ -22,7 +22,7 @@ if test "$PHP_MIME_MAGIC" != "no"; then
       AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
     fi
   else
-    MAGIC_MIME_LOCATIONS="/usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
+    MAGIC_MIME_LOCATIONS="/usr/local/apache/conf/magic /usr/local/etc/apache/conf/magic /etc/apache/magic /etc/httpd/conf/magic /usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
 
     for i in $MAGIC_MIME_LOCATIONS; do
       if test -f $i; then