Set AC_CONFIG_AUX_DIR to build directory

The Autoconf macro AC_CONFIG_AUX_DIR can set the location of the
auxiliary build tools such as config.guess, config.sub, and bundled
libtool scripts and moves these bundled files from the root directory
to the build subdirectory.

Additionally some changes in this context or as a part of obsoletion:
- The LT_TARGETS variable in build/build2.mk file was once used as a part
  of the Automake step. It's not used anymore and has been refactored to
  separate makedist script directly.
- ltconfig is not used anymore since libtool 1.4+
  cf8d1563c27a70fdd24055c1e80218ec7b5962d6
- phpize file locations for the config.guess, config.sub, and ltmain.sh
  has been refactored accordingly.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f48698ba9dc175746452df163aba3288855c0609..43a8e525e422477408c4398b15fd2d454326516f 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,7 +96,10 @@ locations.
  └─ 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
+    ├─ 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
+    ├─ ltmain.sh                    # https://git.savannah.gnu.org/cgit/libtool.git
     ├─ shtool                       # https://www.gnu.org/software/shtool/
     └─ ...
  └─ ext/                            # PHP core extensions
@@ -170,8 +173,5 @@ locations.
  └─ win32/                          # Windows build system files
     ├─ cp_enc_map.c                 # Generated by `win32/cp_enc_map_gen.exe`
     └─ ...
- ├─ config.guess                    # https://git.savannah.gnu.org/cgit/config.git
- ├─ config.sub                      # https://git.savannah.gnu.org/cgit/config.git
- ├─ ltmain.sh                       # https://git.savannah.gnu.org/cgit/libtool.git
  └─ ...
 ```

diff --git a/build/build2.mk b/build/build2.mk
index 7b86f3de1a154d38ff97b52f8ced06049684de95..78b8fac6e23a447a22df210b0ed881c2e1219a14 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -18,8 +18,6 @@ include generated_lists
 
 TOUCH_FILES = mkinstalldirs install-sh missing
 
-LT_TARGETS = ltmain.sh config.guess config.sub
-
 config_h_in = main/php_config.h.in
 
 targets = $(TOUCH_FILES) configure $(config_h_in)

diff --git a/config.guess b/build/config.guess
similarity index 100%
rename from config.guess
rename to build/config.guess

diff --git a/config.sub b/build/config.sub
similarity index 100%
rename from config.sub
rename to build/config.sub

diff --git a/ltmain.sh b/build/ltmain.sh
similarity index 100%
rename from ltmain.sh
rename to build/ltmain.sh

diff --git a/configure.ac b/configure.ac
index 8f5a54c7286ff654bea9e8aa4b00a58268a03015..137bafb0a648691d949bdcf047774dc5b4788652 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ dnl -------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
 AC_INIT(README.GIT-RULES)
+AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
 
 PHP_CONFIG_NICE(config.nice)

diff --git a/makedist b/makedist
index 452768683aa46335fe33b4c6e3625e1919b209dd..1e10aed05538ef815eb4cc2cdc63f1bbcb5a973a 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -44,7 +44,7 @@ if test "x$PHPROOT" = "x"; then
     PHPROOT=git@git.php.net:php-src.git;
 fi
 
-LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
+LT_TARGETS='build/ltmain.sh build/config.guess build/config.sub'
 
 if echo '\c' | grep -s c >/dev/null 2>&1
 then

diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index b4f62bc74d39e0aa6d65146837c6fbb90ce63680..d730a798dd0dc76ce34bb499b8fa23eb9b1643e4 100644 (file)
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -9,19 +9,19 @@ BUILD_FILES = \
        scripts/phpize.m4 \
        build/scan_makefile_in.awk \
        build/libtool.m4 \
+       build/ltmain.sh \
        build/ax_check_compile_flag.m4 \
        build/ax_gcc_func_attribute.m4 \
        build/php_cxx_compile_stdcxx.m4 \
        build/pkg.m4 \
        Makefile.global \
        acinclude.m4 \
-       ltmain.sh \
        run-tests.php
 
 BUILD_FILES_EXEC = \
        build/shtool \
-       config.guess \
-       config.sub
+       build/config.guess \
+       build/config.sub
 
 bin_SCRIPTS = phpize php-config
 man_PAGES = phpize php-config

diff --git a/scripts/phpize.in b/scripts/phpize.in
index a9433e57b9b23203da91344d12af080dd54d897a..b3a65329719ac2cc9bb5291fc400ea648eb18464 100644 (file)
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -9,11 +9,11 @@ includedir="`eval echo @includedir@`/php"
 builddir="`pwd`"
 SED="@SED@"
 
-FILES_BUILD="scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4"
-FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
+FILES_BUILD="scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh"
+FILES="acinclude.m4 Makefile.global run-tests*.php"
 CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
-       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/ \
+       mkinstalldirs missing config.nice configure configure.ac \
+       aclocal.m4 config.h config.h.in conftest* 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"
 

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 73743f9739acc2d86a202d66a4f7105ef285fab8..cb6934541a6b7f5aa12d79c878530408a5e36eef 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -2,6 +2,7 @@ dnl This file becomes configure.ac for self-contained extensions.
 
 AC_PREREQ([2.68])
 AC_INIT(config.m4)
+AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
 
 PHP_CONFIG_NICE(config.nice)