diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-12-02 10:39:43 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-12-10 08:11:44 +0100 |
| commit | 7e445ef3b1a197dccbc92f35cb66988b66671841 (patch) | |
| tree | d6126a6b81ef7ee521783cd0985d7c1088c8e958 /scripts | |
| parent | a680f4f2be2ae8f6bf40bf9fcb3fac93b60b0b33 (diff) | |
| download | php-git-7e445ef3b1a197dccbc92f35cb66988b66671841.tar.gz | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.frag | 6 | ||||
| -rw-r--r-- | scripts/phpize.in | 8 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index b4f62bc74d..d730a798dd 100644 --- 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 a9433e57b9..b3a6532971 100644 --- 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 73743f9739..cb6934541a 100644 --- 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) |