diff options
| author | David Hedbor <neotron@php.net> | 2000-06-06 00:02:03 +0000 |
|---|---|---|
| committer | David Hedbor <neotron@php.net> | 2000-06-06 00:02:03 +0000 |
| commit | dd6cccf50ea97c56b575b57eff0010bf4cd5b5b3 (patch) | |
| tree | e1fa2d60d7d44546566bea0deb4c6fd7159ffd25 /sapi/roxen | |
| parent | 45ba649c8e0b752e76f447e8a7da4be2b4020d20 (diff) | |
| download | php-git-dd6cccf50ea97c56b575b57eff0010bf4cd5b5b3.tar.gz | |
PRE_INCLUDES hack reverted
Diffstat (limited to 'sapi/roxen')
| -rw-r--r-- | sapi/roxen/Makefile.in | 2 | ||||
| -rw-r--r-- | sapi/roxen/config.m4 | 3 | ||||
| -rw-r--r-- | sapi/roxen/roxen.c | 3 |
3 files changed, 3 insertions, 5 deletions
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" |