[PHP4BETA] CVS update: php4/ext/mcrypt

Date: Friday May 21, 1999 @ 4:20 Author: sas Update of /repository/php4/ext/mcrypt In directory php:/tmp/cvs-serv23033/ext/mcrypt Modified Files: config.m4 mcrypt.c Log Message: - fix compile issues for various packages (dbase, sysv*, zlib) - some cleanup in mhash/mcrypt Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.2 php4/ext/mcrypt/config.m4:1.3 --- php4/ext/mcrypt/config.m4:1.2 Sat May 1 07:14:22 1999 +++ php4/ext/mcrypt/config.m4 Fri May 21 04:20:11 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/05/01 11:14:22 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/05/21 08:20:11 sas Exp $ dnl config.m4 for extension mcrypt dnl don't forget to call PHP_EXTENSION(mcrypt) @@ -14,8 +14,7 @@ fi done if test "$MCRYPT_DIR" = ""; then - AC_MSG_ERROR(Please install mcrypt.h and libmcrypt.a accordingly to the do -cumentation - I cannot find mcrypt.h) + AC_MSG_ERROR(Please reinstall libmcrypt - I cannot find mcrypt.h) fi INCLUDES="$INCLUDES -I$MCRYPT_DIR/include" EXTRA_LIBS="$EXTRA_LIBS -L$MCRYPT_DIR/lib -lmcrypt" Index: php4/ext/mcrypt/mcrypt.c diff -u php4/ext/mcrypt/mcrypt.c:1.14 php4/ext/mcrypt/mcrypt.c:1.15 --- php4/ext/mcrypt/mcrypt.c:1.14 Sat May 1 10:41:46 1999 +++ php4/ext/mcrypt/mcrypt.c Fri May 21 04:20:12 1999 @@ -34,8 +34,8 @@ #include "php_mcrypt.h" #include "fcntl.h" -/* we should find a way to figure out whether RC6/IDEA are available */ #define NON_FREE +#define MCRYPT2 #include "mcrypt.h" function_entry mcrypt_functions[] = { @@ -138,8 +138,10 @@ MCRYPT_ENTRY(TripleDES); MCRYPT_ENTRY(ThreeWAY); MCRYPT_ENTRY(GOST); -#ifdef MCRYPT2 +#ifdef CRYPT MCRYPT_ENTRY(CRYPT); +#endif +#ifdef DES_COMPAT MCRYPT_ENTRY(DES_COMPAT); #endif MCRYPT_ENTRY(SAFER64); -- PHP 4 Beta