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

123456789101112131415161718192021222324252627282930313233343536373839404142
  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. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  11. [Bernd: rebased for 8.1.7]
  12. ---
  13. build/php.m4 | 4 ----
  14. 1 file changed, 4 deletions(-)
  15. diff --git a/build/php.m4 b/build/php.m4
  16. index e91ef988..9586c490 100644
  17. --- a/build/php.m4
  18. +++ b/build/php.m4
  19. @@ -1580,8 +1580,6 @@ dnl PHP_CHECK_FUNC_LIB
  20. dnl
  21. AC_DEFUN([PHP_CHECK_FUNC_LIB],[
  22. ifelse($2,,:,[
  23. - unset ac_cv_lib_$2[]_$1
  24. - unset ac_cv_lib_$2[]___$1
  25. unset found
  26. AC_CHECK_LIB($2, $1, [found=yes], [
  27. AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
  28. @@ -1616,8 +1616,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
  29. dnl HAVE_library if found and adds the library to LIBS.
  30. dnl
  31. AC_DEFUN([PHP_CHECK_FUNC],[
  32. - unset ac_cv_func_$1
  33. - unset ac_cv_func___$1
  34. unset found
  35. AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
  36. --
  37. 2.7.4