[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in
helly Sun Feb 17 20:49:46 2008 UTC Modified files: /php-srcacinclude.m4 configure.in Makefile.global Log: - Allow zend_extensions to be build inside ext and tested with 'make test' http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.385r2=1.386diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.385 php-src/acinclude.m4:1.386 --- php-src/acinclude.m4:1.385 Mon Dec 31 04:27:47 2007 +++ php-src/acinclude.m4Sun Feb 17 20:49:45 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.385 2007/12/31 04:27:47 jon Exp $ +dnl $Id: acinclude.m4,v 1.386 2008/02/17 20:49:45 helly Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -837,7 +837,7 @@ ]) dnl -dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx) +dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx, zend_ext) dnl dnl Basically sets up the link-stage for building module-name dnl from object_var in build-dir. @@ -860,7 +860,11 @@ ;; esac - PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix + if test x$5 = xyes; then +PHP_ZEND_EX=$PHP_ZEND_EX \$(phplibdir)/$1.$suffix + else +PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix + fi PHP_SUBST($2) cat Makefile.objectsEOF \$(phplibdir)/$1.$suffix: $3/$1.$suffix @@ -916,7 +920,7 @@ ]) dnl -dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]) dnl dnl Includes an extension in the build. dnl @@ -950,10 +954,10 @@ PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes) case $host_alias in *netware*[)] - PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6) + PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6, $7) ;; *[)] - PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6) + PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7) ;; esac AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.646r2=1.647diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.646 php-src/configure.in:1.647 --- php-src/configure.in:1.646 Thu Feb 14 10:25:10 2008 +++ php-src/configure.inSun Feb 17 20:49:46 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.646 2008/02/14 10:25:10 dmitry Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.647 2008/02/17 20:49:46 helly Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -870,7 +870,7 @@ case $php_build_target in program|static) standard_libtool_flag='-prefer-non-pic -static' -if test -z $PHP_MODULES; then +if test -z $PHP_MODULES test -z $PHP_ZEND_EX; then enable_shared=no fi ;; @@ -1076,6 +1076,7 @@ PHP_SUBST(PHP_GLOBAL_OBJS) PHP_SUBST(PHP_MODULES) +PHP_SUBST(PHP_ZEND_EX) PHP_SUBST(EXT_LIBS) @@ -1156,6 +1157,17 @@ CPPFLAGS=$CPPFLAGS -DTHREAD=1 fi +if test $PHP_DEBUG = yes test $PHP_THREAD_SAFETY = yes; then +ZEND_EXT_TYPE=zend_extension_debug_ts +elif test $PHP_DEBUG = yes; then +ZEND_EXT_TYPE=zend_extension_debug +elif test $PHP_THREAD_SAFETY = yes; then +ZEND_EXT_TYPE=zend_extension_ts +else +ZEND_EXT_TYPE=zend_extension +fi +PHP_SUBST(ZEND_EXT_TYPE) + dnl dnl Libtool creation dnl @@ -1192,7 +1204,7 @@ INLINE_CFLAGS=$INLINE_CFLAGS $standard_libtool_flag CXXFLAGS=$CXXFLAGS $standard_libtool_flag -all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) +all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) install_targets=$install_modules install-build install-headers install-programs case $PHP_SAPI in http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.85r2=1.86diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.85 php-src/Makefile.global:1.86 --- php-src/Makefile.global:1.85Fri Aug 3 14:01:40 2007 +++ php-src/Makefile.global Sun Feb 17 20:49:46 2008 @@ -11,7 +11,7 @@ @echo Don't forget to run 'make test'. @echo -build-modules: $(PHP_MODULES) +build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ @@ -73,6 +73,11 @@ for i in $(PHP_MODULES); do \ . $$i; $(top_srcdir)/build/shtool echo -n -- -d extension=$$dlname; \ done; \ + fi; \ + if test x$(PHP_ZEND_EX) != x; then \ + for i in $(PHP_ZEND_EX); do \ + . $$i;
[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /main build-defs.h.in /scripts phpize.m4
andrei Sat Apr 8 17:34:57 2006 UTC Modified files: /php-srcMakefile.global acinclude.m4 configure.in /php-src/main build-defs.h.in /php-src/scriptsphpize.m4 Log: Separate suffixes of shared libraries that we link against and the ones we load with dlopen(). This matters on Mac OS X, for example. http://cvs.php.net/viewcvs.cgi/php-src/Makefile.global?r1=1.68r2=1.69diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.68 php-src/Makefile.global:1.69 --- php-src/Makefile.global:1.68Wed Apr 5 20:21:59 2006 +++ php-src/Makefile.global Sat Apr 8 17:34:57 2006 @@ -25,10 +25,10 @@ install-sapi: $(OVERALL_TARGET) @echo Installing PHP SAPI module: $(PHP_SAPI) [EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir) - [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \ + [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ - if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \ - $(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \ + if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ + $(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \ break; \ fi; \ done; \ http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.342r2=1.343diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.342 php-src/acinclude.m4:1.343 --- php-src/acinclude.m4:1.342 Mon Mar 27 05:01:48 2006 +++ php-src/acinclude.m4Sat Apr 8 17:34:57 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.342 2006/03/27 05:01:48 andrei Exp $ +dnl $Id: acinclude.m4,v 1.343 2006/04/08 17:34:57 andrei Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -1877,20 +1877,43 @@ dnl - dnl -dnl PHP_SHLIB_SUFFIX_NAME +dnl PHP_SHLIB_BUILD_SUFFIX_NAME dnl -dnl Determines shared library suffix +dnl Determines link library suffix dnl suffix can be: .so, .sl or .dylib dnl +AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[ + AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl + PHP_SUBST(SHLIB_SUFFIX_NAME) + SHLIB_SUFFIX_NAME=so + case $host_alias in + *hpux*[)] + SHLIB_SUFFIX_NAME=sl + ;; + *darwin*[)] + SHLIB_SUFFIX_NAME=dylib + ;; + esac +]) + +dnl +dnl PHP_SHLIB_SUFFIX_NAME +dnl +dnl Determines shared library suffix +dnl suffix can be: .so or .sl +dnl AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[ - AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl - PHP_SUBST(SHLIB_SUFFIX_NAME) - SHLIB_SUFFIX_NAME=so - case $host_alias in - *hpux*[)] -SHLIB_SUFFIX_NAME=sl -;; - esac + AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl + PHP_SUBST(SHLIB_DL_SUFFIX_NAME) + SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME + case $host_alias in + *hpux*[)] + SHLIB_DL_SUFFIX_NAME=sl + ;; + *darwin*[)] + SHLIB_DL_SUFFIX_NAME=so + ;; + esac ]) dnl http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.601r2=1.602diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.601 php-src/configure.in:1.602 --- php-src/configure.in:1.601 Wed Mar 29 01:52:28 2006 +++ php-src/configure.inSat Apr 8 17:34:57 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.601 2006/03/29 01:52:28 pollita Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.602 2006/04/08 17:34:57 andrei Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -225,6 +225,7 @@ PTHREADS_CHECK PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAME +PHP_SHLIB_BUILD_SUFFIX_NAME PHP_SAPI=default PHP_BUILD_PROGRAM @@ -233,7 +234,7 @@ dnl - dnl paths to the targets are relative to the build directory -SAPI_SHARED=libs/libphp5.$SHLIB_SUFFIX_NAME +SAPI_SHARED=libs/libphp5.$SHLIB_DL_SUFFIX_NAME SAPI_STATIC=libs/libphp5.a SAPI_LIBTOOL=libphp5.la @@ -1148,6 +1149,7 @@ PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) +PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME) PHP_SUBST(INSTALL_HEADERS) old_CC=$CC http://cvs.php.net/viewcvs.cgi/php-src/main/build-defs.h.in?r1=1.17r2=1.18diff_format=u Index: php-src/main/build-defs.h.in diff -u php-src/main/build-defs.h.in:1.17 php-src/main/build-defs.h.in:1.18 --- php-src/main/build-defs.h.in:1.17 Sun Jan 1 13:09:57 2006 +++ php-src/main/build-defs.h.inSat Apr 8 17:34:57 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: build-defs.h.in,v 1.17 2006/01/01 13:09:57 sniper Exp $ */ +/* $Id:
[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /ext/standard config.m4 /scripts Makefile.frag php-config.in phpize.m4 /scripts/man1 php-config.1.in
sniper Mon Nov 21 18:07:36 2005 EDT Modified files: /php-srcMakefile.global acinclude.m4 configure.in /php-src/ext/standard config.m4 /php-src/scriptsMakefile.frag php-config.in phpize.m4 /php-src/scripts/man1 php-config.1.in Log: - Fixed header installing under phpize builds http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.63r2=1.64ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.63 php-src/Makefile.global:1.64 --- php-src/Makefile.global:1.63Wed Nov 9 00:41:09 2005 +++ php-src/Makefile.global Mon Nov 21 18:07:31 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 21 @$(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 + test: all [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE) test -x $(PHP_EXECUTABLE); then \ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.336r2=1.337ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.336 php-src/acinclude.m4:1.337 --- php-src/acinclude.m4:1.336 Thu Oct 13 16:16:39 2005 +++ php-src/acinclude.m4Mon Nov 21 18:07:31 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.336 2005/10/13 20:16:39 rrichards Exp $ +dnl $Id: acinclude.m4,v 1.337 2005/11/21 23:07:31 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -971,6 +971,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 @@ -2375,7 +2382,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 ], [ @@ -2383,7 +2390,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.593r2=1.594ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.593 php-src/configure.in:1.594 --- php-src/configure.in:1.593 Thu Nov 17 17:58:07 2005 +++ php-src/configure.inMon Nov 21 18:07:31 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.593 2005/11/17 22:58:07 helly Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.594 2005/11/21 23:07:31 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1188,7 +1188,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 @@ -1257,6 +1257,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
[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /ext/curl config.m4 /ext/dom config.m4 /ext/iconv config.m4 /ext/interbase php_ibase_udf.c /ext/libxml config0.m4 /ext/mbstring
sniper Fri May 6 22:51:54 2005 EDT Removed files: /php-src/ext/pdoMakefile.frag Modified files: /php-srcMakefile.global acinclude.m4 configure.in /php-src/ext/curl config.m4 /php-src/ext/domconfig.m4 /php-src/ext/iconv config.m4 /php-src/ext/interbase php_ibase_udf.c /php-src/ext/libxml config0.m4 /php-src/ext/mbstring config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pdoconfig.m4 /php-src/ext/pdo_sqlite .cvsignore config.m4 /php-src/ext/pdo_sqlite/sqlite/src .cvsignore /php-src/ext/sessionconfig.m4 /php-src/ext/sqlite config.m4 /php-src/ext/xmlconfig.m4 /php-src/sapi/embed config.m4 /php-src/scriptsMakefile.frag phpize.m4 Log: - Added PHP_INSTALL_HEADERS() macro - Fixed several VPATH build issues - Changed all awk calls to use $AWK - Changed all mkdir calls to use $php_shtool mkdir http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.51r2=1.52ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.51 php-src/Makefile.global:1.52 --- php-src/Makefile.global:1.51Thu Dec 4 10:57:55 2003 +++ php-src/Makefile.global Fri May 6 22:51:50 2005 @@ -5,6 +5,8 @@ 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 http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.305r2=1.306ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.305 php-src/acinclude.m4:1.306 --- php-src/acinclude.m4:1.305 Sat Apr 30 05:29:09 2005 +++ php-src/acinclude.m4Fri May 6 22:51:50 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.305 2005/04/30 09:29:09 sniper Exp $ +dnl $Id: acinclude.m4,v 1.306 2005/05/07 02:51:50 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -138,7 +138,7 @@ dnl AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl -test -d include || mkdir include +test -d include || $php_shtool mkdir include Makefile.objects Makefile.fragments dnl We need to play tricks here to avoid matching the grep line itself @@ -901,7 +901,11 @@ ]) AC_DEFUN([PHP_ADD_BUILD_DIR],[ - BUILD_DIR=$BUILD_DIR $1 + ifelse($2,,[ +BUILD_DIR=$BUILD_DIR $1 + ], [ +$php_shtool mkdir -p $1 + ]) ]) AC_DEFUN([PHP_GEN_BUILD_DIRS],[ @@ -919,13 +923,13 @@ dnl shared can be set to shared or yes to build the extension as dnl a dynamically loadable library. Optional parameter sapi_class can dnl be set to cli to mark extension build only with CLI or CGI sapi's. -dnl extra-cflags are passed to the compiler, with @ext_srcdir@ being -dnl substituted. +dnl extra-cflags are passed to the compiler, with +dnl @ext_srcdir@ and @ext_builddir@ being substituted. AC_DEFUN([PHP_NEW_EXTENSION],[ ext_builddir=[]PHP_EXT_BUILDDIR($1) ext_srcdir=[]PHP_EXT_SRCDIR($1) - ifelse($5,,ac_extra=,[ac_extra=`echo $5|sed [EMAIL PROTECTED]@#$ext_srcdir#g`]) + ifelse($5,,ac_extra=,[ac_extra=`echo $5|sed [EMAIL PROTECTED]@#$ext_srcdir#g|sed [EMAIL PROTECTED]@#$ext_builddir#g`]) if test $3 != shared test $3 != yes test $4 != cli; then dnl -- Static module @@ -2345,6 +2349,29 @@ dnl Misc. macros dnl - +dnl +dnl PHP_INSTALL_HEADERS(path [, file ...]) +dnl +dnl PHP header files to be installed +dnl +AC_DEFUN([PHP_INSTALL_HEADERS],[ + if test -z $2; then +for header_file in $1; do + PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [ +INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_file + ]) +done + else +header_path=$1 +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 + ]) +done + fi +]) + dnl dnl PHP_AP_EXTRACT_VERSION(/path/httpd) dnl http://cvs.php.net/diff.php/php-src/configure.in?r1=1.552r2=1.553ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.552 php-src/configure.in:1.553 --- php-src/configure.in:1.552 Sat Apr 30 00:27:23 2005 +++ php-src/configure.inFri May 6 22:51:50 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.552 2005/04/30 04:27:23 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.553 2005/05/07 02:51:50 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1122,6 +1122,7 @@ PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) +PHP_SUBST(INSTALL_EXT_HEADERS) old_CC=$CC
[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in
sniper Thu Dec 4 10:57:56 2003 EDT Modified files: /php-srcMakefile.global acinclude.m4 configure.in Log: - Only add 'install-modules' into install targets when there are such modules to install. Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.50 php-src/Makefile.global:1.51 --- php-src/Makefile.global:1.50Thu Jul 24 13:44:16 2003 +++ php-src/Makefile.global Thu Dec 4 10:57:55 2003 @@ -38,10 +38,10 @@ install-modules: build-modules @test -d modules \ - $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) \ - echo Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/ \ - rm -f modules/*.la \ - $(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) /dev/null 21 || true + $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) + @echo Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/ + @rm -f modules/*.la /dev/null 21 + @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) install-tester: @echo Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/ Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.265 php-src/acinclude.m4:1.266 --- php-src/acinclude.m4:1.265 Thu Nov 13 09:17:47 2003 +++ php-src/acinclude.m4Thu Dec 4 10:57:55 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.265 2003/11/13 14:17:47 sniper Exp $ +dnl $Id: acinclude.m4,v 1.266 2003/12/04 15:57:55 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1153,6 +1153,7 @@ dnl from object_var in build-dir. dnl AC_DEFUN([PHP_SHARED_MODULE],[ + install_modules=install-modules PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.la PHP_SUBST($2) cat Makefile.objectsEOF Index: php-src/configure.in diff -u php-src/configure.in:1.482 php-src/configure.in:1.483 --- php-src/configure.in:1.482 Thu Dec 4 08:41:48 2003 +++ php-src/configure.inThu Dec 4 10:57:55 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.482 2003/12/04 13:41:48 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.483 2003/12/04 15:57:55 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1149,7 +1149,7 @@ CXXFLAGS=$CXXFLAGS $standard_libtool_flag all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' -install_targets=install-modules $install_pear install-build install-headers install-programs +install_targets=$install_modules $install_pear install-build install-headers install-programs case $PHP_SAPI in cgi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
