Instead of hardcoding the path of magic.mime file, try to find the file

inside common paths for the file.

diff --git a/ext/mime_magic/config.m4 b/ext/mime_magic/config.m4
index 9342ed23064a56d40974348d7de7b56e40617bda..aca9094bef4c3c964e37d478f3ebf7d1fd1f8c06 100644 (file)
--- a/ext/mime_magic/config.m4
+++ b/ext/mime_magic/config.m4
@@ -8,4 +8,21 @@ if test "$PHP_MIME_MAGIC" = "yes"; then
   dnl PHP_SUBST(MIME_MAGIC_SHARED_LIBADD)
 
   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
+  else
+       PHP_MIME_MAGIC_FILE_PATH=""     
+  fi
+
+  AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic file path])
+
 fi

diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index 54a82202059528e0fa69ca9c627d5198d2b97fd9..770ef2f358c5255ea1854c43dc42865071ba14e1 100644 (file)
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -235,7 +235,7 @@ ZEND_GET_MODULE(mime_magic)
 /* {{{ PHP_INI
  */
 PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY("mime_magic.magicfile", "/usr/share/misc/magic.mime", PHP_INI_SYSTEM, OnUpdateString, magicfile, zend_mime_magic_globals, mime_magic_globals)
+STD_PHP_INI_ENTRY("mime_magic.magicfile", PHP_MIME_MAGIC_FILE_PATH, PHP_INI_SYSTEM, OnUpdateString, magicfile, zend_mime_magic_globals, mime_magic_globals)
 PHP_INI_END()
 /* }}} */