Yeah, that was a typo. :)
--Jani
On Tue, 28 Jan 2003, Marcus Börger wrote:
>At 02:00 28.01.2003, Jani Taskinen wrote:
>>sniper Mon Jan 27 20:00:16 2003 EDT
>>
>> Modified files:
>> /php4/ext/mime_magic config.m4
>> Log:
>> - Cleaned up and made less error-prone
>> - Changed --enable-mime-magic -> --with-mime-magic[=FILE] to allow
>> specifying of the file during configure.
>>
>>
>>Index: php4/ext/mime_magic/config.m4
>>diff -u php4/ext/mime_magic/config.m4:1.7 php4/ext/mime_magic/config.m4:1.8
>>--- php4/ext/mime_magic/config.m4:1.7 Sat Jan 25 05:51:04 2003
>>+++ php4/ext/mime_magic/config.m4 Mon Jan 27 20:00:15 2003
>>@@ -1,28 +1,37 @@
>>-dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
>>-dnl config.m4 for extension mime_magic
>>+dnl
>>+dnl $Id: config.m4,v 1.8 2003/01/28 01:00:15 sniper Exp $
>>+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.mime
>>+ 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
>
>
>As far as i understand that code you are looking for a file called "yes" now.
>
>I guess you meant if the configure value is neither yes nor no search for
>that beeing a file.
>With check against no already done this looks like "!=" instead of "=":
> if test "$PHP_MIME_MAGIC" != "yes"; then
> if test -f $PHP_MIME_MAGIC; then
>
--
<- For Sale! ->
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
