1*4882a593SmuzhiyunFrom 7a4168062fbab2e33ef9a42bca9f87a5921afac2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Gustavo Zacarias <gustavo@zacarias.com.ar> 3*4882a593SmuzhiyunDate: Tue, 9 Aug 2016 11:49:56 +0200 4*4882a593SmuzhiyunSubject: [PATCH] acinclude.m4: don't unset variables 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUnsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache. 7*4882a593SmuzhiyunTerminate them with extreme prejudice. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 10*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 11*4882a593Smuzhiyun[aduskett@gmail.com: Update for 7.3.0] 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun build/php.m4 | 4 ---- 14*4882a593Smuzhiyun 1 file changed, 4 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/build/php.m4 b/build/php.m4 17*4882a593Smuzhiyunindex e91ef988..9586c490 100644 18*4882a593Smuzhiyun--- a/build/php.m4 19*4882a593Smuzhiyun+++ b/build/php.m4 20*4882a593Smuzhiyun@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB 21*4882a593Smuzhiyun dnl 22*4882a593Smuzhiyun AC_DEFUN([PHP_CHECK_FUNC_LIB],[ 23*4882a593Smuzhiyun ifelse($2,,:,[ 24*4882a593Smuzhiyun- unset ac_cv_lib_$2[]_$1 25*4882a593Smuzhiyun- unset ac_cv_lib_$2[]___$1 26*4882a593Smuzhiyun unset found 27*4882a593Smuzhiyun AC_CHECK_LIB($2, $1, [found=yes], [ 28*4882a593Smuzhiyun AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) 29*4882a593Smuzhiyun@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and 30*4882a593Smuzhiyun dnl HAVE_library if found and adds the library to LIBS. 31*4882a593Smuzhiyun dnl 32*4882a593Smuzhiyun AC_DEFUN([PHP_CHECK_FUNC],[ 33*4882a593Smuzhiyun- unset ac_cv_func_$1 34*4882a593Smuzhiyun- unset ac_cv_func___$1 35*4882a593Smuzhiyun unset found 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) 38*4882a593Smuzhiyun-- 39*4882a593Smuzhiyun2.7.4 40*4882a593Smuzhiyun 41