cvs: /php4 build.mk buildconf

ssb Sun Nov 28 17:52:21 1999 EDT Modified files: /php4 build.mk buildconf Log: Removed redundancy in buildconf/build.mk, buildconf now runs "make -f build.mk" Index: php4/build.mk diff -u php4/build.mk:1.13 php4/build.mk:1.14 --- php4/build.mk:1.13 Sun Nov 28 08:45:17 1999 +++ php4/build.mk Sun Nov 28 17:51:50 1999 @@ -9,7 +9,7 @@ # # Written by Sascha Schumann # -# $Id: build.mk,v 1.13 1999/11/28 13:45:17 sas Exp $ +# $Id: build.mk,v 1.14 1999/11/28 22:51:50 ssb Exp $ LT_TARGETS = ltconfig ltmain.sh config.guess config.sub @@ -36,7 +36,7 @@ all: $(targets) @for i in $(SUBDIRS); do \ test -d $$i || (test -d ../$$i && ln -s ../$$i $$i); \ - (cd $$i && $(MAKE) -f build.mk AMFLAGS=$(AMFLAGS)); \ + (cd $$i>/dev/null && $(MAKE) -f build.mk AMFLAGS=$(AMFLAGS)); \ done all: $(STAMP) Index: php4/buildconf diff -u php4/buildconf:1.44 php4/buildconf:1.45 --- php4/buildconf:1.44 Mon Nov 22 15:47:37 1999 +++ php4/buildconf Sun Nov 28 17:51:50 1999 @@ -6,7 +6,7 @@ if test "$1" = "--force"; then shift # this is a posix correct "test -nt" -elif test "ls -t buildconf buildconf.stamp 2>/dev/null |head -1" != "buildconf"; then +elif test "ls -t build.mk buildconf buildconf.stamp 2>/dev/null |head -1" = "buildconf.stamp"; then : else echo "buildconf: checking installation..." @@ -112,45 +112,23 @@ fi fi -./scripts/preconfig +## build.mk does not check automake/libtool prefixes yet. +## +#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 -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 +if test "$supplied_flag" = "--local"; then + subdirs='SUBDIRS=' else - echo "buildconf: created or modified aclocal.m4" + subdirs='' fi -autoheader - -# find all Makefile.ams -files="Makefile find ext sapi regex pecl -name Makefile.am | sed 's#\.am##' | tr '\n' ' '" - -# suppress stupid automake warning -automake --add-missing --include-deps $automake_flags $files 2>&1 | grep -v \$PHP_OUTPUT_FILES >&2 - - -mv configure configure.old 2>/dev/null -autoconf -if cmp configure.old configure > /dev/null 2>&1; then - echo "buildconf: keeping configure" - mv configure.old configure -else - echo "buildconf: created or modified configure" -fi - -if test "$supplied_flag" != "--local"; then - (cd libzend; ./buildconf $automake_flags libzend/) - (cd TSRM; ./buildconf $automake_flags TSRM/) -fi +make -s -f build.mk AMFLAGS="$automake_flags" $subdirs