PRE_INCLUDES hack reverted

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

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)
 

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"