com php-src: Fix #70158: Building with static imap fails: ext/imap/config.w32
| From: | Christoph Michael Becker | Date: | Wed, 29 Jul 2015 15:00:37 +0000 |
| Subject: | com php-src: Fix #70158: Building with static imap fails: ext/imap/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88223@lists.php.net to get a copy of this message | ||
Commit: ce3c869d19f3acf4befae15a4e37f527c57fa92e
Author: Christoph M. Becker <cmb@php.net> Wed, 29 Jul 2015 17:00:37 +0200
Parents: 4e66cce87ce0e57a7394486412e61abcfc5f3520
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ce3c869d19f3acf4befae15a4e37f527c57fa92e
Log:
Fix #70158: Building with static imap fails
Static builds of ext/imap have duplicate symbols, and so won't link on Windows.
To get around this issue, we simply disallow static building of the extension.
Bugs:
https://bugs.php.net/70158
Changed paths:
M ext/imap/config.w32
Diff:
diff --git a/ext/imap/config.w32 b/ext/imap/config.w32
index 5778c34..9e36ed5 100644
--- a/ext/imap/config.w32
+++ b/ext/imap/config.w32
@@ -14,7 +14,7 @@ if (PHP_IMAP == "yes") {
CHECK_LIB("ws2_32.lib", "imap");
CHECK_LIB("Secur32.lib", "imap");
CHECK_LIB("crypt32.lib", "imap");
- EXTENSION("imap", "php_imap.c");
+ EXTENSION("imap", "php_imap..c", true);
ADD_FLAG("CFLAGS_IMAP", "/D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1 /D HAVE_IMAP2007a=1
/D HAVE_IMAP2007b=1 /D HAVE_IMAP_SSL=1");
AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);