diff options
| -rw-r--r-- | build/build2.mk | 9 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 48 |
2 files changed, 21 insertions, 36 deletions
diff --git a/build/build2.mk b/build/build2.mk index 17f5f35c09..881998edb9 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -52,8 +52,13 @@ $(TOUCH_FILES): touch $(TOUCH_FILES) aclocal.m4: configure.in acinclude.m4 - aclocal 2>&1 | $(SUPPRESS_WARNINGS) - + @echo rebuilding $@ + @libtoolize=`./build/shtool path glibtoolize libtoolize`; \ + $$libtoolize --copy --automake; \ + ltpath=`dirname $$libtoolize`; \ + ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \ + cat acinclude.m4 $$ltfile > $@ + configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ @autoconf 2>&1 | $(SUPPRESS_WARNINGS) diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 9a39f6c907..e96da0f821 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -16,7 +16,7 @@ # | Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.26 2003-06-10 20:03:25 imajes Exp $ +# $Id: buildcheck.sh,v 1.27 2003-06-27 00:19:43 sas Exp $ # echo "buildconf: checking installation..." @@ -50,39 +50,17 @@ if test "$1" = "2" && test "$2" -ge "50"; then stamp= fi - -# automake 1.4 or newer -am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` -am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'` -if test "$am_version" = ""; then -echo "buildconf: automake not found." -echo " You need automake version 1.4 or newer installed" -echo " to build PHP from CVS." -exit 1 -fi -IFS=.; set $am_version_clean; IFS=' ' -if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then -echo "buildconf: automake version $am_version found." -echo " You need automake version 1.4 or newer installed" -echo " to build PHP from CVS." -exit 1 -else -echo "buildconf: automake version $am_version (ok)" -fi - -# libtool 1.4.3 or newer -# Prefer glibtool over libtool for Mac OS X compatibility -libtool=`./build/shtool path glibtool 2> /dev/null` -if test ! -r "$libtool"; then libtool=`./build/shtool path libtool`; fi -lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'` +# 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|sed -e 's/^[^0-9]*//'` 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 -lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $lt_version; IFS=' ' +IFS=.; set $lt_pversion; IFS=' ' if test "$3" = ""; then third=0 @@ -100,12 +78,14 @@ echo " to build PHP from CVS." exit 1 fi -am_prefix=`./build/shtool path automake | sed -e 's#/[^/]*/[^/]*$##'` -lt_prefix=`echo $libtool | sed -e 's#/[^/]*/[^/]*$##'` -if test "$am_prefix" != "$lt_prefix"; then - echo "WARNING: automake and libtool are installed in different" - echo " directories. This may cause aclocal to fail." - echo " continuing anyway" +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 |