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

1234567891011121314151617181920212223242526272829303132333435363738
  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. ---
  9. acinclude.m4 | 4 ----
  10. 1 file changed, 4 deletions(-)
  11. diff --git a/acinclude.m4 b/acinclude.m4
  12. index 28506b6..af4aa06 100644
  13. --- a/acinclude.m4
  14. +++ b/acinclude.m4
  15. @@ -1898,8 +1898,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
  16. dnl
  17. AC_DEFUN([PHP_CHECK_FUNC_LIB],[
  18. ifelse($2,,:,[
  19. - unset ac_cv_lib_$2[]_$1
  20. - unset ac_cv_lib_$2[]___$1
  21. unset found
  22. AC_CHECK_LIB($2, $1, [found=yes], [
  23. AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
  24. @@ -1931,8 +1929,6 @@ dnl in the default libraries and as a fall back in the specified library.
  25. dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
  26. dnl
  27. AC_DEFUN([PHP_CHECK_FUNC],[
  28. - unset ac_cv_func_$1
  29. - unset ac_cv_func___$1
  30. unset found
  31. AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
  32. --
  33. 2.7.4