- Added a patch that changed the checking of which version of libmcrypt is

  installed (Thanks to: Anil Madhavapeddy <anil@recoil.org>)

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 9082c77fb5b8a158e25ce7e3ce59437568159178..032078565330ae32db599d79b718db46b88ab274 100644 (file)
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -27,11 +27,11 @@ if test "$PHP_MCRYPT" != "no"; then
   AC_CHECK_LIB(mcrypt, mcrypt_module_open, [LIBS="$LIBS -lltdl"],[ ],)
   LIBS=$old_LIBS
   LDFLAGS="$old_LDFLAGS"
-  if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
-       AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ])
-  elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
+  if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
     AC_ADD_LIBRARY(ltdl)
-       AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
+    AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
+  elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
+    AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ])
   else
     AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.)
   fi