msopacua Fri Jan 31 18:01:38 2003 EDT
Modified files:
/php4/ext/mcrypt config.m4
Log:
Require 2.5.6+
MFB: Be -ltdl aware
Index: php4/ext/mcrypt/config.m4
diff -u php4/ext/mcrypt/config.m4:1.25 php4/ext/mcrypt/config.m4:1.26
--- php4/ext/mcrypt/config.m4:1.25 Fri Jan 3 14:49:44 2003
+++ php4/ext/mcrypt/config.m4 Fri Jan 31 18:01:36 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25 2003/01/03 19:49:44 derick Exp $
+dnl $Id: config.m4,v 1.26 2003/01/31 23:01:36 msopacua Exp $
dnl
AC_DEFUN(PHP_MCRYPT_CHECK_VERSION,[
@@ -8,13 +8,13 @@
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 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
