[PHP4BETA] CVS update: php4

Date: Sunday April 18, 1999 @ 14:06 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv13809 Modified Files: Makefile.in configure.in.in Added Files: buildconf Log Message: * Added buildconf, runs all the scripts necessary to build configure (Stig - if there's any way to detect whether we need to run 'automake --add-missing', please add it...) * Make vpath work again * Minor UNIX bugfixes Index: php4/Makefile.in diff -u php4/Makefile.in:1.5 php4/Makefile.in:1.6 --- php4/Makefile.in:1.5 Fri Apr 16 22:01:18 1999 +++ php4/Makefile.in Sun Apr 18 14:06:53 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.5 1999/04/17 02:01:18 ssb Exp $ +# $Id: Makefile.in,v 1.6 1999/04/18 18:06:53 zeev Exp $ # prefix = @prefix@ @@ -34,7 +34,7 @@ bindir = @bindir@ ZEND_DIR = $(srcdir)/libzend -SUBDIRS=libzend ext +SUBDIRS=$(srcdir)/libzend ext CC = @CC@ AR = ar rc @@ -83,7 +83,7 @@ functions/sysvsem.c functions/sysvshm.c functions/dav.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) -PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext +PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@ all: $(BINNAME) @@ -103,7 +103,7 @@ # Apache modules libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS) $(AR) $@.tmp $(OBJS) $(FUNCTIONS) @DBASE_LIB@ - scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a + $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @rm -f $@.tmp $(RANLIB) $(BINNAME) @@ -123,7 +123,7 @@ configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c -configuration-scanner.o: +configuration-scanner.o: configuration-scanner.c $(CC) $(CFLAGS) -w$(WARNING_LEVEL) -c configuration-scanner.c configuration-scanner.c: $(srcdir)/configuration-scanner.l Index: php4/configure.in.in diff -u php4/configure.in.in:1.2 php4/configure.in.in:1.3 --- php4/configure.in.in:1.2 Fri Apr 16 22:01:19 1999 +++ php4/configure.in.in Sun Apr 18 14:06:53 1999 @@ -1,7 +1,10 @@ -dnl $Id: configure.in.in,v 1.2 1999/04/17 02:01:19 ssb Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.3 1999/04/18 18:06:53 zeev Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. + + divert(0) +AC_INIT(main.c) recurse=yes for arg in $@; do case $arg in @@ -13,7 +16,7 @@ done if test "$recurse" = "yes"; then - (cwd=pwd;set -x;cd libzend;./configure --cache-file=$cwd/config.cache $@) + (cwd=pwd; set -x; cd $srcdir/libzend; ./configure --cache-file=$cwd/config.cache $@) fi dnl ## Diversion 1 is the initial checking of OS features, programs, @@ -33,9 +36,10 @@ divert(1) -AC_INIT(main.c) dnl ## This is where the version number is changed from now on! AM_INIT_AUTOMAKE(php, 4.0pa1) + + PHP_VERSION=$VERSION echo "#define PHP_VERSION \"$PHP_VERSION\"" > php_version.h.new -- PHP 4 Beta