[PHP4BETA] CVS update: php4
| From: | ssb | Date: | Sat, 17 Apr 1999 00:37:05 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-135@lists.php.net to get a copy of this message | ||
Date: Friday April 16, 1999 @ 20:37
Author: ssb
Update of /repository/php4
In directory php:/tmp/cvs-serv28846
Modified Files:
.cvsignore Makefile.in aclocal.m4 configuration-parser.y
configure.in fopen-wrappers.c internal_functions.c main.c
php_version.h safe_mode.c setup
Added Files:
acinclude.m4 configure.in.in
Log Message:
First commit of re-structuring phase one. We have started using automake in
sub-directories and started to move extension code into ext/<name>. For now,
I have moved the "standard" extension (which is quite a mix of everything
right now) and the GD extension into their own subdirs in ext/.
The configure script now also runs configure in the libzend directory
automatically and makes sure php4 and libzend use the same config.cache file.
To avoid running configure in libzend, use the --no-recursion option.
"make" in php4 also builds libzend now.
The Apache module doesn't compile right now, but a fix for that is
coming up.
Index: php4/.cvsignore
diff -u php4/.cvsignore:1.2 php4/.cvsignore:1.3
--- php4/.cvsignore:1.2 Wed Apr 7 20:04:44 1999
+++ php4/.cvsignore Fri Apr 16 20:37:05 1999
@@ -13,3 +13,4 @@
configuration-scanner.c
php
test.php3
+aclocal.m4
Index: php4/Makefile.in
diff -u php4/Makefile.in:1.3 php4/Makefile.in:1.4
--- php4/Makefile.in:1.3 Sat Apr 10 13:39:07 1999
+++ php4/Makefile.in Fri Apr 16 20:37:05 1999
@@ -1,7 +1,7 @@
# +----------------------------------------------------------------------+
-# | PHP HTML Embedded Scripting Language Version 3.0 |
+# | PHP HTML Embedded Scripting Language Version 4.0 |
# +----------------------------------------------------------------------+
-# | Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
+# | Copyright (c) 1997-1999 PHP Development Team (See Credits file) |
# +----------------------------------------------------------------------+
# | This program is free software; you can redistribute it and/or modify |
# | it under the terms of one of the following licenses: |
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.3 1999/04/10 17:39:07 zeev Exp $
+# $Id: Makefile.in,v 1.4 1999/04/17 00:37:05 ssb Exp $
#
prefix = @prefix@
@@ -32,13 +32,15 @@
srcdir = @srcdir@
VPATH = @srcdir@
bindir = @bindir@
+
ZEND_DIR = $(srcdir)/libzend
+SUBDIRS=libzend ext
CC = @CC@
AR = ar rc
BINNAME = @BINNAME@
INSTALL_IT = @INSTALL_IT@
-INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR) @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@
@FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@
@MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@
@VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@
@FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@
+INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR)
PROF_CFLAGS =
CFLAGS_SHLIB = @CFLAGS_SHLIB@
LDFLAGS_SHLIB = @LDFLAGS_SHLIB@
@@ -64,60 +66,55 @@
php_ini.o
FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
- functions/basic_functions.c \
- functions/crypt.c functions/datetime.c functions/db.c \
- functions/dbase.c functions/dir.c \
- functions/dl.c functions/dns.c functions/exec.c functions/file.c \
- functions/filepro.c functions/filestat.c \
- functions/formatted_print.c functions/fsock.c functions/gd.c \
- functions/head.c functions/html.c functions/image.c functions/imap.c\
- functions/link.c functions/mail.c functions/math.c functions/iptc.c \
- functions/md5.c functions/microtime.c functions/mime.c \
+ functions/crypt.c functions/db.c functions/dbase.c \
+ functions/dl.c functions/filepro.c \
+ functions/head.c functions/imap.c functions/mime.c \
functions/msql.c functions/mysql.c \
- functions/oracle.c functions/oci8.c functions/pack.c \
- functions/pageinfo.c functions/pgsql.c \
- functions/post.c functions/rand.c functions/reg.c \
- functions/solid.c functions/soundex.c \
- functions/string.c functions/syslog.c functions/type.c \
- functions/uniqid.c functions/sybase.c \
- functions/sybase-ct.c functions/url.c functions/base64.c \
- functions/info.c @BCMATH_SRC@ functions/xml.c \
- functions/unified_odbc.c functions/ldap.c functions/browscap.c \
- functions/velocis.c functions/gdttf.c functions/gdcache.c \
+ functions/oracle.c functions/oci8.c functions/pgsql.c \
+ functions/post.c functions/solid.c functions/sybase.c \
+ functions/sybase-ct.c @BCMATH_SRC@ functions/xml.c \
+ functions/unified_odbc.c functions/ldap.c functions/velocis.c \
functions/zlib.c functions/COM.c functions/ifx.c \
functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \
- functions/fdf.c \
- functions/snmp.c functions/var.c functions/interbase.c \
- functions/quot_print.c functions/cyr_convert.c \
+ functions/fdf.c functions/snmp.c functions/interbase.c \
functions/sysvsem.c functions/sysvshm.c functions/dav.c
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
-
-LIBS = $(PHPLIBS) @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@
@GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@
@IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
+PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext
+LIBS = $(PHPLIBS) @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)
+
+all-recursive clean-recursive distclean-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ for subdir in $(SUBDIRS); do \
+ target=
echo $@ | sed s/-recursive//; \
+ echo "Making $$target in $$subdir"; \
+ (cd $$subdir && $(MAKE) $$target) || fail=yes; \
+ done && test -z "$$fail"
-php: $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ $(ZEND_DIR)/libzend.a
+# CGI binary or fhttpd module
+php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@
$(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS)
-libphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+# Apache 1.2 module
+libphp3.a: all-recursive $(OBJS) $(FUNCTIONS) @DBASE_LIB@
$(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_LIB@
$(RANLIB) $(BINNAME)
-libmodphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+# Apache 1.3 static module
+libmodphp3.a: all-recursive $(OBJS) $(FUNCTIONS) @DBASE_LIB@
$(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_LIB@
$(RANLIB) $(BINNAME)
-libmodphp3-so.a: $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+# Apache 1.3 shared module
+libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS) @DBASE_LIB@
$(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) @DBASE_LIB@
$(RANLIB) libmodphp3-so.a
libphp3.so: mod_php3.c libmodphp3-so.a
$(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a
-docs:
- cd doc; $(MAKE)
-
regex/libregex.a:
(cd regex; $(MAKE) lib)
@@ -136,14 +133,14 @@
configuration-scanner.c: $(srcdir)/configuration-scanner.l
flex -Pcfg -oconfiguration-scanner.c -i $(srcdir)/configuration-scanner.l
-clean:
+clean: clean-recursive
-rm -f libphp3.a libmodphp3.a php *.o
-rm -f $(FUNCTIONS) functions/ifx.c
-rm -f test/php.desc test/php.in test/php.out test/php.test
-rm -f test/a.tmp test/b.tmp test/test.dbm*
(cd dbase; $(MAKE) clean)
-distclean: clean
+distclean: clean distclean-recursive
-rm -f *-parser.[ch] *-scanner.c *.output
-rm -f config.status config.cache config.log
-rm -f Makefile Makefile.depend config.h build-defs.h
@@ -209,680 +206,6 @@
depend: parser-scanner
$(CC) $(CFLAGS) -MM $(SOURCE) | perl -pe 's|regex/regex.h||;' > Makefile.depend
$(CC) $(CFLAGS) -MM $(FUNCTIONS_SOURCE) | perl -pe 's|^(.+\.o)|functions/$$1|;
s|regex/regex.h||;' >> Makefile.depend
-
-main.o: main.c php.h php_version.h libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h request_info.h \
- php3_compat.h libzend/zend_stack.h safe_mode.h \
- fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h build-defs.h \
- php_ini.h php_globals.h main.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h control_structures.h \
- functions/basic_functions.h libzend/zend_highlight.h functions/info.h \
- functions/head.h functions/post.h functions/type.h snprintf.h \
- libzend/zend_indent.h logos.h
-internal_functions.o: internal_functions.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h internal_functions_registry.h \
- libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_execute.h functions/php3_ifx.h \
- functions/php3_ldap.h functions/php3_mysql.h functions/php3_bcmath.h \
- functions/php3_msql.h functions/basic_functions.h \
- libzend/zend_highlight.h functions/phpmath.h functions/php3_string.h \
- functions/php3_oci8.h functions/oracle.h functions/base64.h \
- functions/php3_dir.h functions/dns.h functions/php3_pgsql.h \
- functions/php3_velocis.h functions/php3_sybase.h \
- functions/php3_sybase-ct.h functions/reg.h functions/php3_mail.h \
- functions/imap.h functions/md5.h functions/global.h \
- functions/php3_gd.h functions/html.h functions/dl.h functions/head.h \
- functions/post.h functions/exec.h functions/php3_solid.h \
- functions/adabasd.h functions/file.h functions/dbase.h functions/hw.h \
- functions/filepro.h functions/db.h functions/php3_syslog.h \
- functions/php3_filestat.h functions/php3_browscap.h functions/pack.h \
- functions/php3_unified_odbc.h dl/snmp/php3_snmp.h \
- functions/php3_zlib.h functions/php3_COM.h functions/php3_interbase.h \
- functions/php3_xml.h functions/php3_pdf.h functions/php3_fdf.h \
- functions/php3_sysvsem.h functions/php3_sysvshm.h \
- functions/php3_dav.h
-snprintf.o: snprintf.c config.h
-php3_sprintf.o: php3_sprintf.c config.h
-configuration-parser.o: configuration-parser.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h php_globals.h php_ini.h functions/dl.h \
- functions/file.h functions/php3_browscap.h libzend/zend_extensions.h \
- libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_execute.h
-configuration-scanner.o: configuration-scanner.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h configuration-parser.h
-request_info.o: request_info.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h
-safe_mode.o: safe_mode.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/pageinfo.h
-fopen-wrappers.o: fopen-wrappers.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
- php3_realpath.h functions/head.h functions/url.h functions/base64.h \
- functions/fsock.h functions/php3_string.h libzend/zend_compile.h \
- libzend/zend-parser.h libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_execute.h
-php3_realpath.o: php3_realpath.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h
-alloca.o: alloca.c
-output.o: output.c php.h php_version.h libzend/zend.h libzend/config.h \
- libzend/config.unix.h libzend/zend_errors.h libzend/zend_alloc.h \
- libzend/zend_hash.h libzend/zend_llist.h libzend/zend_API.h \
- libzend/modules.h libzend/zend_list.h config.h request_info.h \
- php3_compat.h libzend/zend_stack.h safe_mode.h \
- fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h
-php_ini.o: php_ini.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
- php_globals.h
-functions/adabasd.o: functions/adabasd.c config.h build-defs.h php.h \
- php_version.h libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_string.h functions/head.h \
- functions/adabasd.h
-functions/apache.o: functions/apache.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- php_globals.h php_ini.h mod_php3.h
-functions/fhttpd.o: functions/fhttpd.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h
-functions/basic_functions.o: functions/basic_functions.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h php_ini.h internal_functions_registry.h \
- functions/basic_functions.h libzend/zend_highlight.h \
- functions/phpmath.h functions/php3_string.h functions/dns.h \
- functions/md5.h functions/global.h functions/html.h functions/post.h \
- functions/exec.h functions/info.h functions/url.h \
- functions/datetime.h functions/fsock.h functions/image.h \
- functions/php3_link.h functions/php3_filestat.h functions/microtime.h \
- functions/pageinfo.h functions/uniqid.h functions/base64.h \
- functions/php3_mail.h functions/php3_var.h functions/php3_iptc.h \
- functions/quot_print.h functions/cyr_convert.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h php_globals.h
-functions/crypt.o: functions/crypt.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_string.h
-functions/datetime.o: functions/datetime.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/datetime.h snprintf.h php_globals.h
-functions/db.o: functions/db.c
-functions/dbase.o: functions/dbase.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_globals.h
-functions/dir.o: functions/dir.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_dir.h
-functions/dl.o: functions/dl.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/dl.h \
- php_globals.h
-functions/dns.o: functions/dns.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/dns.h
-functions/exec.o: functions/exec.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_string.h functions/head.h functions/exec.h \
- php_globals.h
-functions/file.o: functions/file.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- functions/php3_string.h functions/file.h snprintf.h functions/fsock.h \
- php_globals.h
-functions/filepro.o: functions/filepro.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
- functions/filepro.h
-functions/filestat.o: functions/filestat.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
- functions/php3_filestat.h
-functions/formatted_print.o: functions/formatted_print.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/head.h functions/php3_string.h \
- libzend/zend_execute.h libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h
-functions/fsock.o: functions/fsock.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/base64.h \
- functions/file.h functions/post.h functions/url.h functions/fsock.h \
- build-defs.h
-functions/gd.o: functions/gd.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- functions/php3_gd.h
-functions/head.o: functions/head.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
- functions/php3_string.h functions/pageinfo.h main.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h \
- functions/datetime.h functions/head.h functions/post.h php_globals.h \
- functions/url.h
-functions/html.o: functions/html.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
- functions/html.h
-functions/image.o: functions/image.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/image.h
-functions/imap.o: functions/imap.c config.h php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h
-functions/link.o: functions/link.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_filestat.h php_globals.h functions/php3_link.h
-functions/mail.o: functions/mail.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h build-defs.h \
- functions/php3_mail.h php_ini.h
-functions/math.o: functions/math.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/phpmath.h \
- snprintf.h
-functions/iptc.o: functions/iptc.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_iptc.h
-functions/md5.o: functions/md5.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/md5.h \
- functions/global.h
-functions/microtime.o: functions/microtime.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/microtime.h snprintf.h
-functions/mime.o: functions/mime.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/type.h \
- functions/post.h functions/mime.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h php_globals.h
-functions/msql.o: functions/msql.c config.h php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_msql.h functions/reg.h functions/php3_string.h \
- php_globals.h
-functions/mysql.o: functions/mysql.c config.h build-defs.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h php_globals.h functions/php3_string.h \
- functions/php3_mysql.h php_ini.h
-functions/oracle.o: functions/oracle.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/oracle.h
-functions/oci8.o: functions/oci8.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_oci8.h
-functions/pack.o: functions/pack.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- functions/php3_string.h functions/pack.h snprintf.h functions/fsock.h
-functions/pageinfo.o: functions/pageinfo.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/pageinfo.h
-functions/pgsql.o: functions/pgsql.c config.h php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_pgsql.h functions/php3_string.h php_globals.h
-functions/post.o: functions/post.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/mime.h \
- functions/type.h functions/php3_string.h functions/post.h \
- functions/url.h php_globals.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h
-functions/rand.o: functions/rand.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/phpmath.h
-functions/reg.o: functions/reg.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_string.h functions/reg.h
-functions/solid.o: functions/solid.c config.h build-defs.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_solid.h
-functions/soundex.o: functions/soundex.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_string.h
-functions/string.o: functions/string.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
- functions/post.h functions/php3_string.h libzend/zend_execute.h \
- libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h php_globals.h
-functions/syslog.o: functions/syslog.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h \
- functions/php3_syslog.h
-functions/type.o: functions/type.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/type.h
-functions/uniqid.o: functions/uniqid.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/uniqid.h
-functions/sybase.o: functions/sybase.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_sybase.h \
- functions/php3_string.h php_globals.h
-functions/sybase-ct.o: functions/sybase-ct.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_sybase-ct.h \
- functions/php3_string.h php_globals.h
-functions/url.o: functions/url.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/url.h
-functions/base64.o: functions/base64.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/base64.h
-functions/info.o: functions/info.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
- php_globals.h functions/head.h functions/info.h build-defs.h \
- libzend/zend_globals.h libzend/zend_ptr_stack.h \
- libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h
-functions/bcmath.o: functions/bcmath.c config.h build-defs.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/number.h functions/php3_bcmath.h
-functions/number.o: functions/number.c functions/number.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h
-functions/xml.o: functions/xml.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_xml.h
-functions/unified_odbc.o: functions/unified_odbc.c config.h build-defs.h php.h \
- php_version.h libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h dl/phpdl.h functions/php3_string.h \
- functions/php3_unified_odbc.h functions/head.h snprintf.h
-functions/ldap.o: functions/ldap.c config.h php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h
-functions/browscap.o: functions/browscap.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_browscap.h php_ini.h libzend/zend_globals.h \
- libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
- libzend/zend_execute.h
-functions/velocis.o: functions/velocis.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_velocis.h
-functions/gdttf.o: functions/gdttf.c config.h
-functions/gdcache.o: functions/gdcache.c config.h
-functions/zlib.o: functions/zlib.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- functions/php3_string.h functions/php3_zlib.h snprintf.h
-functions/COM.o: functions/COM.c
-functions/pdf.o: functions/pdf.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- functions/php3_pdf.h
-functions/hw.o: functions/hw.c config.h php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h
-functions/hg_comm.o: functions/hg_comm.c config.h
-functions/dlist.o: functions/dlist.c config.h
-functions/fdf.o: functions/fdf.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
- functions/php3_fdf.h
-functions/snmp.o: functions/snmp.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_snmp.h
-functions/var.o: functions/var.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
- functions/post.h functions/php3_string.h functions/php3_var.h
-functions/interbase.o: functions/interbase.c config.h php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h \
- libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/php3_interbase.h
-functions/quot_print.o: functions/quot_print.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/quot_print.h
-functions/cyr_convert.o: functions/cyr_convert.c php.h php_version.h \
- libzend/zend.h libzend/config.h libzend/config.unix.h \
- libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
- libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
- libzend/zend_list.h config.h request_info.h php3_compat.h \
- libzend/zend_stack.h safe_mode.h fopen-wrappers.h \
- output.h libzend/zend_operators.h libzend/zend_variables.h \
- libzend/zend_constants.h functions/cyr_convert.h
-functions/sysvsem.o: functions/sysvsem.c config.h
-functions/sysvshm.o: functions/sysvshm.c config.h
-functions/dav.o: functions/dav.c php.h php_version.h libzend/zend.h \
- libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
- libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
- libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
- request_info.h php3_compat.h libzend/zend_stack.h \
- safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
- libzend/zend_variables.h libzend/zend_constants.h \
- functions/php3_dav.h
# Local Variables:
# tab-width: 4
Index: php4/aclocal.m4
diff -u php4/aclocal.m4:1.1.1.1 php4/aclocal.m4:1.2
--- php4/aclocal.m4:1.1.1.1 Wed Apr 7 17:00:33 1999
+++ php4/aclocal.m4 Fri Apr 16 20:37:05 1999
@@ -1,4 +1,16 @@
-dnl $Id: aclocal.m4,v 1.1.1.1 1999/04/07 21:00:33 zeev Exp $
+dnl aclocal.m4 generated automatically by aclocal 1.3
+
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl $Id: aclocal.m4,v 1.2 1999/04/17 00:37:05 ssb Exp $
dnl
dnl This file contains local autoconf functions.
@@ -227,28 +239,6 @@
])
])
-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
-## Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
# serial 9 AM_PROG_LIBTOOL
AC_DEFUN(AM_PROG_LIBTOOL,
@@ -415,3 +405,101 @@
fi
rm -f conftest*
AC_MSG_RESULT(yes)])
+
+dnl
+dnl Stuff to do when setting up a new extension.
+dnl XXX have to change the hardcoding of ".a" when we want to be able
+dnl to make dynamic libraries as well.
+dnl
+AC_DEFUN(PHP_EXTENSION,[
+ EXT_SUBDIRS="$EXT_SUBDIRS $1"
+ _extlib="libphpext_$1.a"
+ EXT_LIBS="$EXT_LIBS $1/$_extlib"
+ EXTINFO_DEPS="$EXTINFO_DEPS ../ext/$1/extinfo.c.stub"
+])
+
+AC_SUBST(EXT_SUBDIRS)
+AC_SUBST(EXT_LIBS)
+AC_SUBST(EXTINFO_DEPS)
+
+# Do all the work for Automake. This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AM_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "cd $srcdir && pwd" != "pwd"
&& test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=cd $ac_aux_dir && pwd
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+ $1=$2
+ AC_MSG_RESULT(found)
+else
+ $1="$3/missing $2"
+ AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated. We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp >
patsubst(<<$1>>, <<^\([^:]*/\)?.*>>,
<<\1>>)stamp-h<<>>dnl>>,
+<<am_indx=1
+for am_file in <<$1>>; do
+ case " <<$>>CONFIG_HEADERS " in
+ *" <<$>>am_file "*<<)>>
+ echo timestamp > echo <<$>>am_file | sed -e 's%:.*%%' -e
's%[^/]*$%%'stamp-h$am_indx
+ ;;
+ esac
+ am_indx=expr "<<$>>am_indx" + 1
+done<<>>dnl>>)
+changequote([,]))])
+
Index: php4/configuration-parser.y
diff -u php4/configuration-parser.y:1.4 php4/configuration-parser.y:1.5
--- php4/configuration-parser.y:1.4 Sat Apr 10 12:25:23 1999
+++ php4/configuration-parser.y Fri Apr 16 20:37:05 1999
@@ -30,15 +30,15 @@
-/* $Id: configuration-parser.y,v 1.4 1999/04/10 16:25:23 zeev Exp $ */
+/* $Id: configuration-parser.y,v 1.5 1999/04/17 00:37:05 ssb Exp $ */
#define DEBUG_CFG_PARSER 1
#include "php.h"
#include "php_globals.h"
#include "php_ini.h"
#include "functions/dl.h"
-#include "functions/file.h"
-#include "functions/php3_browscap.h"
+#include "ext/standard/file.h"
+#include "ext/standard/php3_browscap.h"
#include "zend_extensions.h"
#if WIN32
Index: php4/configure.in
diff -u php4/configure.in:1.3 php4/configure.in:1.4
--- php4/configure.in:1.3 Wed Apr 7 20:04:44 1999
+++ php4/configure.in Fri Apr 16 20:37:05 1999
@@ -1,13 +1,51 @@
-dnl $Id: configure.in,v 1.3 1999/04/08 00:04:44 ssb Exp $
+dnl $Id: configure.in,v 1.4 1999/04/17 00:37:05 ssb Exp $ -*- sh -*-
dnl Process this file with autoconf to produce a configure script.
+divert(0)
+recurse=yes
+for arg in $@; do
+ case $arg in
+ --no-recursion) recurse=no;;
+ *) ;;
+ esac
+done
+
+if test "$recurse" = "yes"; then
+ (cwd=pwd;set -x;cd libzend;./configure --cache-file=$cwd/config.cache $@)
+fi
+
+dnl ## Diversion 1 is the initial checking of OS features, programs,
+dnl ## libraries and so on.
+
+dnl ## In diversion 2 we check for compile-time options to the PHP
+dnl ## core and how to deal with different system dependencies. This
+dnl ## includes what regex library is used and whether debugging or short
+dnl ## tags are enabled, and the default behaviour of php3.ini options.
+dnl ## This is also where an SAPI interface is selected (choosing between
+dnl ## Apache module, CGI etc.)
+
+dnl ## In diversion 3 we check which extensions should be compiled.
+dnl ## All of these are normally in the extension directories.
+
+dnl ## Diversion 4 is the last one. Here we generate files and clean up.
+
+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=cut -d\" -f 2 $srcdir/php_version.h
+PHP_VERSION=$VERSION
+echo "#define PHP_VERSION \"$PHP_VERSION\"" > php_version.h.new
+if ! cmp php_version.h.new php_version.h >/dev/null; then
+ rm -f php_version.h && mv php_version.h.new php_version.h && \
+ echo 'Updated php_version.h'
+else
+ rm -f php_version.h.new
+fi
AC_SUBST(PHP_VERSION)
-AC_CONFIG_HEADER(config.h)
-AM_SANITY_CHECK
+AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
dnl We want this one before the checks, so the checks can modify CFLAGS.
@@ -16,16 +54,21 @@
dnl Checks for programs.
AC_PROG_YACC
if test "$YACC" != "bison -y"; then
- AC_MSG_WARN(You will need bison if you'd want to regenerate the PHP 3.0 parsers.)
+ AC_MSG_WARN(You will need bison if you want to regenerate the PHP parsers.)
else
AC_MSG_CHECKING(bison version)
- set bison --version| sed -e 's/^GNU Bison version //' -e 's/\./
/'
+ set $YACC --version| sed -e 's/^GNU Bison version //' -e 's/\./
/'
if test "$1" = "1" -a "$2" -lt "25"; then
- AC_MSG_WARN(You will need bison 1.25 if you'd want to regenerate the PHP 3.0 parsers
(found $1.$2).)
+ AC_MSG_WARN(You will need bison 1.25 if you want to regenerate the PHP parsers (found
$1.$2).)
fi
AC_MSG_RESULT($1.$2 (ok))
fi
+
+dnl ## there has to be a better way...
+dnl## OLDLIBS=$LIBS; LIBS=""
AC_PROG_CC
+dnl## LIBS=$OLDLIBS
+
AC_PROG_RANLIB
AC_PROG_CC_C_O
AC_PATH_PROG(PERL_PATH, perl)
@@ -98,6 +141,9 @@
LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
fi
+INCLUDES=""
+AC_SUBST(INCLUDES)
+
AC_PREFERRED_DB_LIB
AC_CHECK_LIB(nsl, gethostname, [
@@ -164,7 +210,7 @@
AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[
AC_MSG_RESULT("Try /opt/local/include/gdbm.h");
AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[
- dnl if in /usr/pkg/include, don't add anything. See above.
+ dnl if in /usr/pkg/include, do not add anything. See above.
AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h");
AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[
AC_MSG_RESULT("Giving up - You need to install gdbm.h somewhere");
@@ -173,7 +219,8 @@
])
])
])
- AC_SUBST(GDBM_INCLUDE)
+ INCLUDES="$INCLUDES $GDBM_INCLUDES"
+dnl## AC_SUBST(GDBM_INCLUDE)
fi
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -205,7 +252,9 @@
AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep
setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid
vsnprintf snprintf gcvt utime crypt rint unsetenv strftime setsockopt tzset)
AC_FUNC_UTIME_NULL
AC_FUNC_ALLOCA
+dnl## OLDLIBS=$LIBS; LIBS=""
AC_BROKEN_SPRINTF
+dnl## LIBS=$OLDLIBS
AC_REPLACE_FUNCS(getopt)
dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
@@ -230,6 +279,8 @@
AC_CRYPT_CAP
+divert(2)
+
AC_MSG_CHECKING(whether to use bundled regex library)
AC_ARG_WITH(system-regex,
[ --with-system-regex Do not use the bundled regex library],
@@ -328,7 +379,8 @@
AC_MSG_ERROR(Invalid Apache directory - unable to find httpd.h under $withval/src/include)
fi
fi
- AC_SUBST(APACHE_INCLUDE)
+ INCLUDES="$INCLUDES $APACHE_INCLUDE"
+dnl## AC_SUBST(APACHE_INCLUDE)
AC_SUBST(APACHE_TARGET)
AC_SUBST(INSTALL_IT)
AC_SUBST(BINNAME)
@@ -473,7 +525,8 @@
BINNAME=php
INSTALL_IT="cp $BINNAME \$(bindir)"
])
-AC_SUBST(APACHE_INCLUDE)
+INCLUDES="$INCLUDES $APACHE_INCLUDE"
+dnl## AC_SUBST(APACHE_INCLUDE)
AC_SUBST(APACHE_TARGET)
AC_SUBST(INSTALL_IT)
AC_SUBST(BINNAME)
@@ -520,192 +573,407 @@
],[
AC_MSG_RESULT(no)
])
-AC_SUBST(FHTTPD_INCLUDE)
+INCLUDES="$INCLUDES $FHTTPD_INCLUDE"
+dnl## AC_SUBST(FHTTPD_INCLUDE)
AC_SUBST(FHTTPD_LIB)
AC_SUBST(FHTTPD_TARGET)
-AC_MSG_CHECKING(for IMAP support)
-AC_ARG_WITH(imap,
-[ --with-imap[=DIR] Include IMAP support (DIR is IMAP's include dir and c-client.a
dir).],
+
+AC_MSG_CHECKING(whether to use a configuration file)
+AC_ARG_WITH(config-file-path,
+[ --with-config-file-path=PATH Sets the path in which to look for php3.ini
+ defaults to /usr/local/lib],
[
- if test "$withval" != "no"; then
- if test "$withval" = "yes"; then
- IMAP_DIR=/usr/local
- else
- IMAP_DIR=$withval
+ if test "$withval" = "yes"; then
+ AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "/usr/local/lib")
+ AC_DEFINE(USE_CONFIG_FILE, 1)
+ AC_MSG_RESULT(yes)
+ else
+ if test "$withval" != "no"; then
+ AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$withval")
+ AC_DEFINE(USE_CONFIG_FILE, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(CONFIGURATION_FILE_PATH, 0)
+ AC_DEFINE(USE_CONFIG_FILE, 0)
+ AC_MSG_RESULT(no)
fi
- if test ! -f $IMAP_DIR/include/mail.h; then
- AC_MSG_ERROR(could not find mail.h in $IMAP_DIR/include !)
- fi
- if test ! -f $IMAP_DIR/include/rfc822.h; then
- AC_MSG_ERROR(could not find rfc822.h in $IMAP_DIR/include !)
- fi
- if test ! -f $IMAP_DIR/include/linkage.h; then
- AC_MSG_ERROR(could not find linkage.h in $IMAP_DIR/include !)
- fi
- if test ! -f $IMAP_DIR/lib/c-client.a; then
- AC_MSG_ERROR(could not find c-client.a in $IMAP_DIR/lib !)
- fi
- IMAP_INCLUDE="-I$IMAP_DIR/include/"
- IMAP_LIBS="$IMAP_DIR/lib/c-client.a"
- AC_SUBST(IMAP_INCLUDE)
- AC_SUBST(IMAP_LIBS)
- AC_DEFINE(HAVE_IMAP)
- AC_MSG_RESULT(yes)
- else
- AC_MSG_ERROR(could not find imap library!)
- fi
+ fi
],[
- AC_MSG_RESULT(no)
-])
+ AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "/usr/local/lib")
+ AC_DEFINE(USE_CONFIG_FILE, 1)
+ AC_MSG_RESULT(yes)
+])
+
-AC_MSG_CHECKING(whether to include GD support)
-AC_ARG_WITH(gd,
-[ --without-gd Disable GD support.
- --with-gd[=DIR] Include GD support (DIR is GD's install dir).],
+AC_MSG_CHECKING(whether to include debugging symbols)
+AC_ARG_ENABLE(debug,
+[ --enable-debug Compile with debugging symbols],
[
- case "$withval" in
- no)
- AC_MSG_RESULT(no) ;;
- yes)
- GD_LIBS="-lgd"
- AC_DEFINE(HAVE_LIBGD)
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
- ac_cv_lib_gd_gdImageLine=yes
- ;;
- *)
-dnl A whole whack of possible places where this might be
- test -f $withval/include/gd1.3/gd.h &&
GD_INCLUDE="-I$withval/include/gd1.3"
- test -f $withval/include/gd/gd.h && GD_INCLUDE="-I$withval/include/gd"
- test -f $withval/include/gd.h && GD_INCLUDE="-I$withval/include"
- test -f $withval/gd1.3/gd.h && GD_INCLUDE="-I$withval/gd1.3"
- test -f $withval/gd/gd.h && GD_INCLUDE="-I$withval/gd"
- test -f $withval/gd.h && GD_INCLUDE="-I$withval"
-
- test -f $withval/lib/libgd.a && GD_LIB="$withval/lib"
- test -f $withval/lib/gd/libgd.a && GD_LIB="$withval/lib/gd"
- test -f $withval/lib/gd1.3/libgd.a && GD_LIB="$withval/lib/gd1.3"
- test -f $withval/libgd.a && GD_LIB="$withval"
- test -f $withval/gd/libgd.a && GD_LIB="$withval/gd"
- test -f $withval/gd1.3/libgd.a && GD_LIB="$withval/gd1.3"
-
- if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then
- GD_LIBS="-L$GD_LIB -lgd"
- AC_DEFINE(HAVE_LIBGD)
- AC_MSG_RESULT(yes)
- AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
- ac_cv_lib_gd_gdImageLine=yes
- else
- AC_MSG_RESULT(no)
- fi ;;
- esac
+ if test "$enableval" = "yes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(DEBUG,1)
+ PHP_DEBUG=1
+ DEBUG_CFLAGS="-g"
+ test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
+ test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes"
&& \
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes
-Wmissing-declarations"
+ else
+ AC_MSG_RESULT(no)
+ AC_DEFINE(DEBUG,0)
+ PHP_DEBUG=0
+ DEBUG_CFLAGS=""
+ fi
],[
- AC_CHECK_LIB(gd, gdImageLine)
- AC_CHECK_LIB(gd, gdImageString16, [ AC_DEFINE(HAVE_LIBGD13) ])
-])
-AC_SUBST(GD_LIBS)
-if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
- GD_INCLUDE="-I/usr/pkg/include/gd"
-fi
-AC_SUBST(GD_INCLUDE)
-if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then
- AC_CHECK_LIB(ttf, TT_Open_Face)
-fi
+ AC_MSG_RESULT(no)
+ AC_DEFINE(DEBUG,0)
+ PHP_DEBUG=0
+ DEBUG_CFLAGS=""
+])
+AC_SUBST(DEBUG_CFLAGS)
+AC_SUBST(PHP_DEBUG)
-
-AC_MSG_CHECKING(for Oracle support)
-AC_ARG_WITH(oracle,
-[ --with-oracle[=DIR] Include Oracle database support. DIR is Oracle's
- home directory, defaults to \$ORACLE_HOME.],
+AC_MSG_CHECKING(whether to enable safe mode by default)
+AC_ARG_ENABLE(safe-mode,
+[ --enable-safe-mode Enable safe mode by default.],
[
- case "$withval" in
- yes)
- ORACLEINST_TOP=$ORACLE_HOME
- AC_MSG_RESULT(yes)
- ;;
- no)
- ORACLEINST_TOP=
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- ORACLEINST_TOP=$withval
- ;;
- esac
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(PHP_SAFE_MODE, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(PHP_SAFE_MODE, 0)
+ AC_MSG_RESULT(no)
+ fi
+],[
+ AC_DEFINE(PHP_SAFE_MODE, 0)
+ AC_MSG_RESULT(no)
+])
- if test "$ORACLEINST_TOP" != ""
- then
- # Oracle include files
+AC_MSG_CHECKING(for safe mode exec dir)
+AC_ARG_WITH(exec-dir,
+[ --with-exec-dir[=DIR] Only allow executables in DIR when in safe mode
+ defaults to /usr/local/php/bin],
+[
+ if test "$withval" != "no"; then
+ if test "$withval" = "yes"; then
+ AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
+ AC_MSG_RESULT(/usr/local/php/bin)
+ else
+ AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval")
+ AC_MSG_RESULT($withval)
+ fi
+ else
+ AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
+ AC_MSG_RESULT(/usr/local/php/bin)
+ fi
+],[
+ AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
+ AC_MSG_RESULT(/usr/local/php/bin)
+])
- if test -f "$ORACLEINST_TOP/rdbms/public/ocidfn.h"
- then
- # V8.0.5
- ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/public"
- elif test -f "$ORACLEINST_TOP/rdbms/demo/ocidfn.h"
- then
- # V7.[0123]
- ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo
- fi
- if test -d "$ORACLEINST_TOP/network/public"
- then
- # V8
- ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/network/public"
- fi
+AC_MSG_CHECKING(whether to enable track_vars variables by default)
+AC_ARG_ENABLE(track-vars,
+[ --enable-track-vars Enable GET/POST/Cookie track variables by default.],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(PHP_TRACK_VARS, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(PHP_TRACK_VARS, 0)
+ AC_MSG_RESULT(no)
+ fi
+],[
+ AC_DEFINE(PHP_TRACK_VARS, 0)
+ AC_MSG_RESULT(no)
+])
- if test -d "$ORACLEINST_TOP/plsql/public"
- then
- # V8
- ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/plsql/public"
- fi
- # Need to know the version, otherwhise we will mixup nlsrtl
- AC_ORACLE_VERSION($ORACLEINST_TOP)
+AC_MSG_CHECKING(whether to enable magic quotes by default)
+AC_ARG_ENABLE(magic-quotes,
+[ --enable-magic-quotes Enable magic quotes by default.],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(MAGIC_QUOTES, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(MAGIC_QUOTES, 0)
+ AC_MSG_RESULT(no)
+ fi
+],[
+ AC_DEFINE(MAGIC_QUOTES, 0)
+ AC_MSG_RESULT(no)
+])
- # Oracle libs - nightmare :-)
- ORACLE_LIBDIR=lib
- ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR
${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR"
- if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist"
- then
- ORA_SYSLIB="cat $ORACLEINST_TOP/rdbms/lib/sysliblist"
- else
- ORA_SYSLIB="-lm"
- fi
+dnl AC_MSG_CHECKING(whether to enable PHP RPC support)
+dnl AC_ARG_ENABLE(php-rpc,
+dnl [ --enable-php-rpc Compile with PHP RPC support.],
+dnl [
+dnl if test "$enableval" = "yes"; then
+dnl AC_DEFINE(PHP_RPC, 1)
+dnl AC_MSG_RESULT(yes)
+dnl else
+dnl AC_DEFINE(PHP_RPC, 0)
+dnl AC_MSG_RESULT(no)
+dnl fi
+dnl ],[
+dnl AC_DEFINE(PHP_RPC, 0)
+dnl AC_MSG_RESULT(no)
+dnl ])
- # Oracle Static libs
- case $ORACLE_VERSION in
- 7.0|7.1)
- ORACLE_STLIBS="-locic $ORACLEINST_TOP/$ORACLE_LIBDIR/osntab.o \
- -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcv6 \
- -lcore $ORA_SYSLIB -lcore $ORA_SYSLIB"
- if test "uname -s 2>/dev/null" = "AIX"; then
- ORACLE_STLIBS="$ORACLE_STLIBS -bI:$ORACLE_HOME/lib/mili.exp"
- fi
- ;;
- 7.2)
- ORACLE_STLIBS="-locic $ORACLEINST_TOP/$ORACLE_LIBDIR/osntab.o \
- -lsqlnet -lora -lsqlnet -lora -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 \
- -lcore3 $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
- ;;
- 7.3)
- ORACLE_STLIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \
- -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \
- -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 \
- $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
- ;;
- 8.0)
- ORACLE_STLIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \
- -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \
- -lepc -lnlsrtl3 -lc3v6 -lcore4 -lnlsrtl3 -lcore4 -lnlsrtl3 \
- $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
- ;;
- *)
- ORACLE_STLIBS=
- ;;
+AC_MSG_CHECKING(whether to enable bc style precision math functions)
+AC_ARG_ENABLE(bcmath,
+[ --disable-bcmath Compile without bc style precision math functions. ],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(WITH_BCMATH, 1)
+ AC_MSG_RESULT(yes)
+ BCMATH_SRC="functions/bcmath.c functions/number.c"
+ else
+ AC_DEFINE(WITH_BCMATH, 0)
+ AC_MSG_RESULT(no)
+ BCMATH_SRC=""
+ fi
+],[
+ AC_DEFINE(WITH_BCMATH, 1)
+ AC_MSG_RESULT(yes)
+ BCMATH_SRC="functions/bcmath.c functions/number.c"
+])
+AC_SUBST(BCMATH_SRC)
+
+if test "$BINNAME" = "php"; then
+AC_MSG_CHECKING(whether to force Apache CGI redirect)
+AC_ARG_ENABLE(force-cgi-redirect,
+[ --enable-force-cgi-redirect Enable the security check for internal server
+ redirects. You should use this if you are
+ running the CGI version with Apache. ],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(FORCE_CGI_REDIRECT, 1)
+ AC_MSG_RESULT(yes)
+ REDIRECT=1
+ else
+ AC_DEFINE(FORCE_CGI_REDIRECT, 0)
+ AC_MSG_RESULT(no)
+ REDIRECT=0
+ fi
+],[
+ AC_DEFINE(FORCE_CGI_REDIRECT, 0)
+ AC_MSG_RESULT(no)
+ REDIRECT=0
+])
+
+AC_MSG_CHECKING(whether to discard path_info + path_translated)
+AC_ARG_ENABLE(discard_path,
+[ --enable-discard-path If this is enabled, the PHP CGI binary
+ can safely be placed outside of the
+ web tree and people will not be able
+ to circumvent .htaccess security. ],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(DISCARD_PATH, 1)
+ AC_MSG_RESULT(yes)
+ DISCARD_PATH=1
+ else
+ AC_DEFINE(DISCARD_PATH, 0)
+ AC_MSG_RESULT(no)
+ DISCARD_PATH=0
+ fi
+],[
+ AC_DEFINE(DISCARD_PATH, 0)
+ AC_MSG_RESULT(no)
+ DISCARD_PATH=0
+])
+fi
+
+AC_MSG_CHECKING(whether to enable a memory limit)
+AC_ARG_ENABLE(memory-limit,
+[ --enable-memory-limit Compile with memory limit support. ],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(MEMORY_LIMIT, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(MEMORY_LIMIT, 0)
+ AC_MSG_RESULT(no)
+ fi
+],[
+ AC_DEFINE(MEMORY_LIMIT, 0)
+ AC_MSG_RESULT(no)
+])
+
+AC_MSG_CHECKING(whether to enable short tags by default)
+AC_ARG_ENABLE(short-tags,
+[ --disable-short-tags Disable the short-form <? start tag by default.],
+[
+ if test "$enableval" = "no"; then
+ AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 0)
+ AC_MSG_RESULT(no)
+ else
+ AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 1)
+ AC_MSG_RESULT(yes)
+ fi
+],[
+ AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 1)
+ AC_MSG_RESULT(yes)
+])
+
+AC_MSG_CHECKING(whether to enable the URL-aware fopen wrapper)
+AC_ARG_ENABLE(url-fopen-wrapper,
+[ --disable-url-fopen-wrapper Disable the URL-aware fopen wrapper that allows
+ accessing files via http or ftp.],
+[
+ if test "$enableval" = "yes"; then
+ AC_DEFINE(PHP3_URL_FOPEN, 1)
+ AC_MSG_RESULT(yes)
+ else
+ AC_DEFINE(PHP3_URL_FOPEN, 0)
+ AC_MSG_RESULT(no)
+ fi
+],[
+ AC_DEFINE(PHP3_URL_FOPEN, 1)
+ AC_MSG_RESULT(yes)
+])
+
+
+divert(3)
+
+# reading config stubs
+esyscmd(./scripts/config-stubs)
+
+AC_MSG_CHECKING(for IMAP support)
+AC_ARG_WITH(imap,
+[ --with-imap[=DIR] Include IMAP support (DIR is the IMAP include dir and c-client.a dir).],
+[
+ if test "$withval" != "no"; then
+ if test "$withval" = "yes"; then
+ IMAP_DIR=/usr/local
+ else
+ IMAP_DIR=$withval
+ fi
+ if test ! -f $IMAP_DIR/include/mail.h; then
+ AC_MSG_ERROR(could not find mail.h in $IMAP_DIR/include !)
+ fi
+ if test ! -f $IMAP_DIR/include/rfc822.h; then
+ AC_MSG_ERROR(could not find rfc822.h in $IMAP_DIR/include !)
+ fi
+ if test ! -f $IMAP_DIR/include/linkage.h; then
+ AC_MSG_ERROR(could not find linkage.h in $IMAP_DIR/include !)
+ fi
+ if test ! -f $IMAP_DIR/lib/c-client.a; then
+ AC_MSG_ERROR(could not find c-client.a in $IMAP_DIR/lib !)
+ fi
+ IMAP_INCLUDE="-I$IMAP_DIR/include/"
+ IMAP_LIBS="$IMAP_DIR/lib/c-client.a"
+
+dnl## AC_SUBST(IMAP_INCLUDE)
+ INCLUDES="$INCLUDES $IMAP_INCLUDE"
+ AC_SUBST(IMAP_LIBS)
+ LIBS="$LIBS $IMAP_LIBS"
+ AC_DEFINE(HAVE_IMAP)
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_ERROR(could not find imap library!)
+ fi
+],[
+ AC_MSG_RESULT(no)
+])
+
+
+AC_MSG_CHECKING(for Oracle support)
+AC_ARG_WITH(oracle,
+[ --with-oracle[=DIR] Include Oracle database support. DIR is Oracle's
+ home directory, defaults to \$ORACLE_HOME.],
+[
+ case "$withval" in
+ yes)
+ ORACLEINST_TOP=$ORACLE_HOME
+ AC_MSG_RESULT(yes)
+ ;;
+ no)
+ ORACLEINST_TOP=
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ ORACLEINST_TOP=$withval
+ ;;
+ esac
+
+ if test "$ORACLEINST_TOP" != ""
+ then
+
+ # Oracle include files
+
+ if test -f "$ORACLEINST_TOP/rdbms/public/ocidfn.h"
+ then
+ # V8.0.5
+ ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/public"
+ elif test -f "$ORACLEINST_TOP/rdbms/demo/ocidfn.h"
+ then
+ # V7.[0123]
+ ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo
+ fi
+
+ if test -d "$ORACLEINST_TOP/network/public"
+ then
+ # V8
+ ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/network/public"
+ fi
+
+ if test -d "$ORACLEINST_TOP/plsql/public"
+ then
+ # V8
+ ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/plsql/public"
+ fi
+
+ # Need to know the version, otherwhise we will mixup nlsrtl
+ AC_ORACLE_VERSION($ORACLEINST_TOP)
+
+ # Oracle libs - nightmare :-)
+
+ ORACLE_LIBDIR=lib
+ ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR
${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR"
+ if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist"
+ then
+ ORA_SYSLIB="cat $ORACLEINST_TOP/rdbms/lib/sysliblist"
+ else
+ ORA_SYSLIB="-lm"
+ fi
+
+ # Oracle Static libs
+ case $ORACLE_VERSION in
+ 7.0|7.1)
+ ORACLE_STLIBS="-locic $ORACLEINST_TOP/$ORACLE_LIBDIR/osntab.o \
+ -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcv6 \
+ -lcore $ORA_SYSLIB -lcore $ORA_SYSLIB"
+ if test "uname -s 2>/dev/null" = "AIX"; then
+ ORACLE_STLIBS="$ORACLE_STLIBS -bI:$ORACLE_HOME/lib/mili.exp"
+ fi
+ ;;
+ 7.2)
+ ORACLE_STLIBS="-locic $ORACLEINST_TOP/$ORACLE_LIBDIR/osntab.o \
+ -lsqlnet -lora -lsqlnet -lora -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 \
+ -lcore3 $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
+ ;;
+ 7.3)
+ ORACLE_STLIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \
+ -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \
+ -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 \
+ $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
+ ;;
+ 8.0)
+ ORACLE_STLIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \
+ -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \
+ -lepc -lnlsrtl3 -lc3v6 -lcore4 -lnlsrtl3 -lcore4 -lnlsrtl3 \
+ $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
+ ;;
+ *)
+ ORACLE_STLIBS=
+ ;;
esac
# Oracle shared libs
@@ -761,7 +1029,8 @@
AC_SUBST(ORACLE_STLIBS)
AC_SUBST(ORACLE_LIBS)
AC_SUBST(ORACLE_LFLAGS)
-AC_SUBST(ORACLE_INCLUDE)
+dnl## AC_SUBST(ORACLE_INCLUDE)
+INCLUDES="$INCLUDES $ORACLE_INCLUDE"
AC_SUBST(ORACLE_HOME)
AC_SUBST(ORACLE_VERSION)
@@ -793,7 +1062,8 @@
])
AC_SUBST(IODBC_LIBS)
AC_SUBST(IODBC_LFLAGS)
-AC_SUBST(IODBC_INCLUDE)
+dnl## AC_SUBST(IODBC_INCLUDE)
+INCLUDES="$INCLUDES $IODBC_INCLUDE"
AC_MSG_CHECKING(for OpenLink ODBC support)
@@ -824,7 +1094,8 @@
])
AC_SUBST(OPENLINK_LIBS)
AC_SUBST(OPENLINK_LFLAGS)
-AC_SUBST(OPENLINK_INCLUDE)
+dnl## AC_SUBST(OPENLINK_INCLUDE)
+INCLUDES="$INCLUDES $OPENLINK_INCLUDE"
AC_MSG_CHECKING(for Adabas support)
@@ -853,7 +1124,8 @@
])
AC_SUBST(ADA_LIBS)
AC_SUBST(ADA_LFLAGS)
-AC_SUBST(ADA_INCLUDE)
+dnl## AC_SUBST(ADA_INCLUDE)
+INCLUDES="$INCLUDES $ADA_INCLUDE"
AC_MSG_CHECKING(for Sybase support)
@@ -886,7 +1158,8 @@
])
AC_SUBST(SYBASE_LIBS)
AC_SUBST(SYBASE_LFLAGS)
-AC_SUBST(SYBASE_INCLUDE)
+dnl## AC_SUBST(SYBASE_INCLUDE)
+INCLUDES="$INCLUDES $SYBASE_INCLUDE"
AC_MSG_CHECKING(for Sybase-CT support)
AC_ARG_WITH(sybase-ct,
@@ -923,7 +1196,8 @@
])
AC_SUBST(SYBASE_CT_LIBS)
AC_SUBST(SYBASE_CT_LFLAGS)
-AC_SUBST(SYBASE_CT_INCLUDE)
+dnl## AC_SUBST(SYBASE_CT_INCLUDE)
+INCLUDES="$INCLUDES $SYBASE_CT_INCLUDE"
AC_MSG_CHECKING(for MySQL support)
@@ -973,7 +1247,8 @@
])
AC_SUBST(MYSQL_LIBS)
AC_SUBST(MYSQL_LFLAGS)
-AC_SUBST(MYSQL_INCLUDE)
+dnl## AC_SUBST(MYSQL_INCLUDE)
+INCLUDES="$INCLUDES $MYSQL_INCLUDE"
AC_MSG_CHECKING(for mSQL support)
@@ -1004,7 +1279,8 @@
])
AC_SUBST(MSQL_LIBS)
AC_SUBST(MSQL_LFLAGS)
-AC_SUBST(MSQL_INCLUDE)
+dnl## AC_SUBST(MSQL_INCLUDE)
+INCLUDES="$INCLUDES $MSQL_INCLUDE"
AC_MSG_CHECKING(for PostgresSQL support)
AC_ARG_WITH(pgsql,
@@ -1041,7 +1317,8 @@
])
AC_SUBST(PGSQL_LIBS)
AC_SUBST(PGSQL_LFLAGS)
-AC_SUBST(PGSQL_INCLUDE)
+dnl## AC_SUBST(PGSQL_INCLUDE)
+INCLUDES="$INCLUDES $PGSQL_INCLUDE"
AC_MSG_CHECKING(for Solid support)
@@ -1072,8 +1349,9 @@
if test "$SOLID_LIBDIR" != ""; then
AC_FIND_SOLID_LIBS($SOLID_LIBDIR)
fi
-AC_SUBST(SOLID_INCLUDE)
+dnl## AC_SUBST(SOLID_INCLUDE)
AC_SUBST(SOLID_LIBS)
+INCLUDES="$INCLUDES $SOLID_INCLUDE"
AC_MSG_CHECKING(for Empress support)
@@ -1104,8 +1382,9 @@
if test "$EMPRESS_LIBDIR" != ""; then
AC_FIND_EMPRESS_LIBS($EMPRESS_LIBDIR)
fi
-AC_SUBST(EMPRESS_INCLUDE)
AC_SUBST(EMPRESS_LIBS)
+dnl## AC_SUBST(EMPRESS_INCLUDE)
+INCLUDES="$INCLUDES $EMPRESS_INCLUDE"
AC_MSG_CHECKING(for LDAP support)
@@ -1136,8 +1415,10 @@
])
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAP_LFLAGS)
-AC_SUBST(LDAP_INCLUDE)
+dnl## AC_SUBST(LDAP_INCLUDE)
+INCLUDES="$INCLUDES $LDAP_INCLUDE"
+
AC_MSG_CHECKING(for SNMP support)
AC_ARG_WITH(snmp,
[ --with-snmp[=DIR] Include SNMP support. DIR is the SNMP base
@@ -1168,7 +1449,9 @@
])
AC_SUBST(SNMP_LIBS)
AC_SUBST(SNMP_LFLAGS)
-AC_SUBST(SNMP_INCLUDE)
+dnl## AC_SUBST(SNMP_INCLUDE)
+INCLUDES="$INCLUDES $SNMP_INCLUDE"
+
AC_MSG_CHECKING(for Velocis support)
AC_ARG_WITH(velocis,
@@ -1208,8 +1491,10 @@
])
AC_SUBST(VELOCIS_LIBS)
AC_SUBST(VELOCIS_LFLAGS)
-AC_SUBST(VELOCIS_INCLUDE)
+dnl## AC_SUBST(VELOCIS_INCLUDE)
+INCLUDES="$INCLUDES $VELOCIS_INCLUDE"
+
AC_MSG_CHECKING(for Informix support)
AC_ARG_WITH(informix,
[ --with-informix[=DIR] Include Informix support. DIR is the Informix base
@@ -1244,7 +1529,7 @@
dnl -lm twice otherwise?
IFX_LIBS=echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql:
error -55923: No source or object file\.//g'
dnl Seems to get rid of newlines.
- dnl According to Perl's DBD-Informix, might contain these strings.
+ dnl According to Perls DBD-Informix, might contain these strings.
else
dnl Allow override to use static and/or threaded libs
IFX_LIBS="$IFX_LIBS"
@@ -1277,8 +1562,10 @@
])
AC_SUBST(IFX_LIBS)
AC_SUBST(IFX_LFLAGS)
-AC_SUBST(IFX_INCLUDE)
AC_SUBST(INFORMIXDIR)
+dnl## AC_SUBST(IFX_INCLUDE)
+INCLUDES="$INCLUDES $IFX_INCLUDE"
+
AC_MSG_CHECKING(for InterBase support)
AC_ARG_WITH(interbase,
@@ -1306,10 +1593,12 @@
],[
AC_MSG_RESULT(no)
])
-AC_SUBST(IBASE_INCLUDE)
AC_SUBST(IBASE_LIBS)
AC_SUBST(IBASE_LFLAGS)
+dnl## AC_SUBST(IBASE_INCLUDE)
+INCLUDES="$INCLUDES $IBASE_INCLUDE"
+
AC_MSG_CHECKING(for a custom ODBC support)
AC_ARG_WITH(custom-odbc,
[ --with-custom-odbc[=DIR] Include a user defined ODBC support.
@@ -1346,7 +1635,8 @@
])
AC_SUBST(CODBC_LIBS)
AC_SUBST(CODBC_LFLAGS)
-AC_SUBST(CODBC_INCLUDE)
+dnl## AC_SUBST(CODBC_INCLUDE)
+INCLUDES="$INCLUDES $CODBC_INCLUDE"
AC_MSG_CHECKING(for Hyperwave support)
@@ -1413,7 +1703,8 @@
AC_MSG_RESULT(no)
])
AC_SUBST(ZLIB_LIBS)
-AC_SUBST(ZLIB_INCLUDE)
+dnl## AC_SUBST(ZLIB_INCLUDE)
+INCLUDES="$INCLUDES $ZLIB_INCLUDE"
AC_MSG_CHECKING(whether to include pdflib support)
@@ -1446,7 +1737,8 @@
AC_MSG_RESULT(no)
])
AC_SUBST(PDFLIB_LIBS)
-AC_SUBST(PDFLIB_INCLUDE)
+dnl## AC_SUBST(PDFLIB_INCLUDE)
+INCLUDES="$INCLUDES $PDFLIB_INCLUDE"
AC_MSG_CHECKING(whether to include fdftk support)
@@ -1479,7 +1771,8 @@
AC_MSG_RESULT(no)
])
AC_SUBST(FDFLIB_LIBS)
-AC_SUBST(FDFLIB_INCLUDE)
+dnl## AC_SUBST(FDFLIB_INCLUDE)
+INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
AC_MSG_CHECKING(whether to include the bundled dbase library)
@@ -1532,7 +1825,7 @@
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MOD_DAV, 1)
MOD_DAV_CFLAGS="-DHAVE_MOD_DAV -I$withval"
- APACHE_INCLUDE="$APACHE_INCLUDE -I$withval"
+ INCLUDES="$INCLUDES -I$withval"
else
AC_MSG_RESULT(no)
AC_DEFINE(HAVE_MOD_DAV, 0)
@@ -1544,6 +1837,7 @@
])
AC_SUBST(MOD_DAV_CFLAGS)
+
AC_MSG_CHECKING(whether to enable unified ODBC support)
AC_ARG_ENABLE(unified-odbc,
[ --disable-unified-odbc Disable unified ODBC support. Only applicable if
@@ -1581,270 +1875,6 @@
])
-
-
-
-
-
-AC_MSG_CHECKING(whether to use a configuration file)
-AC_ARG_WITH(config-file-path,
-[ --with-config-file-path=PATH Sets the path in which to look for php3.ini
- defaults to /usr/local/lib],
-[
- if test "$withval" = "yes"; then
- AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "/usr/local/lib")
- AC_DEFINE(USE_CONFIG_FILE, 1)
- AC_MSG_RESULT(yes)
- else
- if test "$withval" != "no"; then
- AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "$withval")
- AC_DEFINE(USE_CONFIG_FILE, 1)
- AC_MSG_RESULT(yes)
- else
- AC_DEFINE(CONFIGURATION_FILE_PATH, 0)
- AC_DEFINE(USE_CONFIG_FILE, 0)
- AC_MSG_RESULT(no)
- fi
- fi
-],[
- AC_DEFINE_UNQUOTED(CONFIGURATION_FILE_PATH, "/usr/local/lib")
- AC_DEFINE(USE_CONFIG_FILE, 1)
- AC_MSG_RESULT(yes)
-])
-
-
-AC_MSG_CHECKING(whether to include debugging symbols)
-AC_ARG_ENABLE(debug,
-[ --enable-debug Compile with debugging symbols],
-[
- if test "$enableval" = "yes"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(DEBUG,1)
- PHP_DEBUG=1
- DEBUG_CFLAGS="-g"
- test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
- test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes"
&& \
- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes
-Wmissing-declarations"
- else
- AC_MSG_RESULT(no)
- AC_DEFINE(DEBUG,0)
- PHP_DEBUG=0
- DEBUG_CFLAGS=""
- fi
-],[
- AC_MSG_RESULT(no)
- AC_DEFINE(DEBUG,0)
- PHP_DEBUG=0
- DEBUG_CFLAGS=""
-])
-AC_SUBST(DEBUG_CFLAGS)
-AC_SUBST(PHP_DEBUG)
-
-
-AC_MSG_CHECKING(whether to enable safe mode by default)
-AC_ARG_ENABLE(safe-mode,
-[ --enable-safe-mode Enable safe mode by default.],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(PHP_SAFE_MODE, 1)
- AC_MSG_RESULT(yes)
- else
- AC_DEFINE(PHP_SAFE_MODE, 0)
- AC_MSG_RESULT(no)
- fi
-],[
- AC_DEFINE(PHP_SAFE_MODE, 0)
- AC_MSG_RESULT(no)
-])
-
-
-AC_MSG_CHECKING(for safe mode exec dir)
-AC_ARG_WITH(exec-dir,
-[ --with-exec-dir[=DIR] Only allow executables in DIR when in safe mode
- defaults to /usr/local/php/bin],
-[
- if test "$withval" != "no"; then
- if test "$withval" = "yes"; then
- AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
- AC_MSG_RESULT(/usr/local/php/bin)
- else
- AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval")
- AC_MSG_RESULT($withval)
- fi
- else
- AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
- AC_MSG_RESULT(/usr/local/php/bin)
- fi
-],[
- AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin")
- AC_MSG_RESULT(/usr/local/php/bin)
-])
-
-
-AC_MSG_CHECKING(whether to enable track_vars variables by default)
-AC_ARG_ENABLE(track-vars,
-[ --enable-track-vars Enable GET/POST/Cookie track variables by default.],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(PHP_TRACK_VARS, 1)
- AC_MSG_RESULT(yes)
- else
- AC_DEFINE(PHP_TRACK_VARS, 0)
- AC_MSG_RESULT(no)
- fi
-],[
- AC_DEFINE(PHP_TRACK_VARS, 0)
- AC_MSG_RESULT(no)
-])
-
-
-AC_MSG_CHECKING(whether to enable magic quotes by default)
-AC_ARG_ENABLE(magic-quotes,
-[ --enable-magic-quotes Enable magic quotes by default.],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(MAGIC_QUOTES, 1)
- AC_MSG_RESULT(yes)
- else
- AC_DEFINE(MAGIC_QUOTES, 0)
- AC_MSG_RESULT(no)
- fi
-],[
- AC_DEFINE(MAGIC_QUOTES, 0)
- AC_MSG_RESULT(no)
-])
-
-
-dnl AC_MSG_CHECKING(whether to enable PHP RPC support)
-dnl AC_ARG_ENABLE(php-rpc,
-dnl [ --enable-php-rpc Compile with PHP RPC support.],
-dnl [
-dnl if test "$enableval" = "yes"; then
-dnl AC_DEFINE(PHP_RPC, 1)
-dnl AC_MSG_RESULT(yes)
-dnl else
-dnl AC_DEFINE(PHP_RPC, 0)
-dnl AC_MSG_RESULT(no)
-dnl fi
-dnl ],[
-dnl AC_DEFINE(PHP_RPC, 0)
-dnl AC_MSG_RESULT(no)
-dnl ])
-
-AC_MSG_CHECKING(whether to enable bc style precision math functions)
-AC_ARG_ENABLE(bcmath,
-[ --disable-bcmath Compile without bc style precision math functions. ],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(WITH_BCMATH, 1)
- AC_MSG_RESULT(yes)
- BCMATH_SRC="functions/bcmath.c functions/number.c"
- else
- AC_DEFINE(WITH_BCMATH, 0)
- AC_MSG_RESULT(no)
- BCMATH_SRC=""
- fi
-],[
- AC_DEFINE(WITH_BCMATH, 1)
- AC_MSG_RESULT(yes)
- BCMATH_SRC="functions/bcmath.c functions/number.c"
-])
-AC_SUBST(BCMATH_SRC)
-
-if test "$BINNAME" = "php"; then
-AC_MSG_CHECKING(whether to force Apache CGI redirect)
-AC_ARG_ENABLE(force-cgi-redirect,
-[ --enable-force-cgi-redirect Enable the security check for internal server
- redirects. You should use this if you are
- running the CGI version with Apache. ],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(FORCE_CGI_REDIRECT, 1)
- AC_MSG_RESULT(yes)
- REDIRECT=1
- else
- AC_DEFINE(FORCE_CGI_REDIRECT, 0)
- AC_MSG_RESULT(no)
- REDIRECT=0
- fi
-],[
- AC_DEFINE(FORCE_CGI_REDIRECT, 0)
- AC_MSG_RESULT(no)
- REDIRECT=0
-])
-
-AC_MSG_CHECKING(whether to discard path_info + path_translated)
-AC_ARG_ENABLE(discard_path,
-[ --enable-discard-path If this is enabled, the PHP CGI binary
- can safely be placed outside of the
- web tree and people will not be able
- to circumvent .htaccess security. ],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(DISCARD_PATH, 1)
- AC_MSG_RESULT(yes)
- DISCARD_PATH=1
- else
- AC_DEFINE(DISCARD_PATH, 0)
- AC_MSG_RESULT(no)
- DISCARD_PATH=0
- fi
-],[
- AC_DEFINE(DISCARD_PATH, 0)
- AC_MSG_RESULT(no)
- DISCARD_PATH=0
-])
-fi
-
-AC_MSG_CHECKING(whether to enable a memory limit)
-AC_ARG_ENABLE(memory-limit,
-[ --enable-memory-limit Compile with memory limit support. ],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(MEMORY_LIMIT, 1)
- AC_MSG_RESULT(yes)
- else
- AC_DEFINE(MEMORY_LIMIT, 0)
- AC_MSG_RESULT(no)
- fi
-],[
- AC_DEFINE(MEMORY_LIMIT, 0)
- AC_MSG_RESULT(no)
-])
-
-AC_MSG_CHECKING(whether to enable short tags by default)
-AC_ARG_ENABLE(short-tags,
-[ --disable-short-tags Disable the short-form <? start tag by default.],
-[
- if test "$enableval" = "no"; then
- AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 0)
- AC_MSG_RESULT(no)
- else
- AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 1)
- AC_MSG_RESULT(yes)
- fi
-],[
- AC_DEFINE(DEFAULT_SHORT_OPEN_TAG, 1)
- AC_MSG_RESULT(yes)
-])
-
-AC_MSG_CHECKING(whether to enable the URL-aware fopen wrapper)
-AC_ARG_ENABLE(url-fopen-wrapper,
-[ --disable-url-fopen-wrapper Disable the URL-aware fopen wrapper that allows
- accessing files via http or ftp.],
-[
- if test "$enableval" = "yes"; then
- AC_DEFINE(PHP3_URL_FOPEN, 1)
- AC_MSG_RESULT(yes)
- else
- AC_DEFINE(PHP3_URL_FOPEN, 0)
- AC_MSG_RESULT(no)
- fi
-],[
- AC_DEFINE(PHP3_URL_FOPEN, 1)
- AC_MSG_RESULT(yes)
-])
-
AC_MSG_CHECKING(whether to enable System V semaphore support)
AC_ARG_ENABLE(sysvsem,
[ --enable-sysvsem Enable System V semaphore support.],
@@ -1896,6 +1926,8 @@
])
+divert(4)
+
dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2.
test -n "$auto_cflags" && test -n "$GCC" &&
CFLAGS="$CFLAGS -O2"
@@ -1907,11 +1939,9 @@
dnl *** Commented out - generates slow code and consumes a lot of
dnl *** resources during compilation - we need to figure out how
dnl *** to supply it only when absolutely necessary
-dnl If we're using gcc add -fpic to make dl() work on some platforms
+dnl If we are using gcc add -fpic to make dl() work on some platforms
dnl test -n "$GCC" && CFLAGS="$CFLAGS -fpic"
-LIBS="${LIBS} -lzend"
-
AC_SUBST(CFLAGS)
AC_SUBST(PROG_SENDMAIL)
AC_SUBST(CFLAGS_SHLIB)
@@ -1931,10 +1961,11 @@
PHP_OS=uname
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
-AC_OUTPUT(Makefile build-defs.h stamp-h libphp3.module
-dnl doc/Makefile doc/version.ent doc/checkdoc extra/gd/bdf2gdfont
- regex/Makefile dbase/Makefile, [
-dnl chmod +x doc/checkdoc extra/gd/bdf2gdfont
+AC_OUTPUT(Makefile build-defs.h libphp3.module
+ scripts/mkextlib ext/Makefile
+ regex/Makefile dbase/Makefile
+ ext/gd/Makefile ext/standard/Makefile, [
+chmod +x scripts/mkextlib
], [
dnl Warn about CGI version with no extra security options.
@@ -1954,6 +1985,9 @@
echo "$INFORMIX_WARNING"
fi
])
+
+divert
+
# Local Variables:
# tab-width: 4
# End:
Index: php4/fopen-wrappers.c
diff -u php4/fopen-wrappers.c:1.4 php4/fopen-wrappers.c:1.5
--- php4/fopen-wrappers.c:1.4 Sat Apr 10 12:25:23 1999
+++ php4/fopen-wrappers.c Fri Apr 16 20:37:05 1999
@@ -27,7 +27,7 @@
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen-wrappers.c,v 1.4 1999/04/10 16:25:23 zeev Exp $ */
+/* $Id: fopen-wrappers.c,v 1.5 1999/04/17 00:37:05 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
@@ -55,10 +55,7 @@
#include "safe_mode.h"
#include "php3_realpath.h"
#include "functions/head.h"
-#include "functions/url.h"
-#include "functions/base64.h"
-#include "functions/fsock.h"
-#include "functions/php3_string.h"
+#include "ext/standard/php3_standard.h"
#include "zend_compile.h"
#if HAVE_PWD_H
Index: php4/internal_functions.c
diff -u php4/internal_functions.c:1.2 php4/internal_functions.c:1.3
--- php4/internal_functions.c:1.2 Sat Apr 10 12:25:23 1999
+++ php4/internal_functions.c Fri Apr 16 20:37:05 1999
@@ -29,7 +29,7 @@
*/
-/* $Id: internal_functions.c,v 1.2 1999/04/10 16:25:23 zeev Exp $ */
+/* $Id: internal_functions.c,v 1.3 1999/04/17 00:37:05 ssb Exp $ */
#include "php.h"
@@ -40,44 +40,30 @@
#include <stdlib.h>
#include <stdio.h>
+#include "ext/standard/php3_standard.h"
+#include "ext/gd/php3_gd.h"
+
#include "functions/php3_ifx.h"
#include "functions/php3_ldap.h"
#include "functions/php3_mysql.h"
#include "functions/php3_bcmath.h"
#include "functions/php3_msql.h"
-#include "functions/basic_functions.h"
-#include "functions/phpmath.h"
-#include "functions/php3_string.h"
#include "functions/php3_oci8.h"
#include "functions/oracle.h"
-#include "functions/base64.h"
-#include "functions/php3_dir.h"
-#include "functions/dns.h"
#include "functions/php3_pgsql.h"
#include "functions/php3_velocis.h"
#include "functions/php3_sybase.h"
#include "functions/php3_sybase-ct.h"
-#include "functions/reg.h"
-#include "functions/php3_mail.h"
#include "functions/imap.h"
-#include "functions/md5.h"
-#include "functions/php3_gd.h"
-#include "functions/html.h"
#include "functions/dl.h"
#include "functions/head.h"
#include "functions/post.h"
-#include "functions/exec.h"
#include "functions/php3_solid.h"
#include "functions/adabasd.h"
-#include "functions/file.h"
#include "functions/dbase.h"
#include "functions/hw.h"
#include "functions/filepro.h"
#include "functions/db.h"
-#include "functions/php3_syslog.h"
-#include "functions/php3_filestat.h"
-#include "functions/php3_browscap.h"
-#include "functions/pack.h"
#include "functions/php3_unified_odbc.h"
#include "dl/snmp/php3_snmp.h"
#include "functions/php3_zlib.h"
@@ -127,7 +113,6 @@
crypt_module_ptr,
dbm_module_ptr,
bcmath_module_ptr,
- browscap_module_ptr,
snmp_module_ptr,
pack_module_ptr,
php3_zlib_module_ptr,
Index: php4/main.c
diff -u php4/main.c:1.15 php4/main.c:1.16
--- php4/main.c:1.15 Fri Apr 16 04:12:51 1999
+++ php4/main.c Fri Apr 16 20:37:05 1999
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.15 1999/04/16 08:12:51 andi Exp $ */
+/* $Id: main.c,v 1.16 1999/04/17 00:37:05 ssb Exp $ */
/* #define CRASH_DETECTION */
@@ -67,12 +67,9 @@
#include "main.h"
#include "control_structures.h"
#include "fopen-wrappers.h"
-#include "functions/basic_functions.h"
-#include "functions/info.h"
-#include "functions/head.h"
+#include "ext/standard/php3_standard.h"
#include "functions/post.h"
#include "functions/head.h"
-#include "functions/type.h"
#include "snprintf.h"
#if WIN32|WINNT
#include <io.h>
Index: php4/php_version.h
diff -u php4/php_version.h:1.1.1.1 php4/php_version.h:1.2
--- php4/php_version.h:1.1.1.1 Wed Apr 7 17:02:41 1999
+++ php4/php_version.h Fri Apr 16 20:37:05 1999
@@ -1 +1 @@
-#define PHP_VERSION "4.0pa1"
+#define PHP_VERSION "4.0pa1"
Index: php4/safe_mode.c
diff -u php4/safe_mode.c:1.1.1.1 php4/safe_mode.c:1.2
--- php4/safe_mode.c:1.1.1.1 Wed Apr 7 17:02:43 1999
+++ php4/safe_mode.c Fri Apr 16 20:37:05 1999
@@ -26,7 +26,7 @@
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.1.1.1 1999/04/07 21:02:43 zeev Exp $ */
+/* $Id: safe_mode.c,v 1.2 1999/04/17 00:37:05 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -39,7 +39,7 @@
#include <unistd.h>
#endif
#include <sys/stat.h>
-#include "functions/pageinfo.h"
+#include "ext/standard/pageinfo.h"
#include "safe_mode.h"
/*
Index: php4/setup
diff -u php4/setup:1.1.1.1 php4/setup:1.2
--- php4/setup:1.1.1.1 Wed Apr 7 17:02:44 1999
+++ php4/setup Fri Apr 16 20:37:05 1999
@@ -29,7 +29,7 @@
# | Ariel Shkedi <ars@ziplink.net> or <as@altavista.net> |
# +----------------------------------------------------------------------+
#
-# $Id: setup,v 1.1.1.1 1999/04/07 21:02:44 zeev Exp $
+# $Id: setup,v 1.2 1999/04/17 00:37:05 ssb Exp $
if [ "$1" = "-q" ]; then
quiet_mode=on
@@ -219,24 +219,25 @@
The CGI version also enables Apache users to run different PHP3-enabled\n
pages under different user-ids.'
-define_option with-mod_charset 'Enable transfer tables used by mod_charset?' yesno no \
+if test "$option_value_with_apache" != "no"; then
+ define_option with-mod_charset 'Enable transfer tables used by mod_charset?' yesno no
\
' Whether to respect transfer tables used by mod_charset when PHP compiled\n
as Apache module. It is required to allow mod_charset (aka Russian Apache)\n
to work properly.'
+fi
-define_option with-fhttpd 'Build as an fhttpd module?' yesnodir \
+if test "$option_value_with_apache" = "no"; then
+ define_option with-fhttpd 'Build as an fhttpd module?' yesnodir \
'no /usr/local/src/fhttpd fhttpd sources' \
' Whether to build PHP as fhttpd module. If you are running\n
fhttpd, building PHP as a module will give better performance,\n
more control and remote execution capability. More info about fhttpd \n
can be found at http://phobos.illtel.denver.co.us/pub/fhttpd/.'
+fi
-define_option with-gd 'GD support?' yesnodir \
- "yes /usr GD install" \
-' Whether to include GD support. If PHP can find the GD libraries\n
- on your system, it will be included automatically. You should enter\n
- something here if you do not want to include GD support or if you\n
- have installed GD in some unusual directory.'
+for stub in ext/*/setup.stub; do
+ test -f $stub && . $stub
+done
define_option with-oracle 'Oracle support?' yesnodir \
"no $oradir Oracle home" \
--
PHP 4 Beta