libzend -> Zend

diff --git a/ChangeLog b/ChangeLog
index e432508994329485f511a319f00eee446abb0ed4..fa7cf42bc2574485564743b79f5e8f2cd12a0ea7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 

diff --git a/Makefile.am b/Makefile.am
index 6a07e0e363296e170122fb629d73656d97cfd545..a5fedaf1499d6675d478a122795ace81b03ec010 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 @@ libphp4_la_SOURCES = \
        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) \

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 6469df64b1ecc72fa9bca832d611f74dacabb5b4..9a78e162d3d23c0f3657cb2b691b6d901e062b2b 100644 (file)
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -3,13 +3,13 @@
 #CLEANFILES = zend-parser.c zend-parser.h zend-scanner.c zend-parser.output 
 
 AUTOMAKE_OPTIONS=foreign
-EXTRA_LTLIBRARIES=libzend_cc.la libzend_c.la
-noinst_LTLIBRARIES=$(ZEND_SCANNER) libzend.la
+EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la
+noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la
 
-libzend_cc_la_SOURCES=zend-scanner-cc.cc
-libzend_c_la_SOURCES=zend-scanner.c
+libZend_cc_la_SOURCES=zend-scanner-cc.cc
+libZend_c_la_SOURCES=zend-scanner.c
 
-libzend_la_SOURCES=\
+libZend_la_SOURCES=\
        zend-parser.y \
        zend_alloc.c zend_compile.c zend_constants.c \
        zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
@@ -17,9 +17,9 @@ libzend_la_SOURCES=\
        zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
        zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c
 
-libzend_la_LIBADD = $(ZEND_SCANNER)
-libzend_la_LDFLAGS = @EXTRA_LIBS@
-libzend_la_DEPENDENCIES = $(ZEND_SCANNER)
+libZend_la_LIBADD = $(ZEND_SCANNER)
+libZend_la_LDFLAGS = @EXTRA_LIBS@
+libZend_la_DEPENDENCIES = $(ZEND_SCANNER)
 
 # automake isn't too clever about "non-standard" use of lex and yacc
 

diff --git a/Zend/libzend.dsp b/Zend/Zend.dsp
similarity index 91%
rename from Zend/libzend.dsp
rename to Zend/Zend.dsp
index 34336ce2777bb94f137b732b1defe81a5b686d94..9aabe0998b2e58d05b8e9720d225354d73c49536 100644 (file)
--- a/Zend/libzend.dsp
+++ b/Zend/Zend.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="libzend" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Zend" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=libzend - Win32 Debug
+CFG=Zend - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "libzend.mak".
+!MESSAGE NMAKE /f "libZend.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libzend.mak" CFG="libzend - Win32 Debug"
+!MESSAGE NMAKE /f "libZend.mak" CFG="Zend - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libzend - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libzend - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=libzend - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libzend - Win32 Release"
+!IF  "$(CFG)" == "Zend - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Output_Dir "Release"
@@ -50,7 +50,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "libzend - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Output_Dir "Debug"
@@ -75,8 +75,8 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "libzend - Win32 Release"
-# Name "libzend - Win32 Debug"
+# Name "Zend - Win32 Release"
+# Name "Zend - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -276,7 +276,7 @@ SOURCE=.\zend_variables.h
 
 SOURCE=".\zend-parser.y"
 
-!IF  "$(CFG)" == "libzend - Win32 Release"
+!IF  "$(CFG)" == "Zend - Win32 Release"
 
 # Begin Custom Build
 InputDir=.
@@ -293,7 +293,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "libzend - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
 
 # Begin Custom Build
 InputDir=.
@@ -321,7 +321,7 @@ BuildCmds= \
 
 SOURCE=".\zend-scanner.l"
 
-!IF  "$(CFG)" == "libzend - Win32 Release"
+!IF  "$(CFG)" == "Zend - Win32 Release"
 
 # Begin Custom Build
 InputPath=".\zend-scanner.l"
