diff options
| author | Sascha Schumann <sas@php.net> | 1999-05-21 08:20:13 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-05-21 08:20:13 +0000 |
| commit | fb407676a29912710690532e92a3a4433cc14ff6 (patch) | |
| tree | fe3b52e8f23a283a07db426be86f3a97c43a54c6 /ext/mcrypt | |
| parent | 0fe7fe30b576d34155aad1f32a1bbd23eada93e4 (diff) | |
| download | php-git-fb407676a29912710690532e92a3a4433cc14ff6.tar.gz | |
- fix compile issues for various packages (dbase, sysv*, zlib)
- some cleanup in mhash/mcrypt
Diffstat (limited to 'ext/mcrypt')
| -rw-r--r-- | ext/mcrypt/config.m4 | 3 | ||||
| -rw-r--r-- | ext/mcrypt/mcrypt.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4 index b1ff3d465a..1b20490d89 100644 --- a/ext/mcrypt/config.m4 +++ b/ext/mcrypt/config.m4 @@ -14,8 +14,7 @@ AC_ARG_WITH(mcrypt, 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" diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 6548ea2c16..a29e655499 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -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 @@ static int php_minit_mcrypt(INIT_FUNC_ARGS) 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); |