cvs: php4(PHP_4_3) /ext/mcrypt config.m4

msopacua Fri Jan 31 10:06:46 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/mcrypt config.m4 Log: "The ugly patch" Make mcrypt compile, when we finally are free of -ltdl. Bug #20926. # There's a variant, with a config option, but that's an ugly word(tm) Index: php4/ext/mcrypt/config.m4 diff -u php4/ext/mcrypt/config.m4:1.24 php4/ext/mcrypt/config.m4:1.24.4.1 --- php4/ext/mcrypt/config.m4:1.24 Tue Mar 12 11:24:05 2002 +++ php4/ext/mcrypt/config.m4 Fri Jan 31 10:06:45 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.24 2002/03/12 16:24:05 sas Exp $ +dnl $Id: config.m4,v 1.24.4.1 2003/01/31 15:06:45 msopacua Exp $ dnl PHP_ARG_WITH(mcrypt, for mcrypt support, @@ -29,15 +29,28 @@ ]) ],[ - PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, + unset found + unset ac_cv_lib_mcrypt_mcrypt_module_open + PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, [ - AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) - ],[ - AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.]) - ],[ - -L$MCRYPT_DIR/lib - ]) + AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) + PHP_CHECK_LIBRARY(mcrypt, mcrypt_generic_deinit, + [ + AC_DEFINE(HAVE_MCRYPT_GENERIC_DEINIT,1,[ ]) + ],[],[ + -L$MCRYPT_DIR/lib + ]) + ],[ + PHP_CHECK_LIBRARY(mcrypt, init_mcrypt, + [ + AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) + ],[ + AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.]) + ],[ + -L$MCRYPT_DIR/lib + ]) + ],[]) ],[ -L$MCRYPT_DIR/lib -lltdl ])