Index: Makefile.global
===================================================================
RCS file: /repository/php-src/Makefile.global,v
retrieving revision 1.57.2.1
diff -u -r1.57.2.1 Makefile.global
--- Makefile.global	14 Sep 2005 17:57:32 -0000	1.57.2.1
+++ Makefile.global	20 Nov 2005 15:26:45 -0000
@@ -1,3 +1,5 @@
+dirname = $(top_srcdir)/build/shtool path -d
+basename = $(top_srcdir)/build/shtool path -b
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644
@@ -47,6 +49,23 @@
 
 install-su: install-pear
 
+install-phpized-headers:
+	-@for i in $(INSTALL_HEADERS); do \
+		i=`$(dirname) $$i`; \
+		paths="$$paths $(INSTALL_ROOT)$(INCLUDE_DIR)/$$i"; \
+	done; \
+	$(mkinstalldirs) $$paths && \
+	echo "Installing header files:          $(INSTALL_ROOT)$(INCLUDE_DIR)/" && \
+	for i in $(INSTALL_HEADERS); do \
+		if test -f "$(top_builddir)/$$($(basename) $$i)"; then \
+			$(INSTALL_DATA) $(top_builddir)/$$($(basename) $$i) $(INSTALL_ROOT)$(INCLUDE_DIR)/$$i; \
+		elif test -f "$(top_builddir)/$$($(basename) "$$($(dirname) $$i)")/$$($(basename) $$i)"; then \
+			$(INSTALL_DATA) $(top_builddir)/$$($(basename) $$($(dirname) $$i))/$$($(basename) $$i) $(INSTALL_ROOT)$(INCLUDE_DIR)/$$i; \
+		elif  test -f "$(top_builddir)/$$($(basename) "$$($(dirname) "$$($(dirname) $$i)")")/$$($(basename) "$$($(dirname) $$i)")/$$($(basename) $$i)"; then \
+			$(INSTALL_DATA) $(top_builddir)/$$($(basename) $$($(dirname) $$($(dirname) $$i)))/$$($(basename) $$($(dirname) $$i))/$$($(basename) $$i) $(INSTALL_ROOT)$(INCLUDE_DIR)/$$i; \
+		fi \
+	done;
+
 test: all 
 	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
Index: scripts/phpize.m4
===================================================================
RCS file: /repository/php-src/scripts/phpize.m4,v
retrieving revision 1.17
diff -u -r1.17 phpize.m4
--- scripts/phpize.m4	8 Aug 2005 16:06:49 -0000	1.17
+++ scripts/phpize.m4	20 Nov 2005 15:26:45 -0000
@@ -24,6 +24,11 @@
     AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH)
   fi
 
+  for i in $INCLUDES ""; do
+    INCLUDE_DIR=`$SED -e s/-I// <<<$i`
+    break;
+  done;
+
   php_shtool=$srcdir/build/shtool
   PHP_INIT_BUILD_SYSTEM
 
@@ -33,6 +38,8 @@
   AC_MSG_RESULT($INCLUDES)
   AC_MSG_CHECKING(for PHP extension directory)
   AC_MSG_RESULT($EXTENSION_DIR)
+  AC_MSG_CHECKING(for PHP include directory)
+  AC_MSG_RESULT($INCLUDE_DIR)
 ])
 dnl
 AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
@@ -74,7 +81,7 @@
 AC_PROG_LIBTOOL
 
 all_targets='$(PHP_MODULES)'
-install_targets=install-modules
+install_targets='install-phpized-headers install-modules'
 phplibdir="`pwd`/modules"
 CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
 CFLAGS_CLEAN='$(CFLAGS)'
@@ -85,6 +92,7 @@
 PHP_SUBST(PHP_MODULES)
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
+PHP_SUBST(INSTALL_EXT_HEADERS)
 
 PHP_SUBST(prefix)
 PHP_SUBST(exec_prefix)
@@ -100,6 +108,7 @@
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
 PHP_SUBST(EXTENSION_DIR)
+PHP_SUBST(INCLUDE_DIR)
 PHP_SUBST(PHP_EXECUTABLE)
 PHP_SUBST(EXTRA_LDFLAGS)
 PHP_SUBST(EXTRA_LIBS)