diff options
| -rw-r--r-- | CONTRIBUTING.md | 8 | ||||
| -rw-r--r-- | TSRM/tsrm.m4 | 6 | ||||
| -rw-r--r-- | build/ax_func_which_gethostbyname_r.m4 (renamed from TSRM/m4/ax_func_which_gethostbyname_r.m4) | 0 | ||||
| -rw-r--r-- | configure.ac | 3 |
4 files changed, 5 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31508f6998..d819e57921 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -124,10 +124,7 @@ locations. ```bash <php-src>/ ├─ .git/ # Git configuration and source directory - └─ TSRM/ # Thread Safe Resource Manager - └─ m4/ # https://github.com/autoconf-archive/autoconf-archive - └─ ax_func_which_gethostbyname_r.m4 - └─ ... + ├─ TSRM/ # Thread Safe Resource Manager └─ Zend/ # Zend Engine ├─ zend_vm_execute.h # Generated by `Zend/zend_vm_gen.php` ├─ zend_vm_opcodes.c # Generated by `Zend/zend_vm_gen.php` @@ -135,8 +132,7 @@ locations. └─ ... ├─ appveyor/ # Appveyor CI service files └─ build/ # *nix build system files - ├─ ax_check_compile_flag.m4 # https://github.com/autoconf-archive/autoconf-archive - ├─ ax_gcc_func_attribute.m4 # https://github.com/autoconf-archive/autoconf-archive + ├─ ax_*.m4 # https://github.com/autoconf-archive/autoconf-archive ├─ config.guess # https://git.savannah.gnu.org/cgit/config.git ├─ config.sub # https://git.savannah.gnu.org/cgit/config.git ├─ libtool.m4 # https://git.savannah.gnu.org/cgit/libtool.git diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 693ddb392f..a075001b5a 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -1,17 +1,11 @@ -m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4]) - AC_DEFUN([TSRM_BASIC_CHECKS],[ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_CHECK_FUNCS(sigprocmask) - -AX_FUNC_WHICH_GETHOSTBYNAME_R() - ]) - AC_DEFUN([TSRM_CHECK_PTH],[ AC_MSG_CHECKING(for GNU Pth) diff --git a/TSRM/m4/ax_func_which_gethostbyname_r.m4 b/build/ax_func_which_gethostbyname_r.m4 index bb6bc959e7..bb6bc959e7 100644 --- a/TSRM/m4/ax_func_which_gethostbyname_r.m4 +++ b/build/ax_func_which_gethostbyname_r.m4 diff --git a/configure.ac b/configure.ac index 43a4fa9593..b1e9becfd9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ dnl Include external macro definitions before the AC_INIT to also remove dnl comments starting with # and empty newlines from the included files. dnl ------------------------------------------------------------------------- m4_include([build/ax_check_compile_flag.m4]) +m4_include([build/ax_func_which_gethostbyname_r.m4]) m4_include([build/ax_gcc_func_attribute.m4]) m4_include([build/libtool.m4]) m4_include([build/php_cxx_compile_stdcxx.m4]) @@ -664,6 +665,8 @@ asprintf \ nanosleep \ ) +AX_FUNC_WHICH_GETHOSTBYNAME_R + dnl Some systems (like OpenSolaris) do not have nanosleep in libc PHP_CHECK_FUNC_LIB(nanosleep, rt) |