cvs: /php4 ChangeLog Makefile.am build.mk build2.mk configure.in dlist.c genfiles main.c makedist php4.dsp php4.dsw php4dll.dsp php4dllts.dsp
php4ts.dsp php4ts.dsw php_modules.dsw /php4/dl setup /php4/ext/bcmath Makefile.am /php4/ext/informix ifx.dsp /php4/ext/java Makefile.am java.dsp
/php4/ext/mssql mssql.dsp /php4/ext/mysql Makefile.am mysql.dsp /php4/ext/pgsql Makefile.am pgsql.dsp /php4/ext/snmp Makefile.am /php4/ext/xml
Makefile.am /php4/sapi/apache Makefile.am libphp4.module.in /php4/sapi/isapi php4isapi.dsp /php4/sapi/servlet Makefile.am servlet.dsp

zeev Sun Dec 19 16:03:25 1999 EDT Modified files: /php4 ChangeLog Makefile.am build.mk build2.mk configure.in dlist.c genfiles main.c makedist php4.dsp php4.dsw php4dll.dsp php4dllts.dsp php4ts.dsp php4ts.dsw php_modules.dsw /php4/dl setup /php4/ext/bcmath Makefile.am /php4/ext/informix ifx.dsp /php4/ext/java Makefile.am java.dsp /php4/ext/mssql mssql.dsp /php4/ext/mysql Makefile.am mysql.dsp /php4/ext/pgsql Makefile.am pgsql.dsp /php4/ext/snmp Makefile.am /php4/ext/xml Makefile.am /php4/sapi/apache Makefile.am libphp4.module.in /php4/sapi/isapi php4isapi.dsp /php4/sapi/servlet Makefile.am servlet.dsp Log: libzend -> Zend Index: php4/ChangeLog diff -u php4/ChangeLog:1.252 php4/ChangeLog:1.253 --- php4/ChangeLog:1.252 Fri Dec 17 21:09:18 1999 +++ php4/ChangeLog Sun Dec 19 16:02:37 1999 @@ -245,7 +245,7 @@ * build.mk configure.in: - Build structure change. Instead of using an external configure for libzend + Build structure change. Instead of using an external configure for Zend and TSRM, the core code of these configures was separated into extra m4 files which we can now include into PHP's configure. Advantages: @@ -875,7 +875,7 @@ * ext/standard/config.h.stub ext/standard/dl.c - ext/standard/dl.h: in libzend). + ext/standard/dl.h: in Zend). 1999-12-04 Sascha Schumann <sascha@schumann.cx> @@ -1292,7 +1292,7 @@ * sapi/servlet/config.m4: use new PHP_BUILD_THREAD_SAFE macro * ext/standard/parsedate.y: - libzend/zend_compile.h's #define YYSTYPE causes parsedate to barf on Windows + Zend/zend_compile.h's #define YYSTYPE causes parsedate to barf on Windows 1999-12-01 Thies C. Arntzen <thies@digicol.de> @@ -1432,7 +1432,7 @@ 1999-11-29 Sascha Schumann <sascha@schumann.cx> * sapi/aolserver/aolserver.c: - Revert last patch (leak in libzend is fixed now) + Revert last patch (leak in Zend is fixed now) 1999-11-29 Stig Bakken <ssb@fast.no> @@ -2181,7 +2181,7 @@ * NEWS ext/standard/array.c: - (PHP k[r]sort) now use compare_function from libzend to be consistent with the language-core. + (PHP k[r]sort) now use compare_function from Zend to be consistent with the language-core. 1999-11-14 Andi Gutmans <andi@php.net> @@ -2538,7 +2538,7 @@ - PHP-specific changes are easier to maintain - it removes one dependency for users (i.e. GNU vs. FreeBSD ports) - I have not removed the libtool check in buildconf, since libzend/TSRM still + I have not removed the libtool check in buildconf, since Zend/TSRM still depend on a local version of libtool. * ext/snmp/snmp.c: @@ -3248,7 +3248,7 @@ * build.mk: (build.mk) fix suggested by sascha. * build.mk: - (build.mk) make cvsclean now also deletes the libzend & TSRM symlinks. + (build.mk) make cvsclean now also deletes the Zend & TSRM symlinks. 1999-10-10 Sascha Schumann <sascha@schumann.cx> @@ -4156,7 +4156,7 @@ * configure.in.in Makefile.in: - Now thread safe version builds out of the box. libzend/TSRM + Now thread safe version builds out of the box. Zend/TSRM contain extra config scripts which pass the necessary libs back to our Makefile. @@ -6797,7 +6797,7 @@ ext/com/COM.c: - Fix the new operator incompatibility. - I commented PHP_FUNCTION(strtotime) in datetime.c because it stopped win32 from compiling. This needs to be fixed!!! - - Check out libzend to compile the tree now. + - Check out Zend to compile the tree now. 1999-07-25 Stig Bakken <ssb@fast.no> @@ -6947,7 +6947,7 @@ 1999-07-23 Zeev Suraski <zeev@php.net> - * ext/gd/gd.c: Fix bug #1807 (requires libzend update) + * ext/gd/gd.c: Fix bug #1807 (requires Zend update) 1999-07-23 Sascha Schumann <sascha@schumann.cx> @@ -7028,7 +7028,7 @@ 1999-07-22 Stig Bakken <ssb@fast.no> * buildconf: - add checks for autoconf, automake and whether libzend/TSRM is around + add checks for autoconf, automake and whether Zend/TSRM is around 1999-07-22 Sascha Schumann <sascha@schumann.cx> @@ -8553,13 +8553,13 @@ * Makefile.in configure.in.in: - fix APXS VPATH build - - libzend/TSRM build in their own directories + - Zend/TSRM build in their own directories - ext/Makefile was generated twice ****NOTE****** If you use any kind of VPATH, you need to do a "make distclean" in your - libzend/TSRM directory, before running configure again. + Zend/TSRM directory, before running configure again. 1999-05-29 Zeev Suraski <zeev@php.net> @@ -8825,7 +8825,7 @@ * cgi_main.c main.c: * Minor fixes - * Better handling for multiple repeated memory leaks (libzend updated) + * Better handling for multiple repeated memory leaks (Zend updated) * ext/apache/apache.c apMakefile.tmpl @@ -9279,7 +9279,7 @@ php_regex.h request_info.c snprintf.c: * Get Apache to work. POST doesn't work yet. - * There are now -I directives for the absolute path of php4, php4/libzend and the builddir for + * There are now -I directives for the absolute path of php4, php4/Zend and the builddir for the Apache module, so we can #include any php/Zend header. * Rename config.h to php_config.h @@ -9498,7 +9498,7 @@ * acconfig.h.in configure.in.in: ZTS fixes - Stig - --enable-thread-safety belongs in libzend, since libzend doesn't #include config.h, whereas + Stig - --enable-thread-safety belongs in Zend, since Zend doesn't #include config.h, whereas PHP does #include zend_config.h 1999-05-03 Zeev Suraski <zeev@php.net> @@ -9823,7 +9823,7 @@ configure.in.in ext/ldap/config.m4: Ok, this beast compiles via --with-apxs Not sure if it actually works yet though. I have a feeling there are - some -fpic flags missing in the libzend build. Will test later on + some -fpic flags missing in the Zend build. Will test later on today. 1999-04-25 Sascha Schumann <sascha@schumann.cx> @@ -10548,7 +10548,7 @@ 1999-04-19 Stig Bakken <ssb@fast.no> - * buildconf: convert libzend to automake + * buildconf: convert Zend to automake 1999-04-19 Andi Gutmans <andi@php.net> @@ -10603,7 +10603,7 @@ moved dbase into ext/ along with the bundled library dbase programs are no longer included - * buildconf: run automake and run autoconf in libzend + * buildconf: run automake and run autoconf in Zend 1999-04-18 Zeev Suraski <zeev@php.net> @@ -10759,10 +10759,10 @@ 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 configure script now also runs configure in the Zend directory + automatically and makes sure php4 and Zend use the same config.cache file. + To avoid running configure in Zend, use the --no-recursion option. + "make" in php4 also builds Zend now. The Apache module doesn't compile right now, but a fix for that is coming up. Index: php4/Makefile.am diff -u php4/Makefile.am:1.18 php4/Makefile.am:1.19 --- php4/Makefile.am:1.18 Sat Dec 18 18:25:55 1999 +++ php4/Makefile.am Sun Dec 19 16:02:39 1999 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign -ZEND_DIR = $(srcdir)/libzend -SUBDIRS = libzend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) +ZEND_DIR = $(srcdir)/Zend +SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) @@ -14,7 +14,7 @@ strlcat.c mergesort.c reentrancy.c libphp4_la_DEPENDENCIES = \ - libzend/libzend.la \ + Zend/libZend.la \ sapi/$(PHP_SAPI)/libphpsapi_$(PHP_SAPI).la \ $(REGEX_LIB) \ $(EXT_LTLIBS) \ Index: php4/build.mk diff -u php4/build.mk:1.18 php4/build.mk:1.19 --- php4/build.mk:1.18 Sat Dec 18 17:20:05 1999 +++ php4/build.mk Sun Dec 19 16:02:39 1999 @@ -9,10 +9,10 @@ # # Written by Sascha Schumann # -# $Id: build.mk,v 1.18 1999/12/18 22:20:05 sas Exp $ +# $Id: build.mk,v 1.19 1999/12/19 21:02:39 zeev Exp $ -SUBDIRS = libzend TSRM +SUBDIRS = Zend TSRM STAMP = buildmk.stamp @@ -24,12 +24,12 @@ @$(MAKE) -s -f build2.mk generated_lists: - @echo makefile_am_files = Makefile.am libzend/Makefile.am \ + @echo makefile_am_files = Makefile.am Zend/Makefile.am \ TSRM/Makefile.am find ext sapi regex pear -name Makefile.am > $@ - @echo config_h_files = libzend/acconfig.h TSRM/acconfig.h \ + @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h \ ext/*/config.h.stub sapi/*/config.h.stub >> $@ - @echo config_m4_files = libzend/libzend.m4 TSRM/tsrm.m4 \ - libzend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@ + @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \ + Zend/acinclude.m4 ext/*/config.m4 sapi/*/config.m4 >> $@ $(STAMP): buildcheck.sh @./buildcheck.sh && touch $(STAMP) Index: php4/build2.mk diff -u php4/build2.mk:1.1 php4/build2.mk:1.2 --- php4/build2.mk:1.1 Sat Dec 18 17:20:05 1999 +++ php4/build2.mk Sun Dec 19 16:02:39 1999 @@ -1,6 +1,6 @@ # Workhorse for build.mk # -# $Id: build2.mk,v 1.1 1999/12/18 22:20:05 sas Exp $ +# $Id: build2.mk,v 1.2 1999/12/19 21:02:39 zeev Exp $ include generated_lists @@ -16,10 +16,10 @@ targets = $(makefile_in_files) configure $(config_h_in) -all: libzend/Makefile.am TSRM/Makefile.am $(targets) +all: Zend/Makefile.am TSRM/Makefile.am $(targets) -libzend/Makefile.am: - test -d libzend || (test -d ../libzend && ln -s ../libzend libzend) +Zend/Makefile.am: + test -d Zend || (test -d ../Zend && ln -s ../Zend Zend) TSRM/Makefile.am: test -d TSRM || (test -d ../TSRM && ln -s ../TSRM TSRM) Index: php4/configure.in diff -u php4/configure.in:1.71 php4/configure.in:1.72 --- php4/configure.in:1.71 Sun Dec 19 15:08:40 1999 +++ php4/configure.in Sun Dec 19 16:02:39 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.71 1999/12/19 20:08:40 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.72 1999/12/19 21:02:39 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -111,8 +111,8 @@ fi AC_SUBST(LEX_CFLAGS) -sinclude(libzend/acinclude.m4) -sinclude(libzend/libzend.m4) +sinclude(Zend/acinclude.m4) +sinclude(Zend/Zend.m4) sinclude(TSRM/tsrm.m4) dnl check for -R, etc. switch @@ -156,7 +156,7 @@ LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi -INCLUDES="-I\$(top_builddir)/libzend -I\$(top_srcdir) -I\$(top_srcdir)/libzend" +INCLUDES="-I\$(top_builddir)/Zend -I\$(top_srcdir) -I\$(top_srcdir)/Zend" AC_SUBST(INCLUDES) AC_CHECK_LIB(nsl, gethostname, [ @@ -755,7 +755,7 @@ fi #libphp4.module -AC_OUTPUT([Makefile php4.spec libzend/Makefile ext/Makefile sapi/Makefile pear/Makefile +AC_OUTPUT([Makefile php4.spec Zend/Makefile ext/Makefile sapi/Makefile pear/Makefile $PHP_OUTPUT_FILES scripts/mkextlib build-defs.h], [], [ @@ -767,7 +767,7 @@ fi test -d TSRM && echo '#include "../php_config.h"' > TSRM/tsrm_config.h -echo '#include "../php_config.h"' > libzend/zend_config.h +echo '#include "../php_config.h"' > Zend/zend_config.h # run this only when generating all the files? if true; then Index: php4/dlist.c diff -u php4/dlist.c:1.2 php4/dlist.c:1.3 --- php4/dlist.c:1.2 Mon Aug 23 15:43:01 1999 +++ php4/dlist.c Sun Dec 19 16:02:39 1999 @@ -4,7 +4,7 @@ * All rights reserved. * * Filename: $RCSfile: dlist.c,v $ -* Version: $Revision: 1.2 $ +* Version: $Revision: 1.3 $ * * Language: ANSI C * Environment: any @@ -12,12 +12,15 @@ * Description: Module to implement doubly linked lists. Includes a routine * to peform a mergesort on the doubly linked list. * -* $Id: dlist.c,v 1.2 1999/08/23 19:43:01 sas Exp $ +* $Id: dlist.c,v 1.3 1999/12/19 21:02:39 zeev Exp $ * * Revision History: * ----------------- * * $Log: dlist.c,v $ +* Revision 1.3 1999/12/19 21:02:39 zeev +* libzend -> Zend +* * Revision 1.2 1999/08/23 19:43:01 sas * malloc.h is deprecated, use stdlib.h instead * @@ -26,7 +29,7 @@ * * Revision 1.2 1999/05/11 00:01:42 zeev * * Get Apache to work. POST doesn't work yet. -* * There are now -I directives for the absolute path of php4, php4/libzend and the builddir for +* * There are now -I directives for the absolute path of php4, php4/Zend and the builddir for * the Apache module, so we can #include any php/Zend header. * * Rename config.h to php_config.h * Index: php4/genfiles diff -u php4/genfiles:1.1 php4/genfiles:1.2 --- php4/genfiles:1.1 Tue Oct 5 10:12:43 1999 +++ php4/genfiles Sun Dec 19 16:02:39 1999 @@ -2,6 +2,6 @@ STD='make -f Makefile.am LEX=flex YACC="bison -y" srcdir=.' -(cd libzend && eval "$STD zend-parser.c zend-scanner.c zend-scanner-cc.cc") +(cd Zend && eval "$STD zend-parser.c zend-scanner.c zend-scanner-cc.cc") eval "$STD configuration-parser.c configuration-scanner.c" (cd ext/standard && eval "$STD parsedate.c") Index: php4/main.c diff -u php4/main.c:1.162 php4/main.c:1.163 --- php4/main.c:1.162 Sat Dec 18 12:44:55 1999 +++ php4/main.c Sun Dec 19 16:02:39 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.162 1999/12/18 17:44:55 andi Exp $ */ +/* $Id: main.c,v 1.163 1999/12/19 21:02:39 zeev Exp $ */ #include <stdio.h> @@ -81,7 +81,7 @@ #define NO_GLOBAL_LOCK -/* temporary workaround for thread-safety issues in libzend */ +/* temporary workaround for thread-safety issues in Zend */ #if defined(ZTS) && !defined(NO_GLOBAL_LOCK) static MUTEX_T global_lock; #define global_lock() tsrm_mutex_lock(global_lock) Index: php4/makedist diff -u php4/makedist:1.12 php4/makedist:1.13 --- php4/makedist:1.12 Wed Nov 10 10:26:39 1999 +++ php4/makedist Sun Dec 19 16:02:39 1999 @@ -24,13 +24,13 @@ # # Written by Stig Bakken <ssb@guardian.no> 1997-05-28. # -# $Id: makedist,v 1.12 1999/11/10 15:26:39 ssb Exp $ +# $Id: makedist,v 1.13 1999/12/19 21:02:39 zeev Exp $ # PHPROOT=:pserver:cvsread@cvs.php.net:/repository ZENDROOT=:pserver:cvsread@cvs.zend.com:/repository PHPMOD=php4 -ZENDMOD=libzend +ZENDMOD=Zend TSRMMOD=TSRM LT_TARGETS='ltconfig ltmain.sh config.guess config.sub' Index: php4/php4.dsp diff -u php4/php4.dsp:1.17 php4/php4.dsp:1.18 --- php4/php4.dsp:1.17 Sat Nov 27 16:08:49 1999 +++ php4/php4.dsp Sun Dec 19 16:02:39 1999 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "libzend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "libzend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" Index: php4/php4.dsw diff -u php4/php4.dsw:1.5 php4/php4.dsw:1.6 --- php4/php4.dsw:1.5 Mon Apr 26 10:00:46 1999 +++ php4/php4.dsw Sun Dec 19 16:02:39 1999 @@ -3,7 +3,7 @@ ############################################################################### -Project: "libzend"=..\libzend\libzend.dsp - Package Owner=<4> +Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libzend + Project_Dep_Name Zend End Project Dependency }}} Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.22 php4/php4dll.dsp:1.23 --- php4/php4dll.dsp:1.22 Sat Nov 27 16:08:49 1999 +++ php4/php4dll.dsp Sun Dec 19 16:02:39 1999 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzend.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"libzend\Debug" /libpath:"..\bindlib_w32\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libZend.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"Debug/php4nts.dll" /pdbtype:sept /libpath:"TSRM\Debug" /libpath:"Zend\Debug" /libpath:"..\bindlib_w32\Debug" !ELSEIF "$(CFG)" == "php4dll - Win32 Release" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -79,7 +79,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"libzend\Release" /libpath:"..\bindlib_w32\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libZend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release" !ENDIF Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.40 php4/php4dllts.dsp:1.41 --- php4/php4dllts.dsp:1.40 Sat Dec 18 12:44:55 1999 +++ php4/php4dllts.dsp Sun Dec 19 16:02:39 1999 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzendts.lib TSRM.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"libzend\Debug_TS" /libpath:"..\bindlib_w32\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -79,7 +79,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libzendts.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"libzend\Release_TS" /libpath:"..\bindlib_w32\Release" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" !ENDIF Index: php4/php4ts.dsp diff -u php4/php4ts.dsp:1.14 php4/php4ts.dsp:1.15 --- php4/php4ts.dsp:1.14 Wed Oct 20 14:09:43 1999 +++ php4/php4ts.dsp Sun Dec 19 16:02:39 1999 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "libzend" /I "tsrm" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "DEBUG" /D "_DEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" Index: php4/php4ts.dsw diff -u php4/php4ts.dsw:1.6 php4/php4ts.dsw:1.7 --- php4/php4ts.dsw:1.6 Sun Nov 14 14:46:30 1999 +++ php4/php4ts.dsw Sun Dec 19 16:02:39 1999 @@ -15,7 +15,7 @@ ############################################################################### -Project: "libzendts"=.\libzend\libzendts.dsp - Package Owner=<4> +Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<4> {{{ Begin Project Dependency - Project_Dep_Name libzendts + Project_Dep_Name ZendTS End Project Dependency Begin Project Dependency Project_Dep_Name TSRM Index: php4/php_modules.dsw diff -u php4/php_modules.dsw:1.2 php4/php_modules.dsw:1.3 --- php4/php_modules.dsw:1.2 Fri Sep 3 15:37:46 1999 +++ php4/php_modules.dsw Sun Dec 19 16:02:39 1999 @@ -3,7 +3,7 @@ ############################################################################### -Project: "libzendts"=.\libzend\libzendts.dsp - Package Owner=<4> +Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4> Package=<5> {{{ Index: php4/dl/setup diff -u php4/dl/setup:1.2 php4/dl/setup:1.3 --- php4/dl/setup:1.2 Thu Dec 16 23:20:39 1999 +++ php4/dl/setup Sun Dec 19 16:02:41 1999 @@ -36,7 +36,7 @@ echo "Configuration file. " fi -CC="$CC $OPT $CCFLAGS -I. -I.. -I../libzend $LFLAGS" +CC="$CC $OPT $CCFLAGS -I. -I.. -I../Zend $LFLAGS" LD="$LD $LDDLFLAGS $CCDLFLAGS" sed "s,@CC@,$CC, Index: php4/ext/bcmath/Makefile.am diff -u php4/ext/bcmath/Makefile.am:1.4 php4/ext/bcmath/Makefile.am:1.5 --- php4/ext/bcmath/Makefile.am:1.4 Tue Dec 14 13:37:13 1999 +++ php4/ext/bcmath/Makefile.am Sun Dec 19 16:02:42 1999 @@ -1,5 +1,5 @@ -# $Id: Makefile.am,v 1.4 1999/12/14 18:37:13 joey Exp $ +# $Id: Makefile.am,v 1.5 1999/12/19 21:02:42 zeev Exp $ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=libphpext_bcmath.la libphpext_bcmath_la_SOURCES=bcmath.c number.c Index: php4/ext/informix/ifx.dsp diff -u php4/ext/informix/ifx.dsp:1.1 php4/ext/informix/ifx.dsp:1.2 --- php4/ext/informix/ifx.dsp:1.1 Sun Nov 14 07:55:31 1999 +++ php4/ext/informix/ifx.dsp Sun Dec 19 16:02:43 1999 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" " " " " " " /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" /I /php/php3" /I /php/php3/functions" /I /informix/incl/esql" " " " " " " /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\libzend" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D HAVE_IFX=1 /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x406 /d "_DEBUG" Index: php4/ext/java/Makefile.am diff -u php4/ext/java/Makefile.am:1.2 php4/ext/java/Makefile.am:1.3 --- php4/ext/java/Makefile.am:1.2 Mon Nov 29 10:36:22 1999 +++ php4/ext/java/Makefile.am Sun Dec 19 16:02:43 1999 @@ -1,9 +1,9 @@ -# $Id: Makefile.am,v 1.2 1999/11/29 15:36:22 rubys Exp $ +# $Id: Makefile.am,v 1.3 1999/12/19 21:02:43 zeev Exp $ SRC=java.c CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend EXTRA_LTLIBRARIES=libphp_java.la phplib_LTLIBRARIES=@JAVA_SHARED@ libphp_java_la_SOURCES=$(SRC) Index: php4/ext/java/java.dsp diff -u php4/ext/java/java.dsp:1.2 php4/ext/java/java.dsp:1.3 --- php4/ext/java/java.dsp:1.2 Mon Nov 29 10:36:23 1999 +++ php4/ext/java/java.dsp Sun Dec 19 16:02:43 1999 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ # PROP Intermediate_Dir "..\..\Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ # PROP Intermediate_Dir "..\..\Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" Index: php4/ext/mssql/mssql.dsp diff -u php4/ext/mssql/mssql.dsp:1.3 php4/ext/mssql/mssql.dsp:1.4 --- php4/ext/mssql/mssql.dsp:1.3 Mon Nov 22 14:01:00 1999 +++ php4/ext/mssql/mssql.dsp Sun Dec 19 16:02:44 1999 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -70,7 +70,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\libzend\\" /I "..\..\..\bindlib_w32\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\\" /I "..\..\Zend\\" /I "..\..\..\bindlib_w32\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "_DEBUG" @@ -96,8 +96,8 @@ # PROP Intermediate_Dir "MSSQL_65_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-65" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL65=1 /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-65" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL65=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -123,8 +123,8 @@ # PROP Intermediate_Dir "MSSQL_70_Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL70=1 /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /D "COMPILE_DL" /D "DBNTWIN32" /D ZTS=1 /D MSSQL70=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" Index: php4/ext/mysql/Makefile.am diff -u php4/ext/mysql/Makefile.am:1.4 php4/ext/mysql/Makefile.am:1.5 --- php4/ext/mysql/Makefile.am:1.4 Mon Oct 4 11:18:13 1999 +++ php4/ext/mysql/Makefile.am Sun Dec 19 16:02:45 1999 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.4 1999/10/04 15:18:13 sas Exp $ +# $Id: Makefile.am,v 1.5 1999/12/19 21:02:45 zeev Exp $ SRC=php_mysql.c -INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @MYSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@MYSQL_STATIC@ EXTRA_LTLIBRARIES=libphpext_mysql.la mysql.la libphpext_mysql_la_SOURCES=$(SRC) Index: php4/ext/mysql/mysql.dsp diff -u php4/ext/mysql/mysql.dsp:1.5 php4/ext/mysql/mysql.dsp:1.6 --- php4/ext/mysql/mysql.dsp:1.5 Sat Nov 20 11:56:40 1999 +++ php4/ext/mysql/mysql.dsp Sun Dec 19 16:02:45 1999 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ # PROP Intermediate_Dir "Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /FR /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ # PROP Intermediate_Dir "Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\MySQL\include" /I "..\..\TSRM" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /D "COMPILE_DL" /D HAVE_MYSQL=1 /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" Index: php4/ext/pgsql/Makefile.am diff -u php4/ext/pgsql/Makefile.am:1.3 php4/ext/pgsql/Makefile.am:1.4 --- php4/ext/pgsql/Makefile.am:1.3 Mon Oct 4 11:18:17 1999 +++ php4/ext/pgsql/Makefile.am Sun Dec 19 16:02:46 1999 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.3 1999/10/04 15:18:17 sas Exp $ +# $Id: Makefile.am,v 1.4 1999/12/19 21:02:46 zeev Exp $ SRC=pgsql.c -INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@PGSQL_STATIC@ EXTRA_LTLIBRARIES=libphpext_pgsql.la pgsql.la libphpext_pgsql_la_SOURCES=$(SRC) Index: php4/ext/pgsql/pgsql.dsp diff -u php4/ext/pgsql/pgsql.dsp:1.3 php4/ext/pgsql/pgsql.dsp:1.4 --- php4/ext/pgsql/pgsql.dsp:1.3 Sat Dec 18 06:38:04 1999 +++ php4/ext/pgsql/pgsql.dsp Sun Dec 19 16:02:50 1999 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL" /D "ZTS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL" /D "ZTS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 Index: php4/ext/snmp/Makefile.am diff -u php4/ext/snmp/Makefile.am:1.3 php4/ext/snmp/Makefile.am:1.4 --- php4/ext/snmp/Makefile.am:1.3 Mon Oct 4 11:18:18 1999 +++ php4/ext/snmp/Makefile.am Sun Dec 19 16:02:50 1999 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.3 1999/10/04 15:18:18 sas Exp $ +# $Id: Makefile.am,v 1.4 1999/12/19 21:02:50 zeev Exp $ SRC=snmp.c -INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @SNMP_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@SNMP_STATIC@ EXTRA_LTLIBRARIES=libphpext_snmp.la snmp.la libphpext_snmp_la_SOURCES=$(SRC) Index: php4/ext/xml/Makefile.am diff -u php4/ext/xml/Makefile.am:1.6 php4/ext/xml/Makefile.am:1.7 --- php4/ext/xml/Makefile.am:1.6 Mon Oct 4 11:18:22 1999 +++ php4/ext/xml/Makefile.am Sun Dec 19 16:02:52 1999 @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.6 1999/10/04 15:18:22 sas Exp $ +# $Id: Makefile.am,v 1.7 1999/12/19 21:02:52 zeev Exp $ SRC=xml.c -INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=@XML_STATIC@ EXTRA_LTLIBRARIES=libphpext_xml.la xml.la libphpext_xml_la_SOURCES=$(SRC) Index: php4/sapi/apache/Makefile.am diff -u php4/sapi/apache/Makefile.am:1.3 php4/sapi/apache/Makefile.am:1.4 --- php4/sapi/apache/Makefile.am:1.3 Mon Oct 4 11:18:24 1999 +++ php4/sapi/apache/Makefile.am Sun Dec 19 16:02:53 1999 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in APACHE_INCLUDE=@APACHE_INCLUDE@ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend $(APACHE_INCLUDE) +INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend $(APACHE_INCLUDE) noinst_LTLIBRARIES=libphpsapi_apache.la libphpsapi_apache_la_SOURCES=sapi_apache.c mod_php4.c Index: php4/sapi/apache/libphp4.module.in diff -u php4/sapi/apache/libphp4.module.in:1.4 php4/sapi/apache/libphp4.module.in:1.5 --- php4/sapi/apache/libphp4.module.in:1.4 Mon Dec 6 10:32:01 1999 +++ php4/sapi/apache/libphp4.module.in Sun Dec 19 16:02:53 1999 @@ -3,5 +3,5 @@ RULE_WANTHSREGEX=@APACHE_WANT_HSREGEX@ LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS" RULE_HIDE=yes - CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@" + CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/Zend -I@abs_builddir@/Zend -I@abs_builddir@" ConfigEnd Index: php4/sapi/isapi/php4isapi.dsp diff -u php4/sapi/isapi/php4isapi.dsp:1.2 php4/sapi/isapi/php4isapi.dsp:1.3 --- php4/sapi/isapi/php4isapi.dsp:1.2 Sun Nov 14 15:13:54 1999 +++ php4/sapi/isapi/php4isapi.dsp Sun Dec 19 16:02:53 1999 @@ -42,7 +42,7 @@ # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\libzend" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "COMPILE_LIBZEND" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "COMPILE_LIBZEND" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\libzend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" Index: php4/sapi/servlet/Makefile.am diff -u php4/sapi/servlet/Makefile.am:1.1 php4/sapi/servlet/Makefile.am:1.2 --- php4/sapi/servlet/Makefile.am:1.1 Mon Nov 29 10:36:25 1999 +++ php4/sapi/servlet/Makefile.am Sun Dec 19 16:02:54 1999 @@ -1,9 +1,9 @@ -# $Id: Makefile.am,v 1.1 1999/11/29 15:36:25 rubys Exp $ +# $Id: Makefile.am,v 1.2 1999/12/19 21:02:54 zeev Exp $ SRC=servlet.c java.c CFLAGS=@CFLAGS@ @JAVA_CFLAGS@ -INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend +INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend noinst_LTLIBRARIES=libphpsapi_servlet.la libphpsapi_servlet_la_SOURCES=$(SRC) Index: php4/sapi/servlet/servlet.dsp diff -u php4/sapi/servlet/servlet.dsp:1.1 php4/sapi/servlet/servlet.dsp:1.2 --- php4/sapi/servlet/servlet.dsp:1.1 Mon Nov 29 10:36:25 1999 +++ php4/sapi/servlet/servlet.dsp Sun Dec 19 16:02:54 1999 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -96,8 +96,8 @@ # PROP Intermediate_Dir "..\..\Debug_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -122,8 +122,8 @@ # PROP Intermediate_Dir "..\..\Release_TS" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\libzend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG"