Re: cvs: php4 /ext/crack config.m4
| From: | Jani Taskinen | Date: | Tue, 13 Nov 2001 11:28:19 +0000 |
| Subject: | Re: cvs: php4 /ext/crack config.m4 | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-8176@lists.php.net to get a copy of this message | ||
Nice.. :)
I'm testing a fix for this atm. Will commit soon.
--Jani
On Tue, 13 Nov 2001, Markus Fischer wrote:
>Shouldn't the lines
>
> for i in /usr/local/lib /usr/lib $PHP_CRACK $PHP_CRACK/cracklib; do
> test -f $i/lib/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/lib/libcrack.a &&
> CRACK_LIBDIR=$i
>
>be
>
> for i in /usr/local /usr $PHP_CRACK $PHP_CRACK/cracklib; do
> test -f $i/lib/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/lib/libcrack.a &&
> CRACK_LIBDIR=$i
>
>(removed '/lib' part in search path) ?
>
>And, shouldn't user defined PATH ($PHP_CRACK) override the
>default search path?
>
>- Markus
>
>ps: I know a bit late but I thought better asking first then
>throwing a patch :)
>
>On Fri, Oct 12, 2001 at 12:21:09AM -0000, Jani Taskinen wrote :
>> sniper Thu Oct 11 20:21:09 2001 EDT
>>
>> Modified files:
>> /php4/ext/crack config.m4
>> Log:
>> Fixed bug: #13556
>>
>>
>> Index: php4/ext/crack/config.m4
>> diff -u php4/ext/crack/config.m4:1.3 php4/ext/crack/config.m4:1.4
>> --- php4/ext/crack/config.m4:1.3 Sat Jul 28 03:09:42 2001
>> +++ php4/ext/crack/config.m4 Thu Oct 11 20:21:09 2001
>> @@ -1,23 +1,22 @@
>> -dnl $Id: config.m4,v 1.3 2001/07/28 07:09:42 sasha Exp $
>> +dnl $Id: config.m4,v 1.4 2001/10/12 00:21:09 sniper Exp $
>>
>> PHP_ARG_WITH(crack, whether to include crack support,
>> [ --with-crack[=DIR] Include crack support.])
>>
>> if test "$PHP_CRACK" != "no"; then
>> +
>> for i in /usr/local/lib /usr/lib $PHP_CRACK $PHP_CRACK/cracklib; do
>> - if test -f $i/libcrack.a; then
>> - CRACK_LIBDIR=$i
>> - fi
>> + test -f $i/lib/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/lib/libcrack.a &&
>> CRACK_LIBDIR=$i
>> done
>> +
>> for i in /usr/local/include /usr/include $PHP_CRACK $PHP_CRACK/cracklib; do
>> - if test -f $i/packer.h; then
>> - CRACK_INCLUDEDIR=$i
>> - fi
>> + test -f $i/packer.h && CRACK_INCLUDEDIR=$i
>> done
>>
>> if test -z "$CRACK_LIBDIR"; then
>> AC_MSG_ERROR(Cannot find the cracklib library file)
>> fi
>> +
>> if test -z "$CRACK_INCLUDEDIR"; then
>> AC_MSG_ERROR(Cannot find a cracklib header file)
>> fi
>> @@ -26,8 +25,7 @@
>> PHP_ADD_LIBRARY_WITH_PATH(crack, $CRACK_LIBDIR, CRACK_SHARED_LIBADD)
>>
>> PHP_EXTENSION(crack, $ext_shared)
>> -
>> + PHP_SUBST(CRACK_SHARED_LIBADD)
>> AC_DEFINE(HAVE_CRACK, 1, [ ])
>> fi
>>
>> -PHP_SUBST(CRACK_SHARED_LIBADD)
>>
>>
>>
>> --
>> PHP CVS Mailing List (http://www.php.net/)
>> To unsubscribe, e-mail: php-cvs-unsubscribe@lists.php.net
>> For additional commands, e-mail: php-cvs-help@lists.php.net
>> To contact the list administrators, e-mail: php-list-admin@lists.php.net
>
>