diff options
| author | foobar <sniper@php.net> | 2005-01-20 01:41:20 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-01-20 01:41:20 +0000 |
| commit | 480a3b08d5a045fb228a5ee628b5108db82ec2a6 (patch) | |
| tree | 6631e1d6c809d9cfb1d20630d3eb12ab43ce6ef2 /scripts | |
| parent | aaf344e642f383de683311ae69679acc314792f8 (diff) | |
| download | php-git-480a3b08d5a045fb228a5ee628b5108db82ec2a6.tar.gz | |
- Changed phpize not to require automake and libtool.
- Fixed build system to always use bundled libtool files.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.frag | 8 | ||||
| -rw-r--r-- | scripts/phpize.in | 15 |
2 files changed, 10 insertions, 13 deletions
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index f5f0d23b2c..36e4765108 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -10,11 +10,15 @@ BUILD_FILES = \ scripts/phpize.m4 \ build/mkdep.awk \ build/scan_makefile_in.awk \ + build/libtool.m4 \ Makefile.global \ - acinclude.m4 + acinclude.m4 \ + ltmain.sh BUILD_FILES_EXEC = \ - build/shtool + build/shtool \ + config.guess \ + config.sub bin_SCRIPTS = phpize php-config bin_src_SCRIPTS = phpextdist diff --git a/scripts/phpize.in b/scripts/phpize.in index bf972ac78d..4e7b709759 100644 --- a/scripts/phpize.in +++ b/scripts/phpize.in @@ -6,9 +6,9 @@ phpdir="$prefix/lib/php/build" includedir="$prefix/include/php" builddir="`pwd`" -FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool" -FILES="acinclude.m4 Makefile.global" -CLEAN_FILES="$FILES *.lo *.la *.o .deps .libs/ build/ include/ modules/ install-sh \ +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" +FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh" +CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \ config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h" @@ -101,17 +101,11 @@ phpize_replace_prefix() phpize_autotools() { - aclocal || exit 1 + cat acinclude.m4 ./build/libtool.m4 > aclocal.m4 || exit 1 autoconf || exit 1 autoheader || exit 1 } -phpize_libtoolize() -{ - libtoolize=`$builddir/build/shtool path glibtoolize libtoolize` - $libtoolize -f -c || exit 1 -} - # Main script case "$1" in @@ -150,7 +144,6 @@ case "$1" in phpize_check_shtool - phpize_libtoolize ;; esac |