Skip to content
This repository was archived by the owner on Aug 24, 2021. It is now read-only.

Commit f8fb45f

Browse files
committed
[ci skip] Remove automake and aclocal in comments
The Automake and aclocal were part of the previous PHP build system where Automake created Makefile from the Makefile.in templates and aclocal was used to produce the aclocal.m4. They were removed as dependencies via 9d9d39a and e715fb0.
1 parent d88b006 commit f8fb45f

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

README.SELF-CONTAINED-EXTENSIONS

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ PREPARING YOUR SYSTEM
1616
tools:
1717

1818
GNU autoconf
19-
GNU automake
2019
GNU libtool
2120
GNU m4
2221

README.UNIX-BUILD-SYSTEM

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PHP Build System V5 Overview
1616
build-modules: builds and copies dynamic modules into modules/
1717
install-cli: installs the CLI only, so that the install-sapi
1818
target does only what its name says
19-
- finally abandoned automake (still requires aclocal at this time)
19+
- finally abandoned automake
2020
- changed some configure-time constructs to run at buildconf-time
2121
- upgraded shtool to 1.5.4
2222
- removed $(moduledir) (use EXTENSION_DIR)

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl include Zend specific macro definitions first
55
dnl -------------------------------------------------------------------------
66
sinclude(Zend/acinclude.m4)
77

8-
dnl Basic autoconf + automake initialization, generation of config.nice.
8+
dnl Basic autoconf initialization, generation of config.nice.
99
dnl -------------------------------------------------------------------------
1010

1111
AC_PREREQ([2.68])
@@ -1438,7 +1438,7 @@ case $host_alias in
14381438
esac
14391439

14401440
dnl Silence warning: `ar: 'u' modifier ignored since 'D' is the default`
1441-
dnl SEE https://www.mail-archive.com/[email protected]/msg07705.html
1441+
dnl See https://github.com/php/php-src/pull/3017
14421442
AC_SUBST(AR_FLAGS, [cr])
14431443

14441444
dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX).

ext/xmlrpc/libxmlrpc/acinclude.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Local macros for automake & autoconf
1+
# Local macros for autoconf
22

33
AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[
44

0 commit comments

Comments
 (0)