Final build fixes - that's enough for now...

diff --git a/Makefile.in b/Makefile.in
index bfa5dd17e3fc509b9029bef8be9a0e12a4bb5c6f..c84ad7adc05a1e24139c2d175728f916baf84bb7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,7 @@ LTLIBRARY_NAME = libphp4.la
        
 LTLIBRARY_SOURCES = \
        main.c internal_functions.c snprintf.c php_sprintf.c \
-       configuration-parser.c configuration-scanner.c request_info.c \
+       configuration-parser.c configuration-scanner.c \
        safe_mode.c fopen-wrappers.c php_realpath.c alloca.c \
        php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \
        strlcat.c mergesort.c reentrancy.c php_variables.c

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 0915feb7c8d23f32235f09388e6e894a846bf66b..7480c250e79f57f72682825c7fa374a86e64bf54 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include "remains.h"
+#include "php_apache_http.h"
 #include "http_request.h"
 #include "build-defs.h"