cvs: php-src(PHP_5_3) /ext/mcrypt config.w32
| From: | Pierre-Alain Joye | Date: | Mon, 04 Aug 2008 21:39:44 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/mcrypt config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51980@lists.php.net to get a copy of this message | ||
pajoye Mon Aug 4 21:39:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mcrypt config.w32
Log:
- MFH: detect _a or normal lib
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/config.w32?r1=1.2.8.1&r2=1.2.8.2&diff_format=u
Index: php-src/ext/mcrypt/config.w32
diff -u php-src/ext/mcrypt/config.w32:1.2.8.1 php-src/ext/mcrypt/config.w32:1.2.8.2
--- php-src/ext/mcrypt/config.w32:1.2.8.1 Tue Jul 15 17:05:02 2008
+++ php-src/ext/mcrypt/config.w32 Mon Aug 4 21:39:44 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2.8.1 2008/07/15 17:05:02 pajoye Exp $
+// $Id: config.w32,v 1.2.8.2 2008/08/04 21:39:44 pajoye Exp $
// vim:ft=javascript
ARG_WITH("mcrypt", "mcrypt support", "no");
@@ -6,7 +6,7 @@
if (PHP_MCRYPT != "no") {
if (CHECK_HEADER_ADD_INCLUDE('mcrypt.h', 'CFLAGS_MCRYPT') &&
- CHECK_LIB('libmcrypt.lib', 'mcrypt') &&
+ CHECK_LIB('libmcrypt_a.lib;libmcrypt.lib', 'mcrypt') &&
CHECK_LIB('Advapi32.lib', 'mcrypt')
) {
EXTENSION('mcrypt', 'mcrypt.c');