CVS update: php3

Date: Wednesday June 30, 1999 @ 20:46 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv10879 Modified Files: Makefile.in build-script Log Message: * deactivate make test in build-script * VPATH feature on Solaris 7 is too clever for APXS Index: php3/Makefile.in diff -u php3/Makefile.in:1.334 php3/Makefile.in:1.335 --- php3/Makefile.in:1.334 Wed Jun 30 20:03:51 1999 +++ php3/Makefile.in Wed Jun 30 20:46:07 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.334 1999/07/01 00:03:51 sas Exp $ +# $Id: Makefile.in,v 1.335 1999/07/01 00:46:07 sas Exp $ # prefix = @prefix@ @@ -125,9 +125,9 @@ $(RANLIB) libmodphp3-so.a libphp3.so: mod_php3.c libmodphp3-so.a @DBASE_LIB@ @PCRE_LIB@ - -@test -f mod_php3.c || test -L mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c mod_php3.c - -@test -f mod_php3.c || test -h mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c mod_php3.c - $(APXS) -c -o libphp3.so -I$(srcdir) -I. @RPATHS@ mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) @APXS_EXP@ @PCRE_LIBS@ + -@test -f ./mod_php3.c || test -L ./mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c ./mod_php3.c + -@test -f ./mod_php3.c || test -h ./mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c ./mod_php3.c + $(APXS) -c -o libphp3.so -I$(srcdir) -I. @RPATHS@ ./mod_php3.c libmodphp3-so.a $(APXS_LDFLAGS) @APXS_EXP@ @PCRE_LIBS@ pcrelib/libpcre.a: (cd pcrelib; $(MAKE)) Index: php3/build-script diff -u php3/build-script:1.4 php3/build-script:1.5 --- php3/build-script:1.4 Mon Jun 28 16:30:03 1999 +++ php3/build-script Wed Jun 30 20:46:08 1999 @@ -1,6 +1,6 @@ #! /bin/sh # -# another build script ($Id: build-script,v 1.4 1999/06/28 20:30:03 sas Exp $) +# another build script ($Id: build-script,v 1.5 1999/07/01 00:46:08 sas Exp $) # # you can put this in your crontab # redirect STDOUT to /dev/null, error messages are on STDERR @@ -76,6 +76,9 @@ try_make_test ( ) { log=logtest + PHP="pwd/comp-cgi/php" +# not sure whether we need this: + export PHP ( \ (cd comp-cgi && make test) || \ alarm ../$log "make test failed" \ @@ -91,10 +94,13 @@ autoheader && autoconf || die "autoconf failed" test -n "$apxs" && \ - try_compile dso --with-apxs="$apxs" + try_compile apxs --with-apxs="$apxs" test -n "$apache_src" && \ try_compile apache --with-apache="$apache_src" +test -n "$apache_src" && \ + try_compile shared-apache --with-shared-apache="$apache_src" try_compile cgi -test -n "$make_test" && test -f comp-cgi/php && \ - try_make_test +# still broken +#test -n "$make_test" && test -f comp-cgi/php && \ +# try_make_test