It still looks for '/usr/share/magic' file thus
your fix doesn't fix anything.
Attached is a bit better version of the config.m4,
please let me know if it's ok to commit.
--Jani
On Sat, 25 Jan 2003, Hartmut Holzgraefe wrote:
>hholzgra Sat Jan 25 05:51:04 2003 EDT
>
> Modified files:
> /php4/ext/mime_magic config.m4
> Log:
> suggesting a plain magic file insteat of a mime one is a bad idea
>
>
>Index: php4/ext/mime_magic/config.m4
>diff -u php4/ext/mime_magic/config.m4:1.6 php4/ext/mime_magic/config.m4:1.7
>--- php4/ext/mime_magic/config.m4:1.6 Tue Sep 24 02:37:17 2002
>+++ php4/ext/mime_magic/config.m4 Sat Jan 25 05:51:04 2003
>@@ -1,4 +1,4 @@
>-dnl $Id: config.m4,v 1.6 2002/09/24 06:37:17 sas Exp $
>+dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
> dnl config.m4 for extension mime_magic
>
> PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
>@@ -18,7 +18,7 @@
> 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=/etc/magic.mime
> else
> PHP_MIME_MAGIC_FILE_PATH=""
> fi
>
>
>
>
--
<- For Sale! ->
dnl
dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
dnl
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" != "no"; then
PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)
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
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
