MFH

diff --git a/ext/mime_magic/config.m4 b/ext/mime_magic/config.m4
index de7af20e6bcd161b8423fccff1c6d7bb89fb4efd..506c785630f25973abe54f872e4bac43d29624f8 100644 (file)
--- a/ext/mime_magic/config.m4
+++ b/ext/mime_magic/config.m4
@@ -1,28 +1,37 @@
+dnl
 dnl $Id$
-dnl config.m4 for extension mime_magic
+dnl
 
-PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
-[  --enable-mime-magic     Enable mime_magic support])
+PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
+[  --with-mime-magic[=FILE]  Include mime_magic support. FILE is the optional
+                            pathname to the magic.mime file.])
 
-if test "$PHP_MIME_MAGIC" = "yes"; then
-  dnl PHP_SUBST(MIME_MAGIC_SHARED_LIBADD)
+if test "$PHP_MIME_MAGIC" != "no"; then
 
   PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)
 
-  # Try to see if we can find the path of the magic file in its 
-  # default locations.
-  if test -f /usr/share/magic.mime ; then
-       PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic.mime
-  elif test -f /usr/share/magic ; then
-       PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic       
-  elif test -f /usr/share/misc/magic.mime ; then
-       PHP_MIME_MAGIC_FILE_PATH=/usr/share/misc/magic.mime
-  elif test -f /etc/magic ; then
-       PHP_MIME_MAGIC_FILE_PATH=/etc/magic
+  PHP_MIME_MAGIC_FILE_PATH=
+
+  dnl
+  dnl Try to see if we can find the path of the magic file in its default locations.
+  dnl
+  if test "$PHP_MIME_MAGIC" = "yes"; then
+    if test -f $PHP_MIME_MAGIC; then
+      PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
+    else
+      AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
+    fi
   else
-       PHP_MIME_MAGIC_FILE_PATH=""     
-  fi
+    MAGIC_MIME_LOCATIONS="/usr/share/magic.mime /usr/share/misc/magic.mime /etc/magic.mime"
 
+    for i in $MAGIC_MIME_LOCATIONS; do
+      if test -f $i; then
+        PHP_MIME_MAGIC_FILE_PATH=$i
+        break
+      fi
+    done
+  fi
+  
   AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic file path])
 
 fi