1From 7a4168062fbab2e33ef9a42bca9f87a5921afac2 Mon Sep 17 00:00:00 2001 2From: Gustavo Zacarias <gustavo@zacarias.com.ar> 3Date: Tue, 9 Aug 2016 11:49:56 +0200 4Subject: [PATCH] acinclude.m4: don't unset variables 5 6Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache. 7Terminate them with extreme prejudice. 8 9Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 10Signed-off-by: Adam Duskett <aduskett@gmail.com> 11[aduskett@gmail.com: Update for 7.3.0] 12Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 13[Bernd: rebased for 8.1.7] 14--- 15 build/php.m4 | 4 ---- 16 1 file changed, 4 deletions(-) 17 18diff --git a/build/php.m4 b/build/php.m4 19index e91ef988..9586c490 100644 20--- a/build/php.m4 21+++ b/build/php.m4 22@@ -1580,8 +1580,6 @@ dnl PHP_CHECK_FUNC_LIB 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@@ -1616,8 +1616,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and 32 dnl 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-- 412.7.4 42 43