| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 1fb5a3b3e6c9cf0002ff76988de72f011b642005 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Tue, 12 Feb 2019 16:25:37 +0800 |
| 4 | Subject: [PATCH] acinclude.m4: don't unset cache variables |
| 5 | |
| 6 | Unsetting prevents cache variable from being passed to configure. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE-specific] |
| 9 | |
| 10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 11 | |
| 12 | update patch to version 5.6.40 |
| 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 14 | --- |
| 15 | acinclude.m4 | 4 ---- |
| 16 | 1 file changed, 4 deletions(-) |
| 17 | |
| 18 | diff --git a/acinclude.m4 b/acinclude.m4 |
| 19 | index b188eee..ed32fc5 100644 |
| 20 | --- a/acinclude.m4 |
| 21 | +++ b/acinclude.m4 |
| 22 | @@ -1897,8 +1897,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) |
| 23 | dnl |
| 24 | AC_DEFUN([PHP_CHECK_FUNC_LIB],[ |
| 25 | ifelse($2,,:,[ |
| 26 | - unset ac_cv_lib_$2[]_$1 |
| 27 | - unset ac_cv_lib_$2[]___$1 |
| 28 | unset found |
| 29 | AC_CHECK_LIB($2, $1, [found=yes], [ |
| 30 | AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) |
| 31 | @@ -1930,8 +1928,6 @@ dnl in the default libraries and as a fall back in the specified library. |
| 32 | dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. |
| 33 | dnl |
| 34 | AC_DEFUN([PHP_CHECK_FUNC],[ |
| 35 | - unset ac_cv_func_$1 |
| 36 | - unset ac_cv_func___$1 |
| 37 | unset found |
| 38 | |
| 39 | AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) |
| 40 | -- |
| 41 | 2.7.4 |
| 42 | |