Re: libmcrypt patch

On Fri, 15 Dec 2000, Anil Madhavapeddy wrote: > Quoting Jani Taskinen <sniper@iki.fi>: > > On Thu, 14 Dec 2000, Anil Madhavapeddy wrote: > > > > > >It seems that MCRYPT_API_VERSION is the only really reliable > > >way to confirm if it really is 2.2 over 2.4 > > > > I suggest that we just require >= 2.4.7. > > I just compiled it with latest CVS and it works fine. > > (Within RH 6.2, all from tar.gz's ;) > > > > I still can't get it to work on OpenBSD 2.8 w/ libmcrypt 2.4.7; > here is the error: I sispect you have some old .h file lying around. This failure occurs when mcrypt 2.4.x is installed, but a .h file of mcrypt 2.2.x is detected IIRC. Derick > > /bin/sh /usr/local/src/php-4.0.4RC6/libtool --silent --mode=compile gcc -I. - > I/usr/local/src/php-4.0.4RC6/ext/mcrypt -I/usr/local/src/php-4.0.4RC6/main - > I/usr/local/src/php-4.0.4RC6 -I/usr/lib/apache/include -I/usr/local/src/php- > 4.0.4RC6/Zend -I/usr/local/include -I/usr/local/include/c-client - > I/usr/local/include/mysql -I/usr/local/src/php-4.0.4RC6/ext/xml/expat/xmltok - > I/usr/local/src/php-4.0.4RC6/ext/xml/expat/xmlparse -I/usr/local/src/php- > 4.0.4RC6/TSRM -DDEV_RANDOM=/dev/arandom -DMOD_SSL=206106 -DEAPI -DUSE_EXPAT - > DXML_BYTE_ORDER=12 -g -O2 -c mcrypt.c > mcrypt.c:222: warning: `MCRYPT_FAILED' redefined > /usr/local/include/mcrypt.h:30: warning: this is the location of the previous > definition > mcrypt.c: In function `php_minit_mcrypt': > mcrypt.c:260: `MCRYPT_BLOWFISH_448' undeclared (first use in this function) > mcrypt.c:260: (Each undeclared identifier is reported only once > mcrypt.c:260: for each function it appears in.) > mcrypt.c:261: warning: passing arg 3 of `zend_register_long_constant' makes inte > > It is incorrectly detecting mcrypt-2.2 instead of 2.4, due to the fact > that my copy of 2.4.7 has init_module defined, afaiks. Only way it works > for me is with my previous patch in this thread to reverse the checks. > > How it's working for you is what is puzzling me; do you have init_mcrypt > defined in your copy of libmcrypt-2.4? > > > >How about using AC_EGREP_HEADER to look for MCRYPT_API_VERSION > > >and seeing what it is set to? 2.4 will be > 20000101 and 2.2 > > > > #define MCRYPT_API_VERSION 20000320 > > > > This is from 2.4.7. I would make it so that if this is lower > > --> configure bails out and says " >= 2.4.7 required". > > > > I picked slightly laxer dates in case the author had made small > changes to the API along the 2.4 branch, but that's probably not > needed. > > It would be a pity to totally drop support for 2.2, as it seems > to be bundled a lot with distros, and the PHP code works pretty well. > > -- > Anil Madhavapeddy, <anil@recoil.org> >