You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

40 lines
1.2 KiB

  1. --- a/configure.ac
  2. +++ b/configure.ac
  3. @@ -422,7 +422,10 @@ PHP_CHECK_FUNC(gethostname, nsl)
  4. PHP_CHECK_FUNC(gethostbyaddr, nsl)
  5. PHP_CHECK_FUNC(yp_get_default_domain, nsl)
  6. -PHP_CHECK_FUNC(dlopen, dl)
  7. +PHP_ADD_LIBRARY(dl)
  8. +PHP_DEF_HAVE(dlopen)
  9. +PHP_DEF_HAVE(libdl)
  10. +ac_cv_func_dlopen=yes
  11. if test "$ac_cv_func_dlopen" = "yes"; then
  12. AC_DEFINE(HAVE_LIBDL, 1, [ ])
  13. fi
  14. --- a/ext/fileinfo/config.m4
  15. +++ b/ext/fileinfo/config.m4
  16. @@ -46,6 +46,10 @@ int main(void)
  17. AC_MSG_RESULT(no)
  18. AC_MSG_NOTICE(using libmagic strcasestr implementation)
  19. libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
  20. + ],[
  21. + dnl cross-compiling; assume not present
  22. + AC_MSG_NOTICE(using libmagic strcasestr implementation)
  23. + libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
  24. ])
  25. PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
  26. --- a/ext/opcache/config.m4
  27. +++ b/ext/opcache/config.m4
  28. @@ -232,6 +232,10 @@ int main() {
  29. flock_type=unknown
  30. AC_MSG_CHECKING(for struct flock layout)
  31. +dnl cross-compiling for Linux
  32. +flock_type=linux
  33. +AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  34. +
  35. if test "$flock_type" = "unknown"; then
  36. AC_TRY_RUN([
  37. #include <fcntl.h>