com php-src: ext/imap/config.m4: fix ac_cv_u8t_decompos e check: ext/imap/config.m4
| From: | Nikita Popov | Date: | Sat, 09 Dec 2017 18:05:45 +0000 |
| Subject: | com php-src: ext/imap/config.m4: fix ac_cv_u8t_decompos e check: ext/imap/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100545@lists.php.net to get a copy of this message | ||
Commit: 1b10e6318b900476e4597d002a307ce6f9c954e5
Author: Michael Heimpold <mhei@heimpold.de> Sun, 26 Nov 2017 18:29:42 +0100
Committer: Nikita Popov <nikita.ppv@gmail.com> Sat, 9 Dec 2017 19:05:45 +0100
Parents: 1b29dc0b1c4836085a17cbf2f59dae8aeb85424c
Branches: PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b10e6318b900476e4597d002a307ce6f9c954e5
Log:
ext/imap/config.m4: fix ac_cv_u8t_decompose check
Once upon the time, commit c58f63a38ae19caaab339c61486fc3bd7e5894f9
changed the check from U8T_CANONICAL to U8T_DECOMPOSE. However,
the autoconf cache id was not renamed.
Sometimes it is desirable to preseed the autoconf variables, e.g. when
cross-compiling to avoid the tests running on the host system. In this
case it's confusing when the cache id does not match the variable to
set, so let's adjust it.
Signed-off-by: Michael Heimpold <mhei@heimpold..de>
Changed paths:
M ext/imap/config.m4
Diff:
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index d0b86cb..badb6e2 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -147,7 +147,7 @@ if test "$PHP_IMAP" != "no"; then
old_CFLAGS=$CFLAGS
CFLAGS="-I$IMAP_INC_DIR"
- AC_CACHE_CHECK(for U8T_DECOMPOSE, ac_cv_u8t_canonical,
+ AC_CACHE_CHECK(for U8T_DECOMPOSE, ac_cv_u8t_decompose,
AC_TRY_COMPILE([
#include <c-client.h>
],[