archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Changed phpize not to require automake and libtool.

Browse source 
- Fixed build system to always use bundled libtool files.
This commit is contained in:
foobar 2005-01-20 01:41:20 +00:00
parent aaf344e642
commit 480a3b08d5
4 changed files with 21 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

19
build/build2.mk
View file

@ -34,11 +34,12 @@ targets = $(TOUCH_FILES) configure $(config_h_in)
ifeq ($(SHOW_WARNINGS), no)
SUPPRESS_WARNINGS = 2>&1 | (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT is expanded from...|the top level)'||true)
libtoolize_flags = --automake
else
debug_target = debugging
endif
all: $(targets)
all: $(targets) $(debug_target)
acconfig.h: $(acconfig_h_SOURCES)
@echo rebuilding $@
@ -49,19 +50,19 @@ $(config_h_in): configure acconfig.h
# correctly otherwise (timestamps are not updated)
@echo rebuilding $@
@rm -f $@
@autoheader $(SUPPRESS_WARNINGS)
autoheader $(SUPPRESS_WARNINGS)
$(TOUCH_FILES):
touch $(TOUCH_FILES)
aclocal.m4: configure.in acinclude.m4
@echo rebuilding $@
@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
$$libtoolize --copy $(libtoolize_flags); \
ltpath=`dirname $$libtoolize`; \
ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
cat acinclude.m4 $$ltfile > $@
cat acinclude.m4 ./build/libtool.m4 > $@
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
@autoconf $(SUPPRESS_WARNINGS)
autoconf $(SUPPRESS_WARNINGS)
debugging:
@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
$$libtoolize

41
build/buildcheck.sh
View file

@ -16,7 +16,7 @@
# | Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
# $Id: buildcheck.sh,v 1.33 2005-01-19 22:27:39 sniper Exp $
# $Id: buildcheck.sh,v 1.34 2005-01-20 01:41:19 sniper Exp $
#
echo "buildconf: checking installation..."
@ -41,7 +41,6 @@ else
echo "buildconf: autoconf version $ac_version (ok)"
fi
if test "$1" = "2" && test "$2" -ge "50"; then
echo "buildconf: Your version of autoconf likely contains buggy cache code."
echo " Running cvsclean for you."
@ -50,44 +49,6 @@ if test "$1" = "2" && test "$2" -ge "50"; then
stamp=
fi
# libtoolize 1.4.3 or newer
# Prefer glibtoolize over libtoolize for Mac OS X compatibility
libtoolize=`./build/shtool path glibtoolize libtoolize 2> /dev/null`
lt_pversion=`$libtoolize --version 2>/dev/null|head -n 1|awk -F' ' '{print $NF}'`
if test "$lt_pversion" = ""; then
echo "buildconf: libtool not found."
echo " You need libtool version 1.4.3 or newer installed"
echo " to build PHP from CVS."
exit 1
fi
IFS=.; set $lt_pversion; IFS=' '
if test "$3" = ""; then
third=0
else
third=$3
fi
if test "$1" -gt "1" || test "$2" -ge "5" || (test "$2" -ge "4" && test "$third" -ge "3")
then
echo "buildconf: libtool version $lt_pversion (ok)"
else
echo "buildconf: libtool version $lt_pversion found."
echo " You need libtool version 1.4.3 or newer installed"
echo " to build PHP from CVS."
exit 1
fi
ltpath=`echo $libtoolize | sed -e 's#/[^/]*/[^/]*$##'`
ltfile="$ltpath/share/aclocal/libtool.m4"
if test -r "$ltfile"; then
:
else
echo "buildconf: $ltfile does not exist."
echo " Please reinstall libtool."
exit 1
fi
test -n "$stamp" && touch $stamp
exit 0

8
scripts/Makefile.frag
View file

@ -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

15
scripts/phpize.in
View file

@ -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