vpath fix

Apache compatability fix

diff --git a/Makefile.in b/Makefile.in
index a4c1fe73d2da8cd3635f82570c4ce67c1cb127a6..10af29153b64f56b9876218a43389bf9a5f4bf19 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@
 # Apache modules
 libphp3.a libmodphp3.a: all-recursive $(OBJS)
        $(AR) $@.tmp $(OBJS)
-       $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@
+       $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @TSRM_LIB@
        @rm -f $@.tmp
        $(RANLIB) $(BINNAME)
 

diff --git a/main/SAPI.c b/main/SAPI.c
index a8077265e778a513f0e8fd972453d775e6a202ea..ede0176fac7cb18a4efccb59e99a2f116b9c4a43 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -100,7 +100,7 @@ SAPI_API int sapi_add_header(const char *header_line, uint header_line_len)
 SAPI_API int sapi_send_headers()
 {
        int retval;
-       sapi_header_struct default_header = { DEFAULT_CONTENT_TYPE, sizeof(DEFAULT_CONTENT_TYPE)-1 };
+       sapi_header_struct default_header = { SAPI_DEFAULT_CONTENT_TYPE, sizeof(SAPI_DEFAULT_CONTENT_TYPE)-1 };
        SLS_FETCH();
 
        if (SG(headers_sent)) {

diff --git a/main/SAPI.h b/main/SAPI.h
index 8d7aea61c39d58ea06983ad6e07c51740853804d..6a1ff8a9afc6384ad0e7d284cd77aa80c0c08f8a 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -105,6 +105,6 @@ struct _sapi_module_struct {
 #define SAPI_HEADER_DO_SEND                            2
 #define SAPI_HEADER_SEND_FAILED                        3
 
-#define DEFAULT_CONTENT_TYPE "Content-Type: text/html"
+#define SAPI_DEFAULT_CONTENT_TYPE "Content-Type: text/html"
 
 #endif /* _NEW_SAPI_H */
\ No newline at end of file