From: Melvyn Sopacua <msopacua@php.net>
Date: Fri, 31 Jan 2003 23:01:36 +0000 (+0000)
Subject: Require 2.5.6+
X-Git-Tag: RELEASE_0_5~1341
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f20d394e2d22b78529e4bb549d92358b096c221a;p=php

Require 2.5.6+
MFB: Be -ltdl aware
---

diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 3aa176ff8a..183cc324f6 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -8,13 +8,13 @@ AC_DEFUN(PHP_MCRYPT_CHECK_VERSION,[
   AC_MSG_CHECKING(for libmcrypt version)
   AC_EGREP_CPP(yes,[
 #include <mcrypt.h>
-#if MCRYPT_API_VERSION >= 20020309
+#if MCRYPT_API_VERSION >= 20021217
   yes
 #endif
   ],[
-    AC_MSG_RESULT(>= 2.5.3)
+    AC_MSG_RESULT(>= 2.5.6)
   ],[
-    AC_MSG_ERROR(libmcrypt version 2.5.3 or greater required.)
+    AC_MSG_ERROR(libmcrypt version 2.5.6 or greater required.)
   ])
   CPPFLAGS=$old_CPPFLAGS
 ])  
@@ -36,10 +36,27 @@ if test "$PHP_MCRYPT" != "no"; then
 
   PHP_MCRYPT_CHECK_VERSION
 
-  PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
+  PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, 
+  [
+    PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
+    AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
+  ],[
+    unset found
+    unset ac_cv_lib_mcrypt_mcrypt_module_open
+    PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+    [
+      AC_DEFINE(HAVE_LIBMCRYPT,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
+  ])
+
   PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD)
   PHP_ADD_INCLUDE($MCRYPT_DIR/include)
-  AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
 
   PHP_SUBST(MCRYPT_SHARED_LIBADD)
   PHP_NEW_EXTENSION(mcrypt, mcrypt.c, $ext_shared)