0001-acinclude.m4-don-t-unset-variables.patch 1.2 KB

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