Skip to content

Commit beb58ca

Browse files
committedApr 23, 2019
Move Autoconf Archive macros to a common m4 dir
In PHP the build dir is used as a directory for external macros including Autoconf Archive macros.
1 parent 4e7064d commit beb58ca

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed
 

‎CONTRIBUTING.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,15 @@ locations.
124124
```bash
125125
<php-src>/
126126
├─ .git/ # Git configuration and source directory
127-
└─ TSRM/ # Thread Safe Resource Manager
128-
└─ m4/ # https://github.com/autoconf-archive/autoconf-archive
129-
└─ ax_func_which_gethostbyname_r.m4
130-
└─ ...
127+
├─ TSRM/ # Thread Safe Resource Manager
131128
└─ Zend/ # Zend Engine
132129
├─ zend_vm_execute.h # Generated by `Zend/zend_vm_gen.php`
133130
├─ zend_vm_opcodes.c # Generated by `Zend/zend_vm_gen.php`
134131
├─ zend_vm_opcodes.h # Generated by `Zend/zend_vm_gen.php`
135132
└─ ...
136133
├─ appveyor/ # Appveyor CI service files
137134
└─ build/ # *nix build system files
138-
├─ ax_check_compile_flag.m4 # https://github.com/autoconf-archive/autoconf-archive
139-
├─ ax_gcc_func_attribute.m4 # https://github.com/autoconf-archive/autoconf-archive
135+
├─ ax_*.m4 # https://github.com/autoconf-archive/autoconf-archive
140136
├─ config.guess # https://git.savannah.gnu.org/cgit/config.git
141137
├─ config.sub # https://git.savannah.gnu.org/cgit/config.git
142138
├─ libtool.m4 # https://git.savannah.gnu.org/cgit/libtool.git

‎TSRM/tsrm.m4

-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4])
2-
31
AC_DEFUN([TSRM_BASIC_CHECKS],[
42
53
AC_REQUIRE([AC_PROG_CC])dnl
64
AC_REQUIRE([AC_PROG_RANLIB])dnl
75
86
AC_CHECK_FUNCS(sigprocmask)
9-
10-
AX_FUNC_WHICH_GETHOSTBYNAME_R()
11-
127
])
138

14-
159
AC_DEFUN([TSRM_CHECK_PTH],[
1610
1711
AC_MSG_CHECKING(for GNU Pth)

‎configure.ac

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dnl Include external macro definitions before the AC_INIT to also remove
44
dnl comments starting with # and empty newlines from the included files.
55
dnl -------------------------------------------------------------------------
66
m4_include([build/ax_check_compile_flag.m4])
7+
m4_include([build/ax_func_which_gethostbyname_r.m4])
78
m4_include([build/ax_gcc_func_attribute.m4])
89
m4_include([build/libtool.m4])
910
m4_include([build/php_cxx_compile_stdcxx.m4])
@@ -664,6 +665,8 @@ asprintf \
664665
nanosleep \
665666
)
666667

668+
AX_FUNC_WHICH_GETHOSTBYNAME_R
669+
667670
dnl Some systems (like OpenSolaris) do not have nanosleep in libc
668671
PHP_CHECK_FUNC_LIB(nanosleep, rt)
669672

0 commit comments

Comments
 (0)
Please sign in to comment.