4959dabe7d
Convert patches from pure configure ones to *.m4/configure.in cleanness. This allows us to AUTORECONF (well, not quite, but close). Even though upstream will probably not accept them it's the right way. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
27 lines
881 B
Diff
27 lines
881 B
Diff
Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache.
|
|
Terminate them with extreme prejudice.
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
diff -Nura php-5.6.7.orig/aclocal.m4 php-5.6.7/aclocal.m4
|
|
--- php-5.6.7.orig/aclocal.m4 2015-04-08 11:08:11.208848359 -0300
|
|
+++ php-5.6.7/aclocal.m4 2015-04-08 11:08:49.828160195 -0300
|
|
@@ -1897,8 +1897,6 @@
|
|
dnl
|
|
AC_DEFUN([PHP_CHECK_FUNC_LIB],[
|
|
ifelse($2,,:,[
|
|
- unset ac_cv_lib_$2[]_$1
|
|
- unset ac_cv_lib_$2[]___$1
|
|
unset found
|
|
AC_CHECK_LIB($2, $1, [found=yes], [
|
|
AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
|
|
@@ -1930,8 +1928,6 @@
|
|
dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
|
|
dnl
|
|
AC_DEFUN([PHP_CHECK_FUNC],[
|
|
- unset ac_cv_func_$1
|
|
- unset ac_cv_func___$1
|
|
unset found
|
|
|
|
AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
|