From: David Hedbor <neotron@php.net>
Date: Tue, 6 Jun 2000 00:02:03 +0000 (+0000)
Subject: PRE_INCLUDES hack reverted
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd6cccf50ea97c56b575b57eff0010bf4cd5b5b3;p=php

PRE_INCLUDES hack reverted
---

diff --git a/sapi/roxen/Makefile.in b/sapi/roxen/Makefile.in
index 8264f88b74..c49bf97ead 100644
--- a/sapi/roxen/Makefile.in
+++ b/sapi/roxen/Makefile.in
@@ -2,6 +2,4 @@
 LTLIBRARY_NAME    = libsapi.la
 LTLIBRARY_SOURCES = roxen.c
 
-PRE_INCLUDES = $(PIKE_INCLUDE_DIR)
-
 include $(top_srcdir)/build/ltlib.mk
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index f1b1859548..dfd4963da0 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -26,6 +26,7 @@ AC_ARG_WITH(roxen,
 		AC_MSG_ERROR(Roxen/PHP requires Pike 0.7.79 or newer)
 	fi
    
+	AC_ADD_INCLUDE($PIKE_INCLUDE_DIR)
 	AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen])
 	PHP_SAPI=roxen
 	PHP_BUILD_SHARED
@@ -35,7 +36,7 @@ AC_ARG_WITH(roxen,
 	Pike include dir:      $PIKE_INCLUDE_DIR
 	Pike module directory: $PIKE_MODULE_DIR"
 	PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR "
-    PHP_SUBST(PIKE_INCLUDE_DIR)
+#    PHP_SUBST(PIKE_INCLUDE_DIR)
 ])
 AC_MSG_RESULT($RESULT)
 
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index a0c0321752..13aca14dbc 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -25,8 +25,7 @@
 #include "php_ini.h"
 #include "php_globals.h"
 #include "SAPI.h"
-/* Was using Pike's main.h */
-#include "../../main.h" 
+#include "php_main.h" 
 #include "ext/standard/info.h"
 
 #include "php_version.h"