cvs: php4 /ext/mcrypt config.m4
| From: | Jani Taskinen | Date: | Sat, 22 Sep 2001 17:55:18 +0000 |
| Subject: | cvs: php4 /ext/mcrypt config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7513@lists.php.net to get a copy of this message | ||
sniper Sat Sep 22 13:55:18 2001 EDT
Modified files:
/php4/ext/mcrypt config.m4
Log:
Moved the check for mcrypt_generic_deinit to the right place.
Index: php4/ext/mcrypt/config.m4
diff -u php4/ext/mcrypt/config.m4:1.20 php4/ext/mcrypt/config.m4:1.21
--- php4/ext/mcrypt/config.m4:1.20 Sat Sep 22 13:51:07 2001
+++ php4/ext/mcrypt/config.m4 Sat Sep 22 13:55:16 2001
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.20 2001/09/22 17:51:07 sniper Exp $
+dnl $Id: config.m4,v 1.21 2001/09/22 17:55:16 sniper Exp $
dnl
PHP_ARG_WITH(mcrypt, for mcrypt support,
@@ -21,6 +21,14 @@
[
PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
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,
[
@@ -28,13 +36,6 @@
],[
AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.)
],[
- -L$MCRYPT_DIR/lib
- ])
-
- PHP_CHECK_LIBRARY(mcrypt, mcrypt_generic_deinit,
- [
- AC_DEFINE(HAVE_MCRYPT_GENERIC_DEINIT,1,[ ])
- ],[],[
-L$MCRYPT_DIR/lib
])