sniper Mon Nov 21 18:08:03 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src Makefile.global acinclude.m4 configure.in
/php-src/ext/standard config.m4
/php-src/scripts Makefile.frag php-config.in phpize.m4
/php-src/scripts/man1 php-config.1.in
Log:
MFH: - Fixed header installing under phpize builds
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.57.2.1&r2=1.57.2.2&ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.57.2.1 php-src/Makefile.global:1.57.2.2
--- php-src/Makefile.global:1.57.2.1 Wed Sep 14 13:57:32 2005
+++ php-src/Makefile.global Mon Nov 21 18:08:01 2005
@@ -5,9 +5,6 @@
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main
-I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
$(PHP_FRAMEWORKPATH)
-CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
-INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
-
all: $(all_targets)
@echo
@echo "Build complete."
@@ -45,6 +42,31 @@
@rm -f modules/*.la >/dev/null 2>&1
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
+install-headers:
+ [EMAIL PROTECTED] test "$(INSTALL_HEADERS)"; then
+ for i in $(INSTALL_HEADERS); do \
+ i=`$(top_srcdir)/build/shtool path -d $$i`; \
+ paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
+ done; \
+ $(mkinstalldirs) $$paths && \
+ echo "Installing header files:
$(INSTALL_ROOT)$(phpincludedir)/" && \
+ for i in $(INSTALL_HEADERS); do \
+ if test "$(PHP_PECL_EXTENSION)"; then \
+ src=`echo $$i | $(SED) -e
"s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
+ else \
+ src=$$i; \
+ fi; \
+ if test -f "$(top_srcdir)/$$src"; then \
+ $(INSTALL_DATA) $(top_srcdir)/$$src
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
+ elif test -f "$(top_builddir)/$$src"; then \
+ $(INSTALL_DATA) $(top_builddir)/$$src
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
+ else \
+ (cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
+ cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
+ fi \
+ done; \
+ fi
+
install-su: install-pear
test: all
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.332.2.6&r2=1.332.2.7&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.6 php-src/acinclude.m4:1.332.2.7
--- php-src/acinclude.m4:1.332.2.6 Thu Oct 13 16:33:40 2005
+++ php-src/acinclude.m4 Mon Nov 21 18:08:01 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.332.2.6 2005/10/13 20:33:40 rrichards Exp $
+dnl $Id: acinclude.m4,v 1.332.2.7 2005/11/21 23:08:01 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -973,6 +973,13 @@
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
+
+dnl Set for phpize builds only
+dnl ---------------------------
+ if test "$ext_builddir" = "."; then
+ PHP_PECL_EXTENSION=$1
+ PHP_SUBST(PHP_PECL_EXTENSION)
+ fi
])
dnl
@@ -2379,7 +2386,7 @@
ifelse([$2],[],[
for header_file in $1; do
PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
- INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $header_file"
+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
])
done
], [
@@ -2387,7 +2394,7 @@
for header_file in $2; do
hp_hf="$header_path/$header_file"
PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
- INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $hp_hf"
+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
])
done
])
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.19&r2=1.579.2.20&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.19 php-src/configure.in:1.579.2.20
--- php-src/configure.in:1.579.2.19 Fri Nov 18 04:51:39 2005
+++ php-src/configure.in Mon Nov 21 18:08:02 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.19 2005/11/18 09:51:39 sniper Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.20 2005/11/21 23:08:02 sniper Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1129,7 +1129,7 @@
PHP_SUBST(PHP_FRAMEWORKS)
PHP_SUBST(PHP_FRAMEWORKPATH)
PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
-PHP_SUBST(INSTALL_EXT_HEADERS)
+PHP_SUBST(INSTALL_HEADERS)
old_CC=$CC
@@ -1198,6 +1198,8 @@
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
+PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
+
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
http://cvs.php.net/diff.php/php-src/ext/standard/config.m4?r1=1.80&r2=1.80.2.1&ty=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.80
php-src/ext/standard/config.m4:1.80.2.1
--- php-src/ext/standard/config.m4:1.80 Sun Jun 19 18:15:25 2005
+++ php-src/ext/standard/config.m4 Mon Nov 21 18:08:02 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.80 2005/06/19 22:15:25 derick Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.80.2.1 2005/11/21 23:08:02 sniper Exp $ -*- autoconf -*-
divert(3)dnl
@@ -492,3 +492,6 @@
filters.c proc_open.c sunfuncs.c streamsfuncs.c
http.c)
PHP_ADD_MAKEFILE_FRAGMENT
+
+PHP_INSTALL_HEADERS([ext/standard/])
+
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.24.2.2&r2=1.24.2.3&ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.24.2.2
php-src/scripts/Makefile.frag:1.24.2.3
--- php-src/scripts/Makefile.frag:1.24.2.2 Thu Oct 13 06:02:59 2005
+++ php-src/scripts/Makefile.frag Mon Nov 21 18:08:02 2005
@@ -31,25 +31,6 @@
$(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \
$(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
-install-headers:
- [EMAIL PROTECTED] i in $(INSTALL_HEADERS); do \
- i=`$(top_srcdir)/build/shtool path -d $$i`; \
- paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
- done; \
- $(mkinstalldirs) $$paths && \
- echo "Installing header files:
$(INSTALL_ROOT)$(phpincludedir)/" && \
- for i in $(INSTALL_HEADERS); do \
- if test -f "$(top_srcdir)/$$i"; then \
- $(INSTALL_DATA) $(top_srcdir)/$$i
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
- elif test -f "$(top_builddir)/$$i"; then \
- $(INSTALL_DATA) $(top_builddir)/$$i
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
- else \
- (cd $(top_srcdir)/$$i && $(INSTALL_DATA) *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
- cd $(top_builddir)/$$i && $(INSTALL_DATA) *.h
$(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
- fi \
- done; \
- cd $(top_srcdir)/sapi/embed && $(INSTALL_DATA) *.h
$(INSTALL_ROOT)$(phpincludedir)/main
-
install-programs: $(builddir)/phpize $(builddir)/php-config
@echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/"
@for prog in $(bin_SCRIPTS); do \
http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.3.2.1&r2=1.3.2.2&ty=u
Index: php-src/scripts/php-config.in
diff -u php-src/scripts/php-config.in:1.3.2.1
php-src/scripts/php-config.in:1.3.2.2
--- php-src/scripts/php-config.in:1.3.2.1 Thu Aug 18 16:17:50 2005
+++ php-src/scripts/php-config.in Mon Nov 21 18:08:02 2005
@@ -24,12 +24,14 @@
echo $libs;;
--extension-dir)
echo $extension_dir;;
+--include-dir)
+ echo $includedir;;
--php-binary)
echo $php_binary;;
--version)
echo $version;;
*)
- echo "Usage: $0
[--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]"
+ echo "Usage: $0
[--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version]"
exit 1;;
esac
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.17&r2=1.17.2.1&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17 php-src/scripts/phpize.m4:1.17.2.1
--- php-src/scripts/phpize.m4:1.17 Mon Aug 8 12:06:49 2005
+++ php-src/scripts/phpize.m4 Mon Nov 21 18:08:02 2005
@@ -16,6 +16,7 @@
])
prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
PHP_EXECUTABLE=`$PHP_CONFIG --php-binary`
@@ -33,6 +34,8 @@
AC_MSG_RESULT($INCLUDES)
AC_MSG_CHECKING(for PHP extension directory)
AC_MSG_RESULT($EXTENSION_DIR)
+ AC_MSG_CHECKING(for PHP installed headers prefix)
+ AC_MSG_RESULT($phpincludedir)
])
dnl
AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
@@ -74,7 +77,7 @@
AC_PROG_LIBTOOL
all_targets='$(PHP_MODULES)'
-install_targets=install-modules
+install_targets="install-modules install-headers"
phplibdir="`pwd`/modules"
CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
CFLAGS_CLEAN='$(CFLAGS)'
@@ -91,6 +94,7 @@
PHP_SUBST(libdir)
PHP_SUBST(prefix)
PHP_SUBST(phplibdir)
+PHP_SUBST(phpincludedir)
PHP_SUBST(CC)
PHP_SUBST(CFLAGS)
@@ -109,6 +113,7 @@
PHP_SUBST(SHARED_LIBTOOL)
PHP_SUBST(LIBTOOL)
PHP_SUBST(SHELL)
+PHP_SUBST(INSTALL_HEADERS)
PHP_GEN_BUILD_DIRS
PHP_GEN_GLOBAL_MAKEFILE
http://cvs.php.net/diff.php/php-src/scripts/man1/php-config.1.in?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/scripts/man1/php-config.1.in
diff -u php-src/scripts/man1/php-config.1.in:1.3
php-src/scripts/man1/php-config.1.in:1.3.2.1
--- php-src/scripts/man1/php-config.1.in:1.3 Mon Aug 8 12:06:49 2005
+++ php-src/scripts/man1/php-config.1.in Mon Nov 21 18:08:02 2005
@@ -14,7 +14,7 @@
./" | Author: Jakub Vrana <[EMAIL PROTECTED]>
|
./" +----------------------------------------------------------------------+
./"
-./" $Id: php-config.1.in,v 1.3 2005/08/08 16:06:49 sniper Exp $
+./" $Id: php-config.1.in,v 1.3.2.1 2005/11/21 23:08:02 sniper Exp $
./"
.TH php\-config 1 "Apr 2005" "The PHP Group" "Scripting Language"
.SH NAME
@@ -51,6 +51,10 @@
Directory where extensions are searched by default
.TP
.PD 0
+.B \-\-include-dir
+Directory prefix where header files are installed by default
+.TP
+.PD 0
.B \-\-php-binary
Full path to php CLI/CGI binary
.TP
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