@@ -331,7 +331,7 @@ InputPath=".\zend-scanner.l"
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "libzend - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
 
 # Begin Custom Build
 InputPath=".\zend-scanner.l"

diff --git a/Zend/libzend.m4 b/Zend/Zend.m4
similarity index 98%
rename from Zend/libzend.m4
rename to Zend/Zend.m4
index aa3ed9e9e9376e11daa2d1eda59e37b745ad1d72..d64d580724799cdcda9e7df6948204ca316c400e 100644 (file)
--- a/Zend/libzend.m4
+++ b/Zend/Zend.m4
@@ -159,7 +159,7 @@ else
   ZEND_SCANNER_TYPE=c
 fi  
 
-ZEND_SCANNER="libzend_${ZEND_SCANNER_TYPE}.la"
+ZEND_SCANNER="libZend_${ZEND_SCANNER_TYPE}.la"
 
 if test "$ZEND_MEMORY_LIMIT" = "yes"; then
   AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])

diff --git a/Zend/libzendts.dsp b/Zend/ZendTS.dsp
similarity index 90%
rename from Zend/libzendts.dsp
rename to Zend/ZendTS.dsp
index 70e6e350217ad274c6314960f03dba3b47e94dc4..f0768796c98e346f69100e63644354d1ab475267 100644 (file)
--- a/Zend/libzendts.dsp
+++ b/Zend/ZendTS.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="libzendts" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="ZendTS" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=libzendts - Win32 Debug_TS
+CFG=ZendTS - Win32 Debug_TS
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "libzendts.mak".
+!MESSAGE NMAKE /f "ZendTS.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libzendts.mak" CFG="libzendts - Win32 Debug_TS"
+!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Debug_TS"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "libzendts - Win32 Release_TS" (based on "Win32 (x86) Static Library")
-!MESSAGE "libzendts - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=libzendts - Win32 Debug_TS
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "libzendts - Win32 Release_TS"
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Output_Dir "Release_TS"
@@ -50,7 +50,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "libzendts - Win32 Debug_TS"
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Output_Dir "Debug_TS"
@@ -75,8 +75,8 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "libzendts - Win32 Release_TS"
-# Name "libzendts - Win32 Debug_TS"
+# Name "ZendTS - Win32 Release_TS"
+# Name "ZendTS - Win32 Debug_TS"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -280,7 +280,7 @@ SOURCE=.\zend_variables.h
 
 SOURCE=".\zend-parser.y"
 
-!IF  "$(CFG)" == "libzendts - Win32 Release_TS"
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
 
 # Begin Custom Build
 InputDir=.
@@ -298,7 +298,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "libzendts - Win32 Debug_TS"
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
 
 # Begin Custom Build
 InputDir=.
@@ -327,7 +327,7 @@ BuildCmds= \
 
 SOURCE=".\zend-scanner.l"
 
-!IF  "$(CFG)" == "libzendts - Win32 Release_TS"
+!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
 
 # Begin Custom Build
 InputPath=".\zend-scanner.l"
@@ -337,7 +337,7 @@ InputPath=".\zend-scanner.l"
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "libzendts - Win32 Debug_TS"
+!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
 
 # Begin Custom Build
 InputPath=".\zend-scanner.l"

diff --git a/Zend/configure.in b/Zend/configure.in
index 411659dfbdca98309128d25782acd6c523f4ea36..50ead57d930622ce42d6d29844dc59ed637822fb 100644 (file)
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -14,7 +14,7 @@ ZEND_VERSION=$VERSION
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
-sinclude(libzend.m4)
+sinclude(Zend.m4)
 
 LIBZEND_BASIC_CHECKS
 

diff --git a/build.mk b/build.mk
index d710c46ddc4ec07c9a39bf877a83e99fb4fb5254..2b3fb07c916a689381d2220ad3c43d1bedd219df 100644 (file)
--- a/build.mk
+++ b/build.mk
@@ -12,7 +12,7 @@
 # $Id$ 
 
 
