Fixed include directory problems.

diff --git a/sapi/roxen/Makefile.in b/sapi/roxen/Makefile.in
index c49bf97ead4adb419f4beaed776e233a13f08de2..8264f88b74cf34a8d88b923d132b60102ea94e81 100644 (file)
--- a/sapi/roxen/Makefile.in
+++ b/sapi/roxen/Makefile.in
@@ -2,4 +2,6 @@
 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 d568bac7523debd56e6d91559984ae5414617715..f1b1859548ea21129e872a7b9b17d70303a21009 100644 (file)
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -25,7 +25,7 @@ AC_ARG_WITH(roxen,
        else
                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
@@ -34,6 +34,8 @@ AC_ARG_WITH(roxen,
        Pike binary used:      $PIKE
        Pike include dir:      $PIKE_INCLUDE_DIR
        Pike module directory: $PIKE_MODULE_DIR"
+       PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR "
+    PHP_SUBST(PIKE_INCLUDE_DIR)
 ])
 AC_MSG_RESULT($RESULT)