diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | README.RELEASE_PROCESS | 6 | ||||
| -rw-r--r-- | TSRM/build.mk | 6 | ||||
| -rw-r--r-- | TSRM/configure.ac (renamed from TSRM/configure.in) | 2 | ||||
| -rw-r--r-- | Zend/build.mk | 6 | ||||
| -rw-r--r-- | Zend/configure.ac (renamed from Zend/configure.in) | 0 | ||||
| -rw-r--r-- | build/build2.mk | 4 | ||||
| -rwxr-xr-x | buildconf | 2 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 2 | ||||
| -rw-r--r-- | ext/bcmath/libbcmath/configure.ac (renamed from ext/bcmath/libbcmath/configure.in) | 0 | ||||
| -rwxr-xr-x | ext/ext_skel | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/configure.ac (renamed from ext/mbstring/libmbfl/configure.in) | 0 | ||||
| -rw-r--r-- | main/php_version.h | 2 | ||||
| -rw-r--r-- | scripts/phpize.in | 4 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 2 | ||||
| -rw-r--r-- | win32/build/config.w32 | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 4 |
17 files changed, 24 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore index 81e339a82f..4013490325 100644 --- a/.gitignore +++ b/.gitignore @@ -173,6 +173,7 @@ tests/*/*/*.sh # Extension specifc ignores ext/*/configure.in +ext/*/configure.ac ext/*/ltmain.sh ext/*/libs.mk ext/*/build @@ -213,6 +214,7 @@ ext/mssql/Makefile.global ext/mssql/acinclude.m4 ext/mssql/config.sub ext/mssql/configure.in +ext/mssql/configure.ac ext/mssql/ltmain.sh ext/mysql/weztest.sqlite ext/oci8/tests/*.tmp diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 315297c0d8..cf9715fad8 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -65,7 +65,7 @@ credits files in ext/standard. 4. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch. -5. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``. +5. Bump the version numbers in ``main/php_version.h``, ``configure.ac`` and possibly ``NEWS``. Do not use abbreviations for alpha and beta. Do not use dashes, you should ``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"`` @@ -79,7 +79,7 @@ Do not use abbreviations for alpha and beta. Do not use dashes, you should 9. Tag the repository release branch with the version, e.g.: ``git tag -u YOURKEYID php-5.4.2RC2`` -10. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS`` +10. Bump the version numbers in ``main/php_version.h``, ``configure.ac`` and ``NEWS`` in the *main* branch (PHP-5.4 for example) to prepare for the **next** version. F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get a new RC or not. This is to make sure ``version_compare()`` can correctly work. @@ -152,7 +152,7 @@ Rolling a stable release ------------------------ 1. Checkout your release branch, you should have created when releasing previous RC -and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``. +and bump the version numbers in ``main/php_version.h``, ``configure.ac`` and possibly ``NEWS``. 2. If a CVE commit needs to be merged to the release, then have it committed to the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3, diff --git a/TSRM/build.mk b/TSRM/build.mk index f5756af72c..f98109fa06 100644 --- a/TSRM/build.mk +++ b/TSRM/build.mk @@ -30,14 +30,14 @@ $(LT_TARGETS): $(makefile_in_files): $(makefile_am_files) automake -a -i $(AMFLAGS) $(makefile_files) -aclocal.m4: configure.in acinclude.m4 +aclocal.m4: configure.ac acinclude.m4 aclocal -$(config_h_in): configure.in +$(config_h_in): configure.ac # explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader -configure: aclocal.m4 configure.in +configure: aclocal.m4 configure.ac autoconf diff --git a/TSRM/configure.in b/TSRM/configure.ac index 6f10f5ab13..8bf35d33b0 100644 --- a/TSRM/configure.in +++ b/TSRM/configure.ac @@ -1,6 +1,6 @@ dnl $Id$ dnl -dnl Minimalistic configure.in for TSRM. +dnl Minimalistic configure.ac for TSRM. dnl AC_INIT(TSRM.c) diff --git a/Zend/build.mk b/Zend/build.mk index 3c83a6fe82..702cb647e9 100644 --- a/Zend/build.mk +++ b/Zend/build.mk @@ -30,14 +30,14 @@ $(LT_TARGETS): $(makefile_in_files): $(makefile_am_files) automake -a -i $(AMFLAGS) $(makefile_files) -aclocal.m4: configure.in acinclude.m4 +aclocal.m4: configure.ac acinclude.m4 aclocal -$(config_h_in): configure.in +$(config_h_in): configure.ac # explicitly remove target since autoheader does not seem to work # correctly otherwise (timestamps are not updated) @rm -f $@ autoheader -configure: aclocal.m4 configure.in +configure: aclocal.m4 configure.ac autoconf diff --git a/Zend/configure.in b/Zend/configure.ac index 3ebea4b8ed..3ebea4b8ed 100644 --- a/Zend/configure.in +++ b/Zend/configure.ac diff --git a/build/build2.mk b/build/build2.mk index 7bb2589403..0cf942aef8 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -44,11 +44,11 @@ $(config_h_in): configure $(TOUCH_FILES): touch $(TOUCH_FILES) -aclocal.m4: configure.in acinclude.m4 +aclocal.m4: configure.ac acinclude.m4 @echo rebuilding $@ cat acinclude.m4 ./build/libtool.m4 > $@ -configure: aclocal.m4 configure.in $(config_m4_files) +configure: aclocal.m4 configure.ac $(config_m4_files) @echo rebuilding $@ @rm -f $@ $(PHP_AUTOCONF) -f $(SUPPRESS_WARNINGS) @@ -1,7 +1,7 @@ #!/bin/sh # $Id$ -eval `grep '^PHP_EXTRA_VERSION=' configure.in` +eval `grep '^PHP_EXTRA_VERSION=' configure.ac` case "$PHP_EXTRA_VERSION" in *-dev) dev=1 diff --git a/configure.in b/configure.ac index 73ecb9be38..dc7bff46ee 100644 --- a/configure.in +++ b/configure.ac @@ -126,7 +126,7 @@ dnl Setting up the PHP version based on the information above. dnl ------------------------------------------------------------------------- echo "/* automatically generated by configure */" > php_version.h.new -echo "/* edit configure.in to change version number */" >> php_version.h.new +echo "/* edit configure.ac to change version number */" >> php_version.h.new echo "#define PHP_MAJOR_VERSION $PHP_MAJOR_VERSION" >> php_version.h.new echo "#define PHP_MINOR_VERSION $PHP_MINOR_VERSION" >> php_version.h.new echo "#define PHP_RELEASE_VERSION $PHP_RELEASE_VERSION" >> php_version.h.new diff --git a/ext/bcmath/libbcmath/configure.in b/ext/bcmath/libbcmath/configure.ac index 3da89e949f..3da89e949f 100644 --- a/ext/bcmath/libbcmath/configure.in +++ b/ext/bcmath/libbcmath/configure.ac diff --git a/ext/ext_skel b/ext/ext_skel index f5b9b2578d..d1b8a2874c 100755 --- a/ext/ext_skel +++ b/ext/ext_skel @@ -205,7 +205,7 @@ config.nice config.status config.sub configure -configure.in +configure.ac include install-sh libtool diff --git a/ext/mbstring/libmbfl/configure.in b/ext/mbstring/libmbfl/configure.ac index f7fd58f857..f7fd58f857 100644 --- a/ext/mbstring/libmbfl/configure.in +++ b/ext/mbstring/libmbfl/configure.ac diff --git a/main/php_version.h b/main/php_version.h index 405e54a710..62cdcfceda 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,5 +1,5 @@ /* automatically generated by configure */ -/* edit configure.in to change version number */ +/* edit configure.ac to change version number */ #define PHP_MAJOR_VERSION 7 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 0 diff --git a/scripts/phpize.in b/scripts/phpize.in index 240590da74..6302d4ee2f 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -12,7 +12,7 @@ SED="@SED@" FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4" FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \ - mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ + mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \ run-tests*.php tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php" @@ -153,7 +153,7 @@ phpize_replace_prefix() { $SED \ -e "s#@prefix@#$prefix#" \ - < "$phpdir/phpize.m4" > configure.in + < "$phpdir/phpize.m4" > configure.ac } phpize_autotools() diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index d5f5f476ec..1094e2812c 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -1,4 +1,4 @@ -dnl This file becomes configure.in for self-contained extensions. +dnl This file becomes configure.ac for self-contained extensions. AC_PREREQ(2.59) AC_INIT(config.m4) diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 188c1dc9e2..80e815c4aa 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -1,6 +1,6 @@ // vim:ft=javascript // $Id$ -// "Master" config file; think of it as a configure.in +// "Master" config file; think of it as a configure.ac // equivalent. ARG_WITH("toolset", "Toolset to use for the compilation, give: vs, clang, icc. " + diff --git a/win32/build/confutils.js b/win32/build/confutils.js index be6fb62d48..8c6d3f6f05 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -96,7 +96,7 @@ if (typeof(CWD) == "undefined") { CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.GIT-RULES")); } -/* defaults; we pick up the precise versions from configure.in */ +/* defaults; we pick up the precise versions from configure.ac */ var PHP_VERSION = 7; var PHP_MINOR_VERSION = 1; var PHP_RELEASE_VERSION = 0; @@ -106,7 +106,7 @@ var PHP_VERSION_STRING = "7.2.0"; /* Get version numbers and DEFINE as a string */ function get_version_numbers() { - var cin = file_get_contents("configure.in"); + var cin = file_get_contents("configure.ac"); if (cin.match(new RegExp("PHP_MAJOR_VERSION=(\\d+)"))) { PHP_VERSION = RegExp.$1; |