-SUBDIRS = libzend TSRM
+SUBDIRS = Zend TSRM
 
 STAMP = buildmk.stamp
 
@@ -24,12 +24,12 @@ all: $(STAMP) $(ALWAYS)
        @$(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)

diff --git a/build2.mk b/build2.mk
index eeeb9ef3e9e91bb197eb052271454f9b64431735..7ebe0c30785372ed8f5ff5c59a7239f51d09f517 100644 (file)
--- a/build2.mk
+++ b/build2.mk
@@ -16,10 +16,10 @@ acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
 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)

diff --git a/configure.in b/configure.in
index e1b051e4d9c84f0d08d348384a402ed71c782c37..5419a11322415fe36ab6fdc7a5cb86916ed5c2ae 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -111,8 +111,8 @@ if test "$ac_cv_c_const" = "yes" ; then
 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 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
        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 @@ if test "$PHP_THREAD_SAFETY" = "yes"; then
 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 @@ if test ! -f $srcdir/ext/bcmath/number.c; then
 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

diff --git a/dlist.c b/dlist.c
index ea707fc6fb9cfd26b8b69651ff185c8c9ac80ae3..9a371672d62711a9f390d466284b034615707396 100644 (file)
--- a/dlist.c
+++ b/dlist.c
@@ -18,12 +18,15 @@
 * -----------------
 *
 * $Log$
+* Revision 1.2  1999/08/23 19:43:01  sas
+* malloc.h is deprecated, use stdlib.h instead
+*
 * Revision 1.1  1999/07/19 18:58:44  andrey
 * Moving dlist stuff into core.
 *
 * 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
 *

diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am
index e73bafce78ed7dfe09a97c665f03b73a629ce4b7..762104ad759b998a6bffaceb9489607b98b4fbee 100644 (file)
--- a/ext/bcmath/Makefile.am
+++ b/ext/bcmath/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
 
-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

diff --git a/ext/informix/ifx.dsp b/ext/informix/ifx.dsp
index 66afa15262b6f3b3cbe8558d3811a963d0ed8f68..043ae9edbf79f78cc829d98bd8777f414f61438b 100644 (file)
--- a/ext/informix/ifx.dsp
+++ b/ext/informix/ifx.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32\r
 # ADD BASE RSC /l 0x406 /d "_DEBUG"\r

diff --git a/ext/java/Makefile.am b/ext/java/Makefile.am
index 6ac8130dcaf5649295650c744be3b792e088f2f6..14fd3a196573877877f1111b8ef20be9ddc46442 100644 (file)
--- a/ext/java/Makefile.am
+++ b/ext/java/Makefile.am
@@ -3,7 +3,7 @@
 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)

diff --git a/ext/java/java.dsp b/ext/java/java.dsp
index 069e068389df53f7e25220784294771761f1c3f5..f413b7f8fb3b5da98c28161972915e904117524b 100644 (file)
--- a/ext/java/java.dsp
+++ b/ext/java/java.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -96,8 +96,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r

diff --git a/ext/mssql/mssql.dsp b/ext/mssql/mssql.dsp
index 06481d785de4fb50798708dbae9b735ed47a0ab2..dbb62ab7a58cef796765e0bb782a05c00a153167 100644 (file)
--- a/ext/mssql/mssql.dsp
+++ b/ext/mssql/mssql.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MSSQL_EXPORTS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "_DEBUG"\r
@@ -96,8 +96,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "MSSQL_65_Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -123,8 +123,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "MSSQL_70_Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r

diff --git a/ext/mysql/Makefile.am b/ext/mysql/Makefile.am
index 0bf2a7ddeb438860f6953a91fd5d7fdc1e3bcf2c..952963ea9781ce1746b951c1e3acd5f75810cf16 100644 (file)
--- a/ext/mysql/Makefile.am
+++ b/ext/mysql/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 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)

diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp
index 72615ac020389270dbf544ee65f3b895fcc3e349..29be1ca7e64c33546df31375f5fa5b8d7c3a0597 100644 (file)
--- a/ext/mysql/mysql.dsp
+++ b/ext/mysql/mysql.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MYSQL_EXPORTS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -96,8 +96,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r

diff --git a/ext/pgsql/Makefile.am b/ext/pgsql/Makefile.am
index 1fe55e851793019806380f8df308ce18b802294d..6d6306cb2747b2327292189e157d5190e5d060a6 100644 (file)
--- a/ext/pgsql/Makefile.am
+++ b/ext/pgsql/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 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)

diff --git a/ext/pgsql/pgsql.dsp b/ext/pgsql/pgsql.dsp
index b421af5e56e54d6c8c3e3863cd1b1fc9f673482a..451b9bf286478f809194b183d689a42588482334 100644 (file)
--- a/ext/pgsql/pgsql.dsp
+++ b/ext/pgsql/pgsql.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /c\r
-# 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\r
+# 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\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r

diff --git a/ext/rpc/Makefile.am b/ext/rpc/Makefile.am
index 6ac8130dcaf5649295650c744be3b792e088f2f6..14fd3a196573877877f1111b8ef20be9ddc46442 100644 (file)
--- a/ext/rpc/Makefile.am
+++ b/ext/rpc/Makefile.am
@@ -3,7 +3,7 @@
 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)

diff --git a/ext/rpc/java/Makefile.am b/ext/rpc/java/Makefile.am
index 6ac8130dcaf5649295650c744be3b792e088f2f6..14fd3a196573877877f1111b8ef20be9ddc46442 100644 (file)
--- a/ext/rpc/java/Makefile.am
+++ b/ext/rpc/java/Makefile.am
@@ -3,7 +3,7 @@
 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)

diff --git a/ext/rpc/java/java.dsp b/ext/rpc/java/java.dsp
index 069e068389df53f7e25220784294771761f1c3f5..f413b7f8fb3b5da98c28161972915e904117524b 100644 (file)
--- a/ext/rpc/java/java.dsp
+++ b/ext/rpc/java/java.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -96,8 +96,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r

diff --git a/ext/snmp/Makefile.am b/ext/snmp/Makefile.am
index 63afdb9a92c1999e431bb23f376bf8cb6950fbd8..5f7da80286b4eb3110b004904b226e45d1345d6d 100644 (file)
--- a/ext/snmp/Makefile.am
+++ b/ext/snmp/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 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)

diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am
index 2299ba2ce02128d6f3edd202e2e7e376770c5c3d..504e4c6d9b19133eaedbb0366dab144e585d1c77 100644 (file)
--- a/ext/xml/Makefile.am
+++ b/ext/xml/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 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)

diff --git a/genfiles b/genfiles
index c83dd825d4999190b80b4e446894d30bf90385e9..fa79ef092f1439a29a954d6ce2c56596edc975ec 100755 (executable)
--- a/genfiles
+++ b/genfiles
@@ -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")

diff --git a/main/main.c b/main/main.c
index 0d49e271fdf8126fb597e5e55736dbf640be29c7..2524c235df92625880127d186e5ac3fff869290f 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -81,7 +81,7 @@ PHPAPI int core_globals_id;
 
 #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)

diff --git a/makedist b/makedist
index f10e342cae7eaf0e43fd52aac0991ca30655d689..b6efe7f60afbb5a1b46e4a9fa0186567b343b85e 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -30,7 +30,7 @@
 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'
 

diff --git a/php4.dsp b/php4.dsp
index a158b8c8f6b83514da596562c8485dc1d4ed073f..06113026bc6b52184b0850733f1c0773686bc738 100644 (file)
--- a/php4.dsp
+++ b/php4.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 @@ LINK32=link.exe
 # 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"

diff --git a/php4.dsw b/php4.dsw
index c14719887c39cbdfd03170d555aa6b6bae57bf4c..26261a2321b94445af90f694298787e6090f0b8f 100644 (file)
--- a/php4.dsw
+++ b/php4.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "libzend"=..\libzend\libzend.dsp - Package Owner=<4>
+Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -39,7 +39,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name libzend
+    Project_Dep_Name Zend
     End Project Dependency
 }}}
 

diff --git a/php4dll.dsp b/php4dll.dsp
index a51ceb99c450db1a059c0998e87a1f39f4fda2b3..6162481726bdca2c21a8f4f45cd882bb12a4fa17 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
 \r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 \r
 !ENDIF \r
 \r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index a0b899941a1053abcdec64318d9ad449652e5287..2c50090e6c16fc6adcef013cf79e6f330faf2b1b 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 \r
 !ENDIF \r
 \r

diff --git a/php4ts.dsp b/php4ts.dsp
index 267922c8010ce7eca9bac4d5072b3f21ee717622..ea1393497a60643fcdb3d4bdad5da54bfef00548 100644 (file)
--- a/php4ts.dsp
+++ b/php4ts.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# 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\r
+# 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\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# 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\r
+# 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\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG"\r

diff --git a/php4ts.dsw b/php4ts.dsw
index 86c8fb312b8845dae11d887b5a7b69cde8bcd96f..519a96a5392f57f8888f2dc2c3ccd2cf74ded8db 100644 (file)
--- a/php4ts.dsw
+++ b/php4ts.dsw
@@ -15,7 +15,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "libzendts"=.\libzend\libzendts.dsp - Package Owner=<4>\r
+Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -39,7 +39,7 @@ Package=<5>
 Package=<4>\r
 {{{\r
     Begin Project Dependency\r
-    Project_Dep_Name libzendts\r
+    Project_Dep_Name ZendTS\r
     End Project Dependency\r
     Begin Project Dependency\r
     Project_Dep_Name TSRM\r

diff --git a/sapi/apache/Makefile.am b/sapi/apache/Makefile.am
index 38404758dc05de7556ee82b597debe015fef3b1a..8a56e9e19c03a58ae803c67e93f3b9e669b0f26d 100644 (file)
--- a/sapi/apache/Makefile.am
+++ b/sapi/apache/Makefile.am
@@ -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

diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in
index 2513a7b48d35e3addf47cd458a0e341dfb8e9ac8..4c90861a65500c8e23aed26206df30e23e461540 100644 (file)
--- a/sapi/apache/libphp4.module.in
+++ b/sapi/apache/libphp4.module.in
@@ -3,5 +3,5 @@ ConfigStart
        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

diff --git a/sapi/isapi/php4isapi.dsp b/sapi/isapi/php4isapi.dsp
index caef60e9af9ba815f4fcda86dc9836824dc440df..0fe2d428be996e6303d51adc58580e2dbeb07de4 100644 (file)
--- a/sapi/isapi/php4isapi.dsp
+++ b/sapi/isapi/php4isapi.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Debug_TS"\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r

diff --git a/sapi/servlet/Makefile.am b/sapi/servlet/Makefile.am
index d729f60a4c78920e70214d33121a3463c1229a04..11103e5541f6e251a08cbd9bd0902269994d3e09 100644 (file)
--- a/sapi/servlet/Makefile.am
+++ b/sapi/servlet/Makefile.am
@@ -3,7 +3,7 @@
 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)
 

diff --git a/sapi/servlet/servlet.dsp b/sapi/servlet/servlet.dsp
index 4dca8ce049204360a4e34133f759dfb6fa7b3772..472855a5aeba80b8f136283bdf5b5d199a538b08 100644 (file)
--- a/sapi/servlet/servlet.dsp
+++ b/sapi/servlet/servlet.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -96,8 +96,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\Debug_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "_DEBUG"\r
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "..\..\Release_TS"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# 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\r
-# 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\r
+# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x40d /d "NDEBUG"\r

diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index 9ca4b269e752a3a6fa927347959af63ea2e12884..e7fb42fc65c1b3dc5febf182bc6a21756d76d4b1 100644 (file)
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 \r
 ###############################################################################\r
 \r
-Project: "libzendts"=.\libzend\libzendts.dsp - Package Owner=<4>\r
+Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r