cvs: /php4 buildconf

ssb Fri Sep 24 10:29:28 1999 EDT Modified files: /php4 buildconf Log: Detect automake/libtool that are installed with different prefixes. Index: php4/buildconf diff -u php4/buildconf:1.30 php4/buildconf:1.31 --- php4/buildconf:1.30 Thu Sep 16 09:52:19 1999 +++ php4/buildconf Fri Sep 24 10:29:28 1999 @@ -66,10 +66,17 @@ echo " to build PHP from CVS." exit 1 fi - touch buildconf.stamp fi +am_prefix=which automake | sed -e 's#/[^/]*/[^/]*$##' +lt_prefix=which libtool | sed -e 's#/[^/]*/[^/]*$##' +if test "$am_prefix" != "$lt_prefix"; then + echo "buildconf: WARNING: automake and libtool are installed in different" + echo " directories. This may cause aclocal to fail." + echo "buildconf: continuing anyway" +fi + if test "$supplied_flag" = "--copy"; then automake_flags=--copy fi @@ -111,6 +118,15 @@ mv aclocal.m4 aclocal.m4.old 2>/dev/null aclocal +if test "$?" != "0" -a "$am_prefix" != "$lt_prefix"; then + echo "buildconf: ERROR: aclocal failed, probably because automake and" + echo " libtool are installed with different prefixes;" + echo " automake is installed in $am_prefix, but libtool in $lt_prefix." + echo " Please re-install automake and/or libtool with a common prefix" + echo " and try again." + exit 1 +fi + if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then echo "buildconf: keeping aclocal.m4" mv aclocal.m4.old aclocal.m4