[PHP-CVS] cvs: php-src / configure.in
janiFri Jul 3 11:41:07 2009 UTC Modified files: /php-srcconfigure.in Log: typo. or something. Who knows, the branches are a mess anyway.. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.678&r2=1.679&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.678 php-src/configure.in:1.679 --- php-src/configure.in:1.678 Mon May 18 21:28:42 2009 +++ php-src/configure.inFri Jul 3 11:41:06 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.678 2009/05/18 21:28:42 derick Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.679 2009/07/03 11:41:06 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -219,6 +219,7 @@ if test "$SUNCC" = "yes"; then CFLAGS="$CFLAGS -xmemalign=8s" fi +;; esac dnl activate some gcc specific optimizations for gcc >= 4 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_ini.c /scripts phpize.m4
derick Mon May 18 21:28:42 2009 UTC
Modified files:
/php-srcconfigure.in
/php-src/scriptsphpize.m4
/php-src/main php_ini.c
Log:
- Get rid of the four different versions of zend_extension* and only use
zend_extension. Because of the API identifier change in PHP 5.3 you also get
a proper warning message now.
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.677&r2=1.678&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.677 php-src/configure.in:1.678
--- php-src/configure.in:1.677 Wed May 6 14:04:58 2009
+++ php-src/configure.inMon May 18 21:28:42 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.677 2009/05/06 14:04:58 iliaa Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.678 2009/05/18 21:28:42 derick Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1246,15 +1246,7 @@
CPPFLAGS="$CPPFLAGS -DTHREAD=1"
fi
-if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then
- ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "1"; 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
+ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.31&r2=1.32&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.31 php-src/scripts/phpize.m4:1.32
--- php-src/scripts/phpize.m4:1.31 Thu Dec 4 00:41:55 2008
+++ php-src/scripts/phpize.m4 Mon May 18 21:28:42 2009
@@ -96,15 +96,7 @@
AC_MSG_RESULT([$PHP_DEBUG])
dnl Support for building and testing Zend extensions
-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
+ZEND_EXT_TYPE="zend_extension"
PHP_SUBST(ZEND_EXT_TYPE)
dnl Discard optimization flags when debugging is enabled
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.172 php-src/main/php_ini.c:1.173
--- php-src/main/php_ini.c:1.172Tue Mar 10 23:39:53 2009
+++ php-src/main/php_ini.c Mon May 18 21:28:42 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.172 2009/03/10 23:39:53 helly Exp $ */
+/* $Id: php_ini.c,v 1.173 2009/05/18 21:28:42 derick Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -170,19 +170,7 @@
/* php.ini support */
#define PHP_EXTENSION_TOKEN"extension"
-#ifdef ZTS
-# if (ZEND_DEBUG)
-# define ZEND_EXTENSION_TOKEN "zend_extension_debug_ts"
-# else
-# define ZEND_EXTENSION_TOKEN "zend_extension_ts"
-# endif
-#else
-# if (ZEND_DEBUG)
-# define ZEND_EXTENSION_TOKEN "zend_extension_debug"
-# else
-# define ZEND_EXTENSION_TOKEN "zend_extension"
-# endif
-#endif
+#define ZEND_EXTENSION_TOKEN "zend_extension"
/* {{{ config_zval_dtor
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
iliaa Wed May 6 14:04:58 2009 UTC Modified files: /php-srcconfigure.in Log: MFB: Fixed bug #48156 (Added support for lcov v1.7) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.676&r2=1.677&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.676 php-src/configure.in:1.677 --- php-src/configure.in:1.676 Wed Mar 18 10:49:35 2009 +++ php-src/configure.inWed May 6 14:04:58 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.676 2009/03/18 10:49:35 dmitry Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.677 2009/05/06 14:04:58 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -728,7 +728,7 @@ AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list="1.5 1.6" + ltp_version_list="1.5 1.6 1.7" AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard math.c /win32/build config.w32 ZendEngine2 Makefile.am Zend.dsp ZendTS.dsp zend.c zend_execute_API.c zend_float.c zend_float.h zend_globals.h zen
dmitry Wed Mar 18 10:49:36 2009 UTC
Added files:
/ZendEngine2zend_float.c
Modified files:
/php-srcconfigure.in
/ZendEngine2Makefile.am Zend.dsp ZendTS.dsp zend.c
zend_execute_API.c zend_float.h zend_globals.h
zend_operators.c zend_strtod.c
/php-src/ext/standard math.c
/php-src/win32/buildconfig.w32
Log:
Fixed floating point mathematic speed degradation (Christian)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.675&r2=1.676&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.675 php-src/configure.in:1.676
--- php-src/configure.in:1.675 Mon Feb 23 03:35:18 2009
+++ php-src/configure.inWed Mar 18 10:49:35 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.675 2009/02/23 03:35:18 dsp Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.676 2009/03/18 10:49:35 dmitry Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1366,7 +1366,7 @@
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_ts_hash.c zend_stream.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c \
-zend_strtol.c zend_gc.c zend_closures.c)
+zend_strtol.c zend_gc.c zend_closures.c zend_float.c)
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c
zend_objects_API.c zend_default_classes.c)
http://cvs.php.net/viewvc.cgi/ZendEngine2/Makefile.am?r1=1.64&r2=1.65&diff_format=u
Index: ZendEngine2/Makefile.am
diff -u ZendEngine2/Makefile.am:1.64 ZendEngine2/Makefile.am:1.65
--- ZendEngine2/Makefile.am:1.64Mon Feb 23 03:33:41 2009
+++ ZendEngine2/Makefile.am Wed Mar 18 10:49:35 2009
@@ -17,7 +17,7 @@
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
- zend_strtod.c zend_strtod.c zend_strtol.c zend_closures.c
+ zend_strtod.c zend_strtod.c zend_strtol.c zend_closures.c zend_float.c
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.dsp?r1=1.28&r2=1.29&diff_format=u
Index: ZendEngine2/Zend.dsp
diff -u ZendEngine2/Zend.dsp:1.28 ZendEngine2/Zend.dsp:1.29
--- ZendEngine2/Zend.dsp:1.28 Mon Feb 23 03:33:41 2009
+++ ZendEngine2/Zend.dspWed Mar 18 10:49:35 2009
@@ -151,6 +151,10 @@
# End Source File
# Begin Source File
+SOURCE=.\zend_float.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_hash.c
# End Source File
# Begin Source File
http://cvs.php.net/viewvc.cgi/ZendEngine2/ZendTS.dsp?r1=1.50&r2=1.51&diff_format=u
Index: ZendEngine2/ZendTS.dsp
diff -u ZendEngine2/ZendTS.dsp:1.50 ZendEngine2/ZendTS.dsp:1.51
--- ZendEngine2/ZendTS.dsp:1.50 Mon Feb 23 03:33:41 2009
+++ ZendEngine2/ZendTS.dsp Wed Mar 18 10:49:35 2009
@@ -180,6 +180,10 @@
# End Source File
# Begin Source File
+SOURCE=.\zend_float.c
+# End Source File
+# Begin Source File
+
SOURCE=.\zend_hash.c
# End Source File
# Begin Source File
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.429&r2=1.430&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.429 ZendEngine2/zend.c:1.430
--- ZendEngine2/zend.c:1.429Wed Feb 18 10:55:23 2009
+++ ZendEngine2/zend.c Wed Mar 18 10:49:35 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.429 2009/02/18 10:55:23 dmitry Exp $ */
+/* $Id: zend.c,v 1.430 2009/03/18 10:49:35 dmitry Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -976,6 +976,7 @@
EG(current_execute_data) = NULL;
EG(current_module) = NULL;
EG(exit_status) = 0;
+ EG(saved_fpu_cw) = NULL;
EG(active) = 0;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.473&r2=1.474&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.473
ZendEngine2/zend_execute_API.c:1.474
--- ZendEngine2/zend_execute_API.c:1.473Thu Mar 5 16:24:41 2009
+++ ZendEngine2/zend_execute_API.c Wed Mar 18 10:49:35 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.473 2009/03/05 16:24:41 felipe Exp $ */
+/* $Id: zend_execute_API.c,v 1.474 2009/03/18 10:49:35 dmitry Exp $ */
#include
#include
@@ -32,6 +32,7 @@
#include "zend_closures.h"
#include "zend_exceptions.h"
#include "zend_vm.h"
+#include "zend_float.h"
#ifdef HAVE_SYS_TIME_H
#include
#endif
@@ -136,6 +137,8 @@
void init_executor(TSRMLS_D) /* {{{ */
{
+ zend_init_fpu(TSRMLS_C);
+
INIT_ZVAL(EG(uninitialized_zval));
/* trick to make uninitialized_zval never be modified, passed by ref,
etc. */
Z_ADDREF(EG(uninitialized_zv
[PHP-CVS] cvs: php-src / configure.in /win32/build config.w32
dsp Mon Feb 23 03:35:18 2009 UTC
Modified files:
/php-srcconfigure.in
/php-src/win32/buildconfig.w32
Log:
Remove zend_dynamic_array and it's build targets as it is not longer needed
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.674&r2=1.675&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.674 php-src/configure.in:1.675
--- php-src/configure.in:1.674 Wed Feb 11 09:07:41 2009
+++ php-src/configure.inMon Feb 23 03:35:18 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.674 2009/02/11 09:07:41 tony2001 Exp $ -*- autoconf
-*-
+## $Id: configure.in,v 1.675 2009/02/23 03:35:18 dsp Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1359,7 +1359,7 @@
PHP_ADD_SOURCES(Zend, \
zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c \
-zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
+zend_alloc.c zend_compile.c zend_constants.c \
zend_execute_API.c zend_unicode.c zend_highlight.c zend_llist.c \
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.98&r2=1.99&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.98 php-src/win32/build/config.w32:1.99
--- php-src/win32/build/config.w32:1.98 Fri Jan 23 15:48:58 2009
+++ php-src/win32/build/config.w32 Mon Feb 23 03:35:18 2009
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.98 2009/01/23 15:48:58 kalle Exp $
+// $Id: config.w32,v 1.99 2009/02/23 03:35:18 dsp Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -335,7 +335,7 @@
ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
- zend_constants.c zend_dynamic_array.c zend_exceptions.c \
+ zend_constants.c zend_exceptions.c \
zend_execute_API.c zend_highlight.c \
zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Wed Feb 11 09:07:41 2009 UTC Modified files: /php-srcconfigure.in Log: fix check for zend_extension type http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.673&r2=1.674&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.673 php-src/configure.in:1.674 --- php-src/configure.in:1.673 Wed Feb 11 00:08:17 2009 +++ php-src/configure.inWed Feb 11 09:07:41 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.673 2009/02/11 00:08:17 scottmac Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.674 2009/02/11 09:07:41 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1246,9 +1246,9 @@ CPPFLAGS="$CPPFLAGS -DTHREAD=1" fi -if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes"; then +if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then ZEND_EXT_TYPE="zend_extension_debug_ts" -elif test "$PHP_DEBUG" = "yes"; then +elif test "$PHP_DEBUG" = "1"; then ZEND_EXT_TYPE="zend_extension_debug" elif test "$PHP_THREAD_SAFETY" = "yes"; then ZEND_EXT_TYPE="zend_extension_ts" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
scottmacWed Feb 11 00:08:18 2009 UTC Modified files: /php-srcconfigure.in Log: Fix debug builds for OSX, PHP_DEBUG is set to 1 at the top http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.672&r2=1.673&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.672 php-src/configure.in:1.673 --- php-src/configure.in:1.672 Sun Feb 1 21:51:44 2009 +++ php-src/configure.inWed Feb 11 00:08:17 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.672 2009/02/01 21:51:44 dsp Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.673 2009/02/11 00:08:17 scottmac Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1291,7 +1291,7 @@ dnl Finish the Darwin hack if test "$php_did_darwin9_cheat" -eq 1; then - if test "$PHP_DEBUG" = "yes"; then + if test "$PHP_DEBUG" = "1"; then CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'` else CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs//g'` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
dsp Sun Feb 1 21:51:44 2009 UTC Modified files: /php-srcconfigure.in Log: Fix a typo http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.671&r2=1.672&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.671 php-src/configure.in:1.672 --- php-src/configure.in:1.671 Sun Jan 11 23:47:52 2009 +++ php-src/configure.inSun Feb 1 21:51:44 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.671 2009/01/11 23:47:52 scottmac Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.672 2009/02/01 21:51:44 dsp Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1246,11 +1246,11 @@ CPPFLAGS="$CPPFLAGS -DTHREAD=1" fi -if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes; then +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 +elif test "$PHP_THREAD_SAFETY" = "yes"; then ZEND_EXT_TYPE="zend_extension_ts" else ZEND_EXT_TYPE="zend_extension" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard config.m4 dns.c dns.h
scottmacSun Jan 11 23:47:52 2009 UTC
Modified files:
/php-src/ext/standard dns.c dns.h config.m4
/php-srcconfigure.in
Log:
MFB Add support for the older style bind 8 functions, this adds support for
OS X to use all of the dns_* functions.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.103&r2=1.104&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.103 php-src/ext/standard/dns.c:1.104
--- php-src/ext/standard/dns.c:1.103Sun Jan 11 18:38:00 2009
+++ php-src/ext/standard/dns.c Sun Jan 11 23:47:52 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.103 2009/01/11 18:38:00 felipe Exp $ */
+/* $Id: dns.c,v 1.104 2009/01/11 23:47:52 scottmac Exp $ */
/* {{{ includes */
#include "php.h"
@@ -358,7 +358,7 @@
* __libc_res_nsend() in resolv/res_send.c
* */
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(HAVE_DEPRECATED_DNS_FUNCS)
#define php_dns_free_res(__res__) _php_dns_free_res(__res__)
static void _php_dns_free_res(struct __res_state res) { /* {{{ */
int ns;
@@ -672,7 +672,9 @@
zval *authns = NULL, *addtl = NULL;
int addtl_recs = 0;
int type_to_fetch;
+#if !defined(HAVE_DEPRECATED_DNS_FUNCS)
struct __res_state res;
+#endif
HEADER *hp;
querybuf buf, answer;
u_char *cp = NULL, *end = NULL;
@@ -757,11 +759,14 @@
break;
}
if (type_to_fetch) {
+#if defined(HAVE_DEPRECATED_DNS_FUNCS)
+ res_init();
+#else
memset(&res, 0, sizeof(res));
res_ninit(&res);
res.retrans = 5;
res.options &= ~RES_DEFNAMES;
-
+#endif
n = res_nmkquery(&res, QUERY, hostname, C_IN,
type_to_fetch, NULL, 0, NULL, buf.qb2, sizeof buf);
if (n<0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"res_nmkquery() failed");
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.h?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/standard/dns.h
diff -u php-src/ext/standard/dns.h:1.25 php-src/ext/standard/dns.h:1.26
--- php-src/ext/standard/dns.h:1.25 Tue Jan 6 20:44:56 2009
+++ php-src/ext/standard/dns.h Sun Jan 11 23:47:52 2009
@@ -18,12 +18,24 @@
+--+
*/
-/* $Id: dns.h,v 1.25 2009/01/06 20:44:56 pajoye Exp $ */
+/* $Id: dns.h,v 1.26 2009/01/11 23:47:52 scottmac Exp $ */
#ifndef DNS_H
#define DNS_H
-#if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
+#if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND &&
!defined(HAVE_RES_NSEND)
+#define HAVE_DEPRECATED_DNS_FUNCS 1
+#endif
+
+#if HAVE_DEPRECATED_DNS_FUNCS
+#define res_nmkquery(res, op, dname, class, type, data, datalen, newrr, buf,
buflen) \
+ res_mkquery(op, dname, class, type, data, datalen, newrr, buf, buflen)
+#define res_nsend(res, msg, msglen, answer, anslen) \
+ res_send(msg, msglen, answer, anslen);
+#define res_nclose(res) /* noop */
+#endif
+
+#if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) || HAVE_DEPRECATED_DNS_FUNCS) &&
HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
#define HAVE_DNS_FUNCS 1
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.93&r2=1.94&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.93 php-src/ext/standard/config.m4:1.94
--- php-src/ext/standard/config.m4:1.93 Tue Dec 2 16:25:06 2008
+++ php-src/ext/standard/config.m4 Sun Jan 11 23:47:52 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.93 2008/12/02 16:25:06 cseiler Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.94 2009/01/11 23:47:52 scottmac Exp $ -*- autoconf -*-
divert(3)dnl
@@ -251,7 +251,17 @@
dnl
PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
+PHP_CHECK_FUNC(res_search, resolv, bind, socket)
PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
+PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
+
+dnl
+dnl These are old deprecated functions, a single define of
HAVE_DEPRECATED_DNS_FUNCS
+dnl will be set in ext/standard/dns.h
+dnl
+
+PHP_CHECK_FUNC(res_mkquery, resolv, bind, socket)
+PHP_CHECK_FUNC(res_send, resolv, bind, socket)
dnl
dnl Check if atof() accepts NAN
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.670&r2=1.671&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.670 php-src/configure.in:1.671
--- php-src/configure.in:1.670 Wed Dec 31 14:33:41 2008
+++ php-src/configure.inSun Jan 11 23:47:52 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.670 2008/12/31 14:33:41 iliaa Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.671 2009/01/11 23:47:52 scottmac Exp $ -*- autoconf
-*-
dnl ## Process this
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c dns.c dns.h
iliaa Wed Dec 31 14:33:41 2008 UTC
Modified files:
/php-src/ext/standard dns.c dns.h basic_functions.c
/php-srcconfigure.in
Log:
MFB: Added gethostname() to return the current system host name.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.96&r2=1.97&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.96 php-src/ext/standard/dns.c:1.97
--- php-src/ext/standard/dns.c:1.96 Wed Dec 31 11:12:36 2008
+++ php-src/ext/standard/dns.c Wed Dec 31 14:33:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.96 2008/12/31 11:12:36 sebastian Exp $ */
+/* $Id: dns.c,v 1.97 2008/12/31 14:33:41 iliaa Exp $ */
/* {{{ includes */
#include "php.h"
@@ -107,6 +107,28 @@
static char *php_gethostbyaddr(char *ip);
static char *php_gethostbyname(char *name);
+#ifdef HAVE_GETHOSTNAME
+/* {{{ proto string gethostname()
+ Get the host name of the current machine */
+PHP_FUNCTION(gethostname)
+{
+ char buf[4096];
+
+ if (zend_parse_parameters_none() == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+
+ if (gethostname(buf, sizeof(buf) - 1)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to fetch
host [%d]: %s", errno, strerror(errno));
+ RETURN_FALSE;
+ }
+
+ RETURN_STRING(buf, 1);
+}
+/* }}} */
+#endif
+
+
/* {{{ proto string gethostbyaddr(string ip_address) U
Get the Internet host name corresponding to a given IP address */
PHP_FUNCTION(gethostbyaddr)
@@ -134,6 +156,7 @@
}
/* }}} */
+
/* {{{ php_gethostbyaddr */
static char *php_gethostbyaddr(char *ip)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.h?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/standard/dns.h
diff -u php-src/ext/standard/dns.h:1.23 php-src/ext/standard/dns.h:1.24
--- php-src/ext/standard/dns.h:1.23 Wed Dec 31 11:12:36 2008
+++ php-src/ext/standard/dns.h Wed Dec 31 14:33:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.h,v 1.23 2008/12/31 11:12:36 sebastian Exp $ */
+/* $Id: dns.h,v 1.24 2008/12/31 14:33:41 iliaa Exp $ */
#ifndef DNS_H
#define DNS_H
@@ -31,6 +31,10 @@
PHP_FUNCTION(gethostbyname);
PHP_FUNCTION(gethostbynamel);
+#ifdef HAVE_GETHOSTNAME
+PHP_FUNCTION(gethostname);
+#endif
+
#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
PHP_FUNCTION(dns_check_record);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.944&r2=1.945&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.944
php-src/ext/standard/basic_functions.c:1.945
--- php-src/ext/standard/basic_functions.c:1.944Wed Dec 31 11:12:36 2008
+++ php-src/ext/standard/basic_functions.c Wed Dec 31 14:33:41 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.944 2008/12/31 11:12:36 sebastian Exp $ */
+/* $Id: basic_functions.c,v 1.945 2008/12/31 14:33:41 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -980,6 +980,11 @@
ZEND_ARG_INFO(0, hostname)
ZEND_END_ARG_INFO()
+#ifdef HAVE_GETHOSTNAME
+ZEND_BEGIN_ARG_INFO(arginfo_gethostname, 0)
+ZEND_END_ARG_INFO()
+#endif
+
#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
ZEND_ARG_INFO(0, host)
@@ -3006,6 +3011,10 @@
PHP_FE(gethostbyname,
arginfo_gethostbyname)
PHP_FE(gethostbynamel,
arginfo_gethostbynamel)
+#ifdef HAVE_GETHOSTNAME
+ PHP_FE(gethostname,
arginfo_gethostname)
+#endif
+
#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) ||
defined(NETWARE))
PHP_FE(dns_check_record,
arginfo_dns_check_record)
PHP_FALIAS(checkdnsrr, dns_check_record,
arginfo_dns_check_record)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.669&r2=1.670&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.669 php-src/configure.in:1.670
--- php-src/configure.in:1.669 Fri Dec 12 23:55:48 2008
+++ php-src/configure.inWed Dec 31 14:33:41 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.669 2008/12/12 23:55:48 nlopess Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.670 2008/12/31 14:33:41 iliaa Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to
[PHP-CVS] cvs: php-src / configure.in /main spprintf.c
nlopess Fri Dec 12 23:55:49 2008 UTC
Modified files:
/php-srcconfigure.in
/php-src/main spprintf.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.668&r2=1.669&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.668 php-src/configure.in:1.669
--- php-src/configure.in:1.668 Thu Dec 4 00:41:17 2008
+++ php-src/configure.inFri Dec 12 23:55:48 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.668 2008/12/04 00:41:17 dsp Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.669 2008/12/12 23:55:48 nlopess Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -625,6 +625,7 @@
strdup \
strerror \
strftime \
+strnlen \
strptime \
strstr \
strtok_r \
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.53&r2=1.54&diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.53 php-src/main/spprintf.c:1.54
--- php-src/main/spprintf.c:1.53Thu Feb 7 18:40:29 2008
+++ php-src/main/spprintf.c Fri Dec 12 23:55:48 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.53 2008/02/07 18:40:29 helly Exp $ */
+/* $Id: spprintf.c,v 1.54 2008/12/12 23:55:48 nlopess Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -77,6 +77,7 @@
* for xinetd.
*/
+#define _GNU_SOURCE
#include "php.h"
#include
@@ -209,6 +210,14 @@
/* }}} */
+
+#if !HAVE_STRNLEN
+static size_t strnlen(const char *s, size_t maxlen) {
+ char *r = memchr(s, '\0', maxlen);
+ return r ? r-s : maxlen;
+}
+#endif
+
/*
* Do format conversion placing the output in buffer
*/
@@ -656,9 +665,11 @@
fmt_string:
s = va_arg(ap, char *);
if (s != NULL) {
- s_len = strlen(s);
- if (adjust_precision &&
precision < s_len)
- s_len = precision;
+ if (!adjust_precision) {
+ s_len = strlen(s);
+ } else {
+ s_len = strnlen(s,
precision);
+ }
} else {
s = S_NULL;
s_len = S_NULL_LEN;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
None at the moment, but this is mainly for Windows. Most of the other platforms have these functions already. Derick mentioend XDebug is already implementing this within its own extension code and perhaps there are more that want to use sprintf but don't know the size of the output to allocate. Scott On 27 Nov 2008, at 21:10, Ilia Alshanetsky wrote: Do we have other extensions using libmagic other then fileinfo? Otherwise, could we not solve it with define flags for fileinfo extension? On 27-Nov-08, at 3:40 PM, Scott MacVicar wrote: On 27 Nov 2008, at 20:33, Ilia Alshanetsky wrote: Is there a reason you do not want to use PHP wrappers & allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-srcconfigure.in /php-src/ext/fileinfo/libmagic print.c /php-src/main snprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky If you didn't realise you were using a PHP version and used a free() as you'd expect to work then you'd get the memory manager complaining later on. Scott Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
Do we have other extensions using libmagic other then fileinfo? Otherwise, could we not solve it with define flags for fileinfo extension? On 27-Nov-08, at 3:40 PM, Scott MacVicar wrote: On 27 Nov 2008, at 20:33, Ilia Alshanetsky wrote: Is there a reason you do not want to use PHP wrappers & allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-src configure.in /php-src/ext/fileinfo/libmagic print.c /php-src/main snprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky If you didn't realise you were using a PHP version and used a free() as you'd expect to work then you'd get the memory manager complaining later on. Scott Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
On 27 Nov 2008, at 20:33, Ilia Alshanetsky wrote: Is there a reason you do not want to use PHP wrappers & allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-src configure.in /php-src/ext/fileinfo/libmagicprint.c /php-src/main snprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky If you didn't realise you were using a PHP version and used a free() as you'd expect to work then you'd get the memory manager complaining later on. Scott -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
Is there a reason you do not want to use PHP wrappers & allocation protection? On 27-Nov-08, at 2:45 PM, Scott MacVicar wrote: scottmacThu Nov 27 19:45:16 2008 UTC Modified files: /php-src configure.in /php-src/ext/fileinfo/libmagic print.c /php-src/mainsnprintf.c snprintf.h Log: Add asprintf, use regular system malloc and free and add checks in configure.in for the functions Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/fileinfo/libmagic print.c /main snprintf.c snprintf.h
scottmacThu Nov 27 19:45:16 2008 UTC
Modified files:
/php-srcconfigure.in
/php-src/ext/fileinfo/libmagic print.c
/php-src/main snprintf.c snprintf.h
Log:
Add asprintf, use regular system malloc and free and add checks in
configure.in for the functions
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.666&r2=1.667&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.666 php-src/configure.in:1.667
--- php-src/configure.in:1.666 Mon Nov 17 15:12:33 2008
+++ php-src/configure.inThu Nov 27 19:45:16 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.666 2008/11/17 15:12:33 dsp Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.667 2008/11/27 19:45:16 scottmac Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -637,6 +637,8 @@
nanosleep \
utime \
vsnprintf \
+vasprintf \
+asprintf \
)
dnl Check for getaddrinfo, should be a better way, but...
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/print.c?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/fileinfo/libmagic/print.c
diff -u php-src/ext/fileinfo/libmagic/print.c:1.5
php-src/ext/fileinfo/libmagic/print.c:1.6
--- php-src/ext/fileinfo/libmagic/print.c:1.5 Sat Nov 22 10:27:19 2008
+++ php-src/ext/fileinfo/libmagic/print.c Thu Nov 27 19:45:16 2008
@@ -62,7 +62,7 @@
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Warning: %s",
expanded_format);
- efree(expanded_format);
+ free(expanded_format);
}
protected const char *
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.65&r2=1.66&diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.65 php-src/main/snprintf.c:1.66
--- php-src/main/snprintf.c:1.65Fri Nov 21 21:49:52 2008
+++ php-src/main/snprintf.c Thu Nov 27 19:45:16 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.65 2008/11/21 21:49:52 scottmac Exp $ */
+/* $Id: snprintf.c,v 1.66 2008/11/27 19:45:16 scottmac Exp $ */
#include "php.h"
@@ -1327,9 +1327,9 @@
*buf = NULL;
if (cc >= 0) {
- if ((*buf = emalloc(++cc)) != NULL) {
+ if ((*buf = malloc(++cc)) != NULL) {
if ((cc = ap_php_vsnprintf(*buf, cc, format, ap)) < 0) {
- efree(*buf);
+ free(*buf);
*buf = NULL;
}
}
@@ -1339,6 +1339,18 @@
}
/* }}} */
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...) /* {{{ */
+{
+ int cc;
+ va_list ap;
+
+ va_start(ap, format);
+ cc = vasprintf(buf, format, ap);
+ va_end(ap);
+ return cc;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.h?r1=1.43&r2=1.44&diff_format=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.43 php-src/main/snprintf.h:1.44
--- php-src/main/snprintf.h:1.43Fri Nov 21 21:49:52 2008
+++ php-src/main/snprintf.h Thu Nov 27 19:45:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: snprintf.h,v 1.43 2008/11/21 21:49:52 scottmac Exp $ */
+/* $Id: snprintf.h,v 1.44 2008/11/27 19:45:16 scottmac Exp $ */
/*
@@ -83,6 +83,7 @@
PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap);
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...);
PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char
exponent, char *buf);
PHPAPI char * php_conv_fp(register char format, register double num,
@@ -110,10 +111,13 @@
#endif
#define vsnprintf ap_php_vsnprintf
-#ifdef vasprintf
-#undef vasprintf
-#endif
+#ifndef HAVE_VASPRINTF
#define vasprintf ap_php_vasprintf
+#endif
+
+#ifndef HAVE_ASPRINTF
+#define asprintf ap_php_asprintf
+#endif
#ifdef sprintf
#undef sprintf
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
dsp Mon Nov 17 15:12:33 2008 UTC Modified files: /php-srcconfigure.in Log: Feature request #46595. Use cc as default compiler and fallback to gcc. [DOC] http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.665&r2=1.666&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.665 php-src/configure.in:1.666 --- php-src/configure.in:1.665 Thu Nov 6 20:38:02 2008 +++ php-src/configure.inMon Nov 17 15:12:33 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.665 2008/11/06 20:38:02 dsp Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.666 2008/11/17 15:12:33 dsp Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -140,7 +140,7 @@ dnl Checks for programs. dnl - -AC_PROG_CC +AC_PROG_CC([cc gcc]) PHP_DETECT_ICC PHP_DETECT_SUNCC AC_PROG_CC_C_O -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 30 23:31:41 2008 UTC Modified files: /php-srcconfigure.in Log: CS http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.663&r2=1.664&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.663 php-src/configure.in:1.664 --- php-src/configure.in:1.663 Sun Jul 27 15:05:22 2008 +++ php-src/configure.inWed Jul 30 23:31:41 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.663 2008/07/27 15:05:22 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.664 2008/07/30 23:31:41 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1235,13 +1235,13 @@ fi if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes; then -ZEND_EXT_TYPE="zend_extension_debug_ts" + ZEND_EXT_TYPE="zend_extension_debug_ts" elif test "$PHP_DEBUG" = "yes"; then -ZEND_EXT_TYPE="zend_extension_debug" + ZEND_EXT_TYPE="zend_extension_debug" elif test "$PHP_THREAD_SAFETY" = "yes; then -ZEND_EXT_TYPE="zend_extension_ts" + ZEND_EXT_TYPE="zend_extension_ts" else -ZEND_EXT_TYPE="zend_extension" + ZEND_EXT_TYPE="zend_extension" fi PHP_SUBST(ZEND_EXT_TYPE) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiSun Jul 27 15:05:22 2008 UTC Modified files: /php-srcconfigure.in Log: - Fixed the fix for not requiring C++ always http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.662&r2=1.663&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.662 php-src/configure.in:1.663 --- php-src/configure.in:1.662 Fri Jul 25 12:34:54 2008 +++ php-src/configure.inSun Jul 27 15:05:22 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.662 2008/07/25 12:34:54 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.663 2008/07/27 15:05:22 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1260,7 +1260,7 @@ undefine([AC_PROG_CXX]) AC_DEFUN([AC_PROG_CXX], []) undefine([AC_PROG_CXXCPP]) - AC_DEFUN([AC_PROG_CXXCPP], []) + AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled]) ]) AC_PROG_LIBTOOL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /scripts phpize.m4
janiFri Jul 25 12:34:55 2008 UTC Modified files: /php-srcconfigure.in /php-src/scriptsphpize.m4 Log: - Fixed a minor problem in not enabling c++/g++ when not needed. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.661&r2=1.662&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.661 php-src/configure.in:1.662 --- php-src/configure.in:1.661 Mon Jul 21 10:16:32 2008 +++ php-src/configure.inFri Jul 25 12:34:54 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.661 2008/07/21 10:16:32 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.662 2008/07/25 12:34:54 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1254,10 +1254,14 @@ LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL if test "$enable_debug" != "yes"; then http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.26&r2=1.27&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.26 php-src/scripts/phpize.m4:1.27 --- php-src/scripts/phpize.m4:1.26 Tue Aug 14 08:43:13 2007 +++ php-src/scripts/phpize.m4 Fri Jul 25 12:34:55 2008 @@ -70,10 +70,14 @@ enable_static=no enable_shared=yes -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL all_targets='$(PHP_MODULES)' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c
janiMon Jul 21 10:16:32 2008 UTC
Modified files:
/php-srcconfigure.in
/php-src/ext/standard basic_functions.c
Log:
MFB:- Fixed bug #40079 (php_get_current_user() not thread safe).
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.660&r2=1.661&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.660 php-src/configure.in:1.661
--- php-src/configure.in:1.660 Wed Jul 16 16:29:13 2008
+++ php-src/configure.inMon Jul 21 10:16:32 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.660 2008/07/16 16:29:13 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.661 2008/07/21 10:16:32 jani Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -71,10 +71,10 @@
echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new
cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1
if test $? -ne 0 ; then
-rm -f $srcdir/main/php_version.h && mv php_version.h.new
$srcdir/main/php_version.h && \
-echo 'Updated main/php_version.h'
+ rm -f $srcdir/main/php_version.h && mv php_version.h.new
$srcdir/main/php_version.h && \
+ echo 'Updated main/php_version.h'
else
-rm -f php_version.h.new
+ rm -f php_version.h.new
fi
@@ -161,7 +161,6 @@
PHP_RUNPATH_SWITCH
dnl Checks for some support/generator progs
-
PHP_PROG_AWK
PHP_PROG_BISON
PHP_PROG_RE2C
@@ -183,16 +182,16 @@
else
AC_MSG_CHECKING([whether re2c -g works])
AC_TRY_COMPILE([],[
- int main(int argc, const char **argv)
- {
- argc = argc;
- argv = argv;
+int main(int argc, const char **argv)
+{
+ argc = argc;
+ argv = argv;
label1:
label2:
- static void *adr[] = { &&label1, &&label2};
- goto *adr[0];
- return 0;
- }
+ static void *adr[] = { &&label1, &&label2};
+ goto *adr[0];
+ return 0;
+}
],[
RE2C_FLAGS=""
AC_MSG_RESULT([no])
@@ -208,7 +207,7 @@
dnl See bug #28605
case $host_cpu in
-alpha*)
+ alpha*)
if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -mieee"
else
@@ -233,15 +232,16 @@
fi
case $host_alias in
-*solaris*)
+ *solaris*)
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
enable_libgcc=yes
fi
;;
-*dgux*)
-CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";;
-*darwin*|*rhapsody*)
+ *dgux*)
+CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
+;;
+ *darwin*|*rhapsody*)
if test -n "$GCC"; then
PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes)
if test "$gcc_no_cpp_precomp" = "yes"; then
@@ -249,18 +249,21 @@
fi
fi
AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther])
-php_multiple_shlib_versions_ok=yes;;
-*beos*)
+php_multiple_shlib_versions_ok=yes
+;;
+ *beos*)
beos_threads=1
-LIBS="$LIBS -lbe -lroot";;
-*mips*)
-CPPFLAGS="$CPPFLAGS -D_XPG_IV";;
-*hpux*)
+LIBS="$LIBS -lbe -lroot"
+;;
+ *mips*)
+CPPFLAGS="$CPPFLAGS -D_XPG_IV"
+;;
+ *hpux*)
if test "$GCC" = "yes"; then
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
fi
;;
-*netware*)
+ *netware*)
PHP_BUILD_PROGRAM
PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
@@ -275,7 +278,7 @@
# to avoid the performance hit from the lost register
AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
case $host_alias in
-i?86-*-linux*|i?86-*-freebsd*)
+ i?86-*-linux*|i?86-*-freebsd*)
if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
with_pic=no
AC_MSG_RESULT(yes)
@@ -283,7 +286,9 @@
AC_MSG_RESULT(no)
fi
;;
-*) AC_MSG_RESULT(no) ;;
+ *)
+AC_MSG_RESULT(no)
+;;
esac
@@ -361,8 +366,8 @@
dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
dnl and source packages. This should be harmless on other OSs.
if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
- LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+ CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+ LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
fi
test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)
@@ -482,12 +487,10 @@
dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from
there on
dnl See
http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html
case $host_alias in
-*darwin[[89]]*)
+ *darwin[[89]]*)
;;
-*)
-AC_CHECK_HEADERS([ \
-mach-o/dyld.h
-],[],[][])
+ *)
+AC_CHECK_HEADERS([mach-o/dyld.h],[],[],[])
;;
esac
@@ -572,6 +575,7 @@
gmtime_r \
getpwnam_r \
getgrnam_r \
+getpwuid_r \
grantpt \
inet_ntoa \
inet_ntop \
@@ -938,20 +942,24 @@
enable_static=yes
case $
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 16 16:29:13 2008 UTC Modified files: /php-srcconfigure.in Log: -nuke weird char http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.659&r2=1.660&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.659 php-src/configure.in:1.660 --- php-src/configure.in:1.659 Wed Jul 16 16:22:32 2008 +++ php-src/configure.inWed Jul 16 16:29:13 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.659 2008/07/16 16:22:32 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.660 2008/07/16 16:29:13 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -169,7 +169,7 @@ dnl Check if bison generated files exist when bison does not.. case $php_cv_bison_version in ""|invalid[)] -if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) fi ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 16 16:22:32 2008 UTC Modified files: /php-srcconfigure.in Log: - Prevent errors in CVS builds when bison is not there (for Sean :) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.658&r2=1.659&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.658 php-src/configure.in:1.659 --- php-src/configure.in:1.658 Tue Jul 8 07:05:03 2008 +++ php-src/configure.inWed Jul 16 16:22:32 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.658 2008/07/08 07:05:03 dmitry Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.659 2008/07/16 16:22:32 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -166,6 +166,15 @@ PHP_PROG_BISON PHP_PROG_RE2C +dnl Check if bison generated files exist when bison does not.. +case $php_cv_bison_version in + ""|invalid[)] +if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" ||Â ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then + AC_MSG_ERROR([bison is required to build PHP/Zend when building a CVS checkout!]) +fi +;; +esac + PHP_ARG_ENABLE(re2c-cgoto, whether to enable computed goto gcc extension with re2c, [ --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension], no, no) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
helly Mon Jun 2 16:29:25 2008 UTC Modified files: /php-srcconfigure.in Log: - Fix style http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.656&r2=1.657&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.656 php-src/configure.in:1.657 --- php-src/configure.in:1.656 Sat May 31 20:04:48 2008 +++ php-src/configure.inMon Jun 2 16:29:25 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.656 2008/05/31 20:04:48 helly Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.657 2008/06/02 16:29:25 helly Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1275,15 +1275,15 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then - PHARCMD=pharcmd - PHARCMD_INSTALL=install-pharcmd + pharcmd=pharcmd + pharcmd_install=install-pharcmd else - PHARCMD= - PHARCMD_INSTALL= + pharcmd= + pharcmd_install= fi; -all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $PHARCMD" -install_targets="$install_modules install-build install-headers install-programs $PHARCMD_INSTALL" +all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" +install_targets="$install_modules install-build install-headers install-programs $pharcmd_install" case $PHP_SAPI in cli) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
helly Sat May 31 19:27:23 2008 UTC Modified files: /php-srcconfigure.in Log: - Add pharcmd to default targets if present http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.654&r2=1.655&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.654 php-src/configure.in:1.655 --- php-src/configure.in:1.654 Fri May 23 19:10:01 2008 +++ php-src/configure.inSat May 31 19:27:23 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.654 2008/05/23 19:10:01 tony2001 Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.655 2008/05/31 19:27:23 helly Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1274,7 +1274,13 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag" -all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)" +if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then + PHARCMD=pharcmd +else + PHARCMD= +fi; + +all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $PHARCMD" install_targets="$install_modules install-build install-headers install-programs" case $PHP_SAPI in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Fri May 23 19:10:01 2008 UTC Modified files: /php-srcconfigure.in Log: improve regexp to support b0rked SED versions (i.e. Solaris) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.653&r2=1.654&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.653 php-src/configure.in:1.654 --- php-src/configure.in:1.653 Tue Apr 15 16:31:15 2008 +++ php-src/configure.inFri May 23 19:10:01 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.653 2008/04/15 16:31:15 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.654 2008/05/23 19:10:01 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -215,7 +215,7 @@ GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` ;; *) -GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` +GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'` ;; esac if test $GCC_MAJOR_VERSION -ge 4; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Tue Apr 15 16:31:15 2008 UTC Modified files: /php-srcconfigure.in Log: force use of BSD sed for OS X hack (patch by Alexey Zakhlestin) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.652&r2=1.653&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.652 php-src/configure.in:1.653 --- php-src/configure.in:1.652 Tue Apr 1 02:41:16 2008 +++ php-src/configure.inTue Apr 15 16:31:15 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.652 2008/04/01 02:41:16 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.653 2008/04/15 16:31:15 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -212,7 +212,7 @@ if test "$GCC" = "yes"; then case $host_alias in *darwin*) -GCC_MAJOR_VERSION=`$CC -dumpversion | $SED -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` +GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` ;; *) GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Tue Apr 1 02:41:16 2008 UTC Modified files: /php-srcconfigure.in Log: Fix the fix. Sorry for the commit noise. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.651&r2=1.652&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.651 php-src/configure.in:1.652 --- php-src/configure.in:1.651 Tue Apr 1 02:39:17 2008 +++ php-src/configure.inTue Apr 1 02:41:16 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.651 2008/04/01 02:39:17 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.652 2008/04/01 02:41:16 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1260,9 +1260,9 @@ dnl Finish the Darwin hack if test "$php_did_darwin9_cheat" -eq 1; then if test "$PHP_DEBUG" = "yes"; then -CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs/-g/g'` +CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'` else -CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs//g'` +CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs//g'` fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Tue Apr 1 02:39:18 2008 UTC Modified files: /php-srcconfigure.in Log: MFB: fix the darwin 9 hack again; add the -O2 back in to avoid performance loss when not compiling for debug http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.650&r2=1.651&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.650 php-src/configure.in:1.651 --- php-src/configure.in:1.650 Wed Mar 26 14:46:16 2008 +++ php-src/configure.inTue Apr 1 02:39:17 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.650 2008/03/26 14:46:16 scottmac Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.651 2008/04/01 02:39:17 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1260,7 +1260,7 @@ dnl Finish the Darwin hack if test "$php_did_darwin9_cheat" -eq 1; then if test "$PHP_DEBUG" = "yes"; then -CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'` +CFLAGS=`echo "-O2 $CFLAGS" | $SED -e 's/-gstabs/-g/g'` else CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs//g'` fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Mon Mar 10 15:17:47 2008 UTC Modified files: /php-srcconfigure.in Log: Improve the Darwin 9 hack considerably and switch to using dl*() instead of NS*() on Darwin 8+. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.648&r2=1.649&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.648 php-src/configure.in:1.649 --- php-src/configure.in:1.648 Sun Mar 9 14:27:15 2008 +++ php-src/configure.inMon Mar 10 15:17:47 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.648 2008/03/09 14:27:15 gwynne Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.649 2008/03/10 15:17:47 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -129,8 +129,8 @@ php_did_darwin9_cheat=0 case $host_alias in *darwin9*) - echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)' 2>/dev/null >/dev/null - if test "$?" -ne 0; then + hasg=`echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)'` + if test x"$hasg" = "x"; then php_did_darwin9_cheat=1 CFLAGS="$CFLAGS -gstabs" fi @@ -391,7 +391,6 @@ limits.h \ locale.h \ monetary.h \ -mach-o/dyld.h \ netdb.h \ pwd.h \ resolv.h \ @@ -443,6 +442,18 @@ #endif ]) +dnl Don't use mach-o/dyld.h on Darwin 8+, dl* is recommended by Apple from there on +dnl See http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachOTopics/Articles/loading_code.html +case $host_alias in +*darwin[[89]]*) +;; +*) +AC_CHECK_HEADERS([ \ +mach-o/dyld.h +],[],[][]) +;; +esac + PHP_FOPENCOOKIE PHP_BROKEN_GETCWD PHP_BROKEN_GLIBC_FOPEN_APPEND @@ -737,10 +748,6 @@ CXXFLAGS="$CXXFLAGS -O0" fi else - dnl Finish the Darwin hack - if test "$php_did_darwin9_cheat" -eq 1; then -CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs//g'` - fi PHP_DEBUG=0 ZEND_DEBUG=no fi @@ -1222,6 +1229,15 @@ CC=$old_CC +dnl Finish the Darwin hack +if test "$php_did_darwin9_cheat" -eq 1; then + if test "$PHP_DEBUG" = "yes"; then +CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs/-g/g'` + else +CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs//g'` + fi +fi + PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
gwynne Sun Mar 9 14:27:16 2008 UTC Modified files: /php-srcconfigure.in Log: Fix Darwin 9/Mac OS X 10.5 build problems, or at least patch them http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.647&r2=1.648&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.647 php-src/configure.in:1.648 --- php-src/configure.in:1.647 Sun Feb 17 20:49:46 2008 +++ php-src/configure.inSun Mar 9 14:27:15 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.647 2008/02/17 20:49:46 helly Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.648 2008/03/09 14:27:15 gwynne Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -122,6 +122,21 @@ $php_shtool mkdir -p libs rm -f libs/* +dnl Darwin 9 hack +dnl Because the default debugging format used by Apple's GCC on Mac OS 10.5 +dnl causes errors in all current and past versions of Autoconf, we do a little +dnl messing with the CFLAGS here to trick it. +php_did_darwin9_cheat=0 +case $host_alias in +*darwin9*) + echo $CFLAGS | grep -E '(^-g)|([[:space:]]-g)' 2>/dev/null >/dev/null + if test "$?" -ne 0; then +php_did_darwin9_cheat=1 +CFLAGS="$CFLAGS -gstabs" + fi + ;; +esac + dnl Checks for programs. dnl - @@ -167,7 +182,14 @@ dnl activate some gcc specific optimizations for gcc >= 4 if test "$GCC" = "yes"; then - GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` + case $host_alias in + *darwin*) +GCC_MAJOR_VERSION=`$CC -dumpversion | $SED -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'` +;; + *) +GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` +;; + esac if test $GCC_MAJOR_VERSION -ge 4; then CFLAGS="$CFLAGS -fvisibility=hidden" fi @@ -715,6 +737,10 @@ CXXFLAGS="$CXXFLAGS -O0" fi else + dnl Finish the Darwin hack + if test "$php_did_darwin9_cheat" -eq 1; then +CFLAGS=`echo "$CFLAGS" | $SED -e 's/-gstabs//g'` + fi PHP_DEBUG=0 ZEND_DEBUG=no fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/bz2 php_bz2.h /ext/dom xml_common.h /ext/gd php_gd.h /ext/hash php_hash.h /ext/iconv php_iconv.h /ext/libxml php_libxml.h /ext/mbstring mbstring.h /e
dmitry Wed Jan 30 09:56:22 2008 UTC
Modified files:
/php-srcconfigure.in
/TSRM TSRM.h tsrm_virtual_cwd.h
/ZendEngine2acconfig.h
/php-src/ext/bz2php_bz2.h
/php-src/ext/domxml_common.h
/php-src/ext/gd php_gd.h
/php-src/ext/hash php_hash.h
/php-src/ext/iconv php_iconv.h
/php-src/ext/libxml php_libxml.h
/php-src/ext/mbstring mbstring.h
/php-src/ext/mysqli php_mysqli_structs.h
/php-src/ext/pdophp_pdo.h
/php-src/ext/pgsql php_pgsql.h
/php-src/ext/skeleton php_skeleton.h
/php-src/ext/splphp_spl.h
/php-src/ext/unicodephp_unicode.h
/php-src/ext/zip/libzip.h
/php-src/main SAPI.h php.h
/php-src/sapi/apache2filter php_apache.h
/php-src/sapi/apache2handlerphp_apache.h
/php-src/sapi/apache_hooks mod_php5.h
/php-src/sapi/pi3webpi3web_sapi.h
Log:
Imporoved PHP binary size and startup speed with GCC4 visibility control
(Nuno)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.643&r2=1.644&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.643 php-src/configure.in:1.644
--- php-src/configure.in:1.643 Tue Jan 22 09:29:29 2008
+++ php-src/configure.inWed Jan 30 09:56:21 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.643 2008/01/22 09:29:29 dmitry Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.644 2008/01/30 09:56:21 dmitry Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -165,6 +165,14 @@
;;
esac
+dnl activate some gcc specific optimizations for gcc >= 4
+if test "$GCC" = "yes"; then
+ GCC_MAJOR_VERSION=`$CC --version | $SED -n
'1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'`
+ if test $GCC_MAJOR_VERSION -ge 4; then
+CFLAGS="$CFLAGS -fvisibility=hidden"
+ fi
+fi
+
case $host_alias in
*solaris*)
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
http://cvs.php.net/viewvc.cgi/TSRM/TSRM.h?r1=1.57&r2=1.58&diff_format=u
Index: TSRM/TSRM.h
diff -u TSRM/TSRM.h:1.57 TSRM/TSRM.h:1.58
--- TSRM/TSRM.h:1.57Mon Dec 31 07:12:06 2007
+++ TSRM/TSRM.h Wed Jan 30 09:56:21 2008
@@ -22,10 +22,12 @@
#ifdef TSRM_WIN32
# ifdef TSRM_EXPORTS
-# define TSRM_API __declspec(dllexport)
+# define TSRM_API __declspec(dllexport)
# else
-# define TSRM_API __declspec(dllimport)
+# define TSRM_API __declspec(dllimport)
# endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define TSRM_API __attribute__ ((visibility("default")))
#else
# define TSRM_API
#endif
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.64&r2=1.65&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.64 TSRM/tsrm_virtual_cwd.h:1.65
--- TSRM/tsrm_virtual_cwd.h:1.64Mon Dec 31 07:12:06 2007
+++ TSRM/tsrm_virtual_cwd.h Wed Jan 30 09:56:21 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.64 2007/12/31 07:12:06 sebastian Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.65 2008/01/30 09:56:21 dmitry Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -134,13 +134,15 @@
#endif
#ifdef TSRM_WIN32
-# ifdef CWD_EXPORTS
-# define CWD_API __declspec(dllexport)
-# else
-# define CWD_API __declspec(dllimport)
-# endif
+# ifdef CWD_EXPORTS
+# define CWD_API __declspec(dllexport)
+# else
+# define CWD_API __declspec(dllimport)
+# endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define CWD_API __attribute__ ((visibility("default")))
#else
-#define CWD_API
+# define CWD_API
#endif
#ifdef TSRM_WIN32
http://cvs.php.net/viewvc.cgi/ZendEngine2/acconfig.h?r1=1.43&r2=1.44&diff_format=u
Index: ZendEngine2/acconfig.h
diff -u ZendEngine2/acconfig.h:1.43 ZendEngine2/acconfig.h:1.44
--- ZendEngine2/acconfig.h:1.43 Mon Dec 31 07:12:06 2007
+++ ZendEngine2/acconfig.h Wed Jan 30 09:56:21 2008
@@ -17,10 +17,16 @@
+--+
*/
-/* $Id: acconfig.h,v 1.43 2007/12/31 07:12:06 sebastian Exp $ */
+/* $Id: acconfig.h,v 1.44 2008/01/30 09:56:21 dmitry Exp $ */
+
+#if defined(__GNUC__) && __GNUC__ >= 4
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
-#define ZEND_API
-#define ZEND_DLEXPORT
#define ZEND_DLIMPORT
@TOP@
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/bz2/php_bz2.h
diff -u php-src/ext/bz2/php_bz2.h:1.13 php-src/ext/bz2/php_bz2.h:1.14
--- php-src/ext/bz2/php_bz2.h:1.13 Mon Dec 31 07:12:07 2007
+++ php-src/ext/bz2/php_bz2.h Wed Jan 30 09:56:21 2008
@@ -16,7 +16,7 @@
+-
[PHP-CVS] cvs: php-src / configure.in
nlopess Fri Oct 5 14:49:40 2007 UTC Modified files: /php-srcconfigure.in Log: MFB: allow lcov 1.6 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.641&r2=1.642&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.641 php-src/configure.in:1.642 --- php-src/configure.in:1.641 Mon Oct 1 12:32:39 2007 +++ php-src/configure.inFri Oct 5 14:49:40 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.641 2007/10/01 12:32:39 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.642 2007/10/05 14:49:40 nlopess Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -643,7 +643,7 @@ AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) fi - ltp_version_list="1.5" + ltp_version_list="1.5 1.6" AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c config.m4 /main getopt.c php_getopt.h /sapi/cgi cgi_main.c config.w32 config9.m4 getopt.c php_getopt.h /sapi/cli config.w32 ge
janiMon Oct 1 12:32:39 2007 UTC Added files: /php-src/main getopt.c php_getopt.h Removed files: /php-src/sapi/cgi getopt.c php_getopt.h /php-src/sapi/cli getopt.c php_getopt.h Modified files: /php-srcconfigure.in /php-src/ext/standard basic_functions.c config.m4 /php-src/sapi/cgi cgi_main.c config.w32 config9.m4 /php-src/sapi/cli config.w32 php_cli.c /php-src/win32/buildconfig.w32 Log: - Added common getopt implementation to core. - Added long-option feature to getopt(). - Made getopt() available on win32 systems. Patch by: David Soria Parra <[EMAIL PROTECTED]> [DOC]: These changes will be available from 5.3+ http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.640&r2=1.641&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.640 php-src/configure.in:1.641 --- php-src/configure.in:1.640 Mon Aug 20 14:28:29 2007 +++ php-src/configure.inMon Oct 1 12:32:39 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.640 2007/08/20 14:28:29 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.641 2007/10/01 12:32:39 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1054,7 +1054,7 @@ if test "$PHP_CLI" != "no"; then PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" PHP_INSTALL_CLI_TARGET="install-cli" - PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c getopt.c,, cli) + PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli) PHP_INSTALLED_SAPIS="cli $PHP_SAPI" else PHP_INSTALLED_SAPIS="$PHP_SAPI" @@ -1208,7 +1208,7 @@ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ network.c php_open_temporary_file.c php_logos.c \ - output.c ) + output.c getopt.c) PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \ plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.876&r2=1.877&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.876 php-src/ext/standard/basic_functions.c:1.877 --- php-src/ext/standard/basic_functions.c:1.876Fri Sep 28 13:06:22 2007 +++ php-src/ext/standard/basic_functions.c Mon Oct 1 12:32:39 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.876 2007/09/28 13:06:22 jani Exp $ */ +/* $Id: basic_functions.c,v 1.877 2007/10/01 12:32:39 jani Exp $ */ #include "php.h" #include "php_streams.h" @@ -28,6 +28,7 @@ #include "php_math.h" #include "php_http.h" #include "php_incomplete_class.h" +#include "php_getopt.h" #include "ext/standard/info.h" #include "ext/session/php_session.h" #include "zend_operators.h" @@ -83,10 +84,6 @@ # include #endif -#ifdef HARTMUT_0 -#include -#endif - #ifdef PHP_WIN32 # include "win32/unistd.h" #endif @@ -100,7 +97,6 @@ #include "SAPI.h" #include "php_ticks.h" - #ifdef ZTS PHPAPI int basic_globals_id; #else @@ -725,13 +721,11 @@ ZEND_END_ARG_INFO() #endif -#ifdef HAVE_GETOPT static ZEND_BEGIN_ARG_INFO_EX(arginfo_getopt, 0, 0, 1) ZEND_ARG_INFO(0, options) ZEND_ARG_INFO(0, opts) /* ARRAY_INFO(0, opts, 1) */ ZEND_END_ARG_INFO() -#endif static ZEND_BEGIN_ARG_INFO(arginfo_flush, 0) @@ -3128,7 +3122,7 @@ PHP_FE(iptcembed, arginfo_iptcembed) PHP_FE(getimagesize, arginfo_getimagesize) PHP_FE(image_type_to_mime_type, arginfo_image_type_to_mime_type) - PHP_FE(image_type_to_extension, arginfo_image_type_to_extension) + PHP_FE(image_type_to_extension, arginfo_image_type_to_extension) PHP_FE(phpinfo, arginfo_phpinfo) PHP_FE(phpversion, arginfo_phpversion) @@ -3178,7 +3172,7 @@ #endif #ifdef HAVE_STRFMON - PHP_FE(money_format, arginfo_money_format) + PHP_FE(money_format, arginfo_money_format) #endif PHP_FE(substr,
[PHP-CVS] cvs: php-src / configure.in /scripts phpize.m4
janiMon Aug 6 14:33:06 2007 UTC Modified files: /php-srcconfigure.in /php-src/scriptsphpize.m4 Log: - Fixed bug #42195 (C++ compiler required always) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.638&r2=1.639&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.638 php-src/configure.in:1.639 --- php-src/configure.in:1.638 Thu Jul 26 22:45:22 2007 +++ php-src/configure.inMon Aug 6 14:33:06 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.638 2007/07/26 22:45:22 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.639 2007/08/06 14:33:06 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1156,7 +1156,13 @@ PHP_CONFIGURE_PART(Configuring libtool) LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" + +dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) +dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) +AC_DEFUN([AC_PROG_CXX], [])]) AC_PROG_LIBTOOL + if test "$enable_debug" != "yes"; then PHP_SET_LIBTOOL_VARIABLE([--silent]) fi http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.24&r2=1.25&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.24 php-src/scripts/phpize.m4:1.25 --- php-src/scripts/phpize.m4:1.24 Wed Jul 25 09:40:58 2007 +++ php-src/scripts/phpize.m4 Mon Aug 6 14:33:06 2007 @@ -68,6 +68,10 @@ enable_static=no enable_shared=yes +dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) +dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) +AC_DEFUN([AC_PROG_CXX], [])]) AC_PROG_LIBTOOL all_targets='$(PHP_MODULES)' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/ereg config.w32 config0.m4 ereg.c php_ereg.h php_regex.h /ext/pgsql pgsql.c /ext/standard basic_functions.c browscap.c config.m4 config.w32 html.c php_sta
janiSun Jul 15 19:50:07 2007 UTC
Added files:
/php-src/ext/ereg config.w32 config0.m4
Removed files:
/php-src/ext/standard reg.c reg.h
/php-src/ext/standard/tests/reg .cvsignore 001.phpt 002.phpt
003.phpt 004.phpt 005.phpt 006.phpt
007.phpt 008.phpt 009.phpt 010.phpt
011.phpt 012.phpt 013.phpt 014.phpt
015.phpt 016.phpt
/php-src/main php_regex.h
/php-src/regex .cvsignore COPYRIGHT README WHATSNEW cclass.h
cname.h debug.c debug.ih engine.c engine.ih main.c
main.ih mkh regcomp.c regcomp.ih regerror.c
regerror.ih regex.3 regex.7 regex.dsp regex.dsw
regex.h regex.mak regex2.h regex_extra.h regexec.c
regfree.c split.c tests utils.h
Modified files:
/php-srcconfigure.in
/php-src/ext/ereg ereg.c php_ereg.h php_regex.h
/php-src/ext/pgsql pgsql.c
/php-src/ext/standard basic_functions.c browscap.c config.m4
config.w32 html.c php_standard.h string.c
/php-src/main internal_functions_nw.c internal_functions_win32.c
php.h
/php-src/sapi/apachephp_apache_http.h
/php-src/sapi/apache_hooks php_apache_http.h
/php-src/win32/buildconfig.w32
Log:
- Moved the old regex functions to it's own extension: ereg
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.636&r2=1.637&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.636 php-src/configure.in:1.637
--- php-src/configure.in:1.636 Thu Jul 12 14:18:01 2007
+++ php-src/configure.inSun Jul 15 19:50:06 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.636 2007/07/12 14:18:01 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.637 2007/07/15 19:50:06 jani Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -11,9 +11,9 @@
dnl ## libraries and so on.
dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies. This
-dnl ## includes what regex library is used and whether debugging or short
-dnl ## tags are enabled, and the default behaviour of php.ini options.
+dnl ## core and how to deal with different system dependencies.
+dnl ## This includes whether debugging or short tags are enabled
+dnl ## and the default behaviour of php.ini options.
dnl ## This is also where an SAPI interface is selected (choosing between
dnl ## Apache module, CGI etc.)
@@ -260,10 +260,9 @@
divert(3)
dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies. This
-dnl ## includes what regex library is used and whether debugging or short
-dnl ## tags are enabled, and the default behaviour of php.ini options.
-
+dnl ## core and how to deal with different system dependencies.
+dnl ## This includes whether debugging or short tags are enabled
+dnl ## and the default behaviour of php.ini options.
dnl Starting system checks.
dnl -
@@ -507,7 +506,6 @@
realpath \
random \
rand_r \
-regcomp \
res_search \
scandir \
setitimer \
@@ -1189,7 +1187,7 @@
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
+PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
@@ -1243,7 +1241,6 @@
PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
PHP_ADD_BUILD_DIR(main main/streams)
-PHP_ADD_BUILD_DIR(regex)
PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli)
PHP_ADD_BUILD_DIR(TSRM)
PHP_ADD_BUILD_DIR(Zend)
http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/ereg.c?r1=1.88&r2=1.89&diff_format=u
Index: php-src/ext/ereg/ereg.c
diff -u php-src/ext/ereg/ereg.c:1.88 php-src/ext/ereg/ereg.c:1.89
--- php-src/ext/ereg/ereg.c:1.88Sat Jul 14 08:38:20 2007
+++ php-src/ext/ereg/ereg.c Sun Jul 15 19:50:06 2007
@@ -17,23 +17,101 @@
| Jaakko Hyvätti <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: ereg.c,v 1.88 2007/07/14 08:38:20 tony2001 Exp $ */
+/* $Id: ereg.c,v 1.89 2007/07/15 19:50:06 jani Exp $ */
#include
#include
#include "php.h"
-#include "php_string.h"
-#include "reg.h"
+#include "ext/standard/php_string.h"
+#include "php_ereg.h"
#include "ext/standard/info.h"
-ZEND_DECLARE_MODULE_GLOBALS(reg)
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ereg, 0, 0, 2)
+ ZEND_ARG_INFO(0, pattern)
+ Z
[PHP-CVS] cvs: php-src / configure.in
janiThu Jul 12 14:18:02 2007 UTC Modified files: /php-srcconfigure.in Log: - missing comma http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.635&r2=1.636&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.635 php-src/configure.in:1.636 --- php-src/configure.in:1.635 Thu Jul 12 11:33:18 2007 +++ php-src/configure.inThu Jul 12 14:18:01 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.635 2007/07/12 11:33:18 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.636 2007/07/12 14:18:01 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -732,7 +732,7 @@ fi AC_MSG_CHECKING([where to scan for configuration files]) -PHP_ARG_WITH(config-file-scan-dir, +PHP_ARG_WITH(config-file-scan-dir,, [ --with-config-file-scan-dir=PATH Set the path where to scan for configuration files], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiThu Jul 12 11:33:18 2007 UTC Modified files: /php-srcconfigure.in Log: - Fix invalid logic (plus made it possible to pass only integers to this) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.634&r2=1.635&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.634 php-src/configure.in:1.635 --- php-src/configure.in:1.634 Wed Jul 11 23:13:19 2007 +++ php-src/configure.inThu Jul 12 11:33:18 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.634 2007/07/11 23:13:19 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.635 2007/07/12 11:33:18 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -800,9 +800,13 @@ PHP_ARG_ENABLE(fd-setsize,, [ --enable-fd-setsize Set size of descriptor sets], no, no) -if test "$PHP_FD_SETSIZE" != "yes"; then - CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE" - AC_MSG_RESULT([using $PHP_FD_SETSIZE]) +if test "$PHP_FD_SETSIZE" != "no"; then + if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then +CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE" +AC_MSG_RESULT([using $PHP_FD_SETSIZE]) + else +AC_MSG_ERROR([Invalid value passed to --enable-fd-setsize!]) + fi else AC_MSG_RESULT([using system default]) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
janiWed Jul 11 23:13:20 2007 UTC Modified files: /php-srcconfigure.in Log: - Enabled PHP_CHECK_CONFIGURE_OPTIONS (check for unknown configure options) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.633&r2=1.634&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.633 php-src/configure.in:1.634 --- php-src/configure.in:1.633 Tue Jul 10 10:18:26 2007 +++ php-src/configure.inWed Jul 11 23:13:19 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.633 2007/07/10 10:18:26 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.634 2007/07/11 23:13:19 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -129,9 +129,8 @@ AC_PROG_LN_S dnl Support systems with system libraries in e.g. /usr/lib64 -AC_ARG_WITH(libdir, -[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], -[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) +PHP_ARG_WITH(libdir, for system library directory, +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],lib,no) dnl check for -R, etc. switch PHP_RUNPATH_SWITCH @@ -704,9 +703,9 @@ ZEND_DEBUG=no fi -PHP_ARG_WITH(layout,[layout of installed files], -[ --with-layout=TYPE Set how installed files will be laid out. Type is - one of "PHP" or "GNU" [TYPE=PHP]], PHP, no) +PHP_ARG_WITH(layout, layout of installed files, +[ --with-layout=TYPE Set how installed files will be laid out. Type can + be either PHP or GNU [PHP]], PHP, no) case $PHP_LAYOUT in GNU) @@ -717,7 +716,7 @@ ;; esac -PHP_ARG_WITH(config-file-path,[path to configuration file], +PHP_ARG_WITH(config-file-path, path to configuration file, [ --with-config-file-path=PATH Set the path in which to look for php.ini [PREFIX/lib]], DEFAULT, no) @@ -732,16 +731,18 @@ esac fi -PHP_ARG_WITH(config-file-scan-dir,[where to scan for configuration files], +AC_MSG_CHECKING([where to scan for configuration files]) +PHP_ARG_WITH(config-file-scan-dir, [ --with-config-file-scan-dir=PATH Set the path where to scan for configuration files], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then PHP_CONFIG_FILE_SCAN_DIR= fi +AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR]) test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" -PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler, +PHP_ARG_ENABLE(sigchild, whether to enable PHP's own SIGCHLD handler, [ --enable-sigchild Enable PHP's own SIGCHLD handler], no, no) if test "$PHP_SIGCHILD" = "yes"; then @@ -766,20 +767,19 @@ PHP_ADD_LIBRARY(gcc, yes) fi -PHP_ARG_ENABLE(short-tags,whether to enable short tags by default, -[ --disable-short-tagsDisable the short-form http://www.php.net/manual/security.php for more details. |" - fi -fi - fi - - if test -n "$DEBUG_LOG"; then rm -f config.cache cat
[PHP-CVS] cvs: php-src / configure.in
tony2001Fri Jul 6 10:58:37 2007 UTC
Modified files:
/php-srcconfigure.in
Log:
fix #41908 (CFLAGS="-Os" ./configure --enable-debug fails)
patch by christian at hoffie dot info
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.631&r2=1.632&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.631 php-src/configure.in:1.632
--- php-src/configure.in:1.631 Tue Jul 3 17:24:36 2007
+++ php-src/configure.inFri Jul 6 10:58:36 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.631 2007/07/03 17:24:36 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.632 2007/07/06 10:58:36 tony2001 Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -675,8 +675,8 @@
dnl Remove all optimization flags from CFLAGS
changequote({,})
- CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
- CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
+ CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
changequote([,])
dnl Add the special gcc flags
@@ -691,8 +691,8 @@
PHP_DEBUG=1
ZEND_DEBUG=yes
changequote({,})
- CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
- CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'`
+ CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'`
changequote([,])
dnl add -O0 only if GCC or ICC is used
if test "$GCC" = "yes" || test "$ICC" = "yes"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/dom config.m4 /ext/gd config.m4 /ext/hash config.m4 /ext/interbase config.m4 /ext/json config.m4 /ext/libxml config0.m4 /ext/mime_magic config.m4 /ex
sniper Tue Jul 3 17:24:37 2007 UTC Modified files: /php-srcconfigure.in /php-src/ext/domconfig.m4 /php-src/ext/gd config.m4 /php-src/ext/hash config.m4 /php-src/ext/interbase config.m4 /php-src/ext/json config.m4 /php-src/ext/libxml config0.m4 /php-src/ext/mime_magic config.m4 /php-src/ext/msql config.m4 /php-src/ext/mssql config.m4 /php-src/ext/mysqli config.m4 /php-src/ext/oci8 config.m4 /php-src/ext/odbc config.m4 /php-src/ext/pcre config0.m4 /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_sqlite config.m4 /php-src/ext/sqlite config.m4 /php-src/ext/sybase config.m4 /php-src/ext/sybase_ct config.m4 /php-src/ext/xslconfig.m4 /php-src/ext/zipconfig.m4 Log: - Fix some configure --help texts http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.630&r2=1.631&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.630 php-src/configure.in:1.631 --- php-src/configure.in:1.630 Fri Jun 29 01:09:53 2007 +++ php-src/configure.inTue Jul 3 17:24:36 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.630 2007/06/29 01:09:53 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.631 2007/07/03 17:24:36 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -719,8 +719,7 @@ PHP_ARG_WITH(config-file-path,[path to configuration file], [ --with-config-file-path=PATH - Set the path in which to look for php.ini - [PREFIX/lib]], DEFAULT, no) + Set the path in which to look for php.ini [PREFIX/lib]], DEFAULT, no) if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then case $PHP_LAYOUT in http://cvs.php.net/viewvc.cgi/php-src/ext/dom/config.m4?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.20 php-src/ext/dom/config.m4:1.21 --- php-src/ext/dom/config.m4:1.20 Sun May 29 23:16:40 2005 +++ php-src/ext/dom/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,9 +1,9 @@ dnl -dnl $Id: config.m4,v 1.20 2005/05/29 23:16:40 sniper Exp $ +dnl $Id: config.m4,v 1.21 2007/07/03 17:24:36 sniper Exp $ dnl PHP_ARG_ENABLE(dom, whether to enable DOM support, -[ --disable-dom Disable new DOM support], yes) +[ --disable-dom Disable DOM support], yes) if test -z "$PHP_LIBXML_DIR"; then PHP_ARG_WITH(libxml-dir, libxml2 install dir, http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.173&r2=1.174&diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.173 php-src/ext/gd/config.m4:1.174 --- php-src/ext/gd/config.m4:1.173 Fri Jun 1 21:33:30 2007 +++ php-src/ext/gd/config.m4Tue Jul 3 17:24:36 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.173 2007/06/01 21:33:30 sniper Exp $ +dnl $Id: config.m4,v 1.174 2007/07/03 17:24:36 sniper Exp $ dnl dnl @@ -7,8 +7,8 @@ dnl PHP_ARG_WITH(gd, for GD support, -[ --with-gd[=FILE]Include GD support. FILE is the optional pathname to gdlib-config. - If FILE is not set, the bundled GD library will be used]) +[ --with-gd[=FILE]Include GD support. FILE is the optional + pathname to gdlib-config [BUNDLED]]) if test -z "$PHP_JPEG_DIR"; then PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, http://cvs.php.net/viewvc.cgi/php-src/ext/hash/config.m4?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/hash/config.m4 diff -u php-src/ext/hash/config.m4:1.11 php-src/ext/hash/config.m4:1.12 --- php-src/ext/hash/config.m4:1.11 Sun Feb 19 23:43:23 2006 +++ php-src/ext/hash/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.11 2006/02/19 23:43:23 mike Exp $ +dnl $Id: config.m4,v 1.12 2007/07/03 17:24:36 sniper Exp $ dnl config.m4 for extension hash PHP_ARG_ENABLE(hash, whether to enable hash support, -[ --disable-hash Disable hash support], yes) +[ --disable-hash Disable hash support], yes) if test "$PHP_HASH" != "no"; then AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension]) http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/config.m4?r1=1.20&r2=1.21&diff_format=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.20 php-src/ext/interbase/config.m4:1.21 --- php-src/ext/interbase/config.m4:1.20Wed May 12 14:29:42 2004 +++ php-src/ext/interbase/config.m4 Tue Jul 3 17:24:36 2007 @@ -1,10 +1,10 @@ dnl -dnl $Id: config.m4,v 1.20 2004/05/12 14:29:42 abies Exp $ +dnl $Id: config.m4,v 1.21 2007/07/03 17:24:36 sniper Exp $ dnl PHP_ARG_WITH(interbase,for InterBase support, [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base - install direc
[PHP-CVS] cvs: php-src / configure.in
dmitry Mon Jun 25 14:23:21 2007 UTC Modified files: /php-srcconfigure.in Log: Fixed stat() to support rdev, blocksize and blocks on Fedora 7 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.627&r2=1.628&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.627 php-src/configure.in:1.628 --- php-src/configure.in:1.627 Thu May 24 23:31:15 2007 +++ php-src/configure.inMon Jun 25 14:23:21 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.627 2007/05/24 23:31:15 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.628 2007/06/25 14:23:21 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -371,6 +371,7 @@ sys/resource.h \ sys/select.h \ sys/socket.h \ +sys/stat.h \ sys/statfs.h \ sys/statvfs.h \ sys/vfs.h \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /sapi/cgi config9.m4
sniper Thu May 24 23:31:15 2007 UTC Modified files: /php-srcconfigure.in /php-src/sapi/cgi config9.m4 Log: MFB:- Unify installation of SAPIs: CGI is no exception anymore. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.626&r2=1.627&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.626 php-src/configure.in:1.627 --- php-src/configure.in:1.626 Thu May 24 21:43:56 2007 +++ php-src/configure.inThu May 24 23:31:15 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.626 2007/05/24 21:43:56 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.627 2007/05/24 23:31:15 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1196,9 +1196,6 @@ install_targets="$install_modules install-build install-headers install-programs" case $PHP_SAPI in - cgi) -install_targets="install-sapi $install_targets" -;; cli) install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" ;; http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.22&r2=1.23&diff_format=u Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.22 php-src/sapi/cgi/config9.m4:1.23 --- php-src/sapi/cgi/config9.m4:1.22Tue Feb 20 20:10:53 2007 +++ php-src/sapi/cgi/config9.m4 Thu May 24 23:31:15 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.22 2007/02/20 20:10:53 tony2001 Exp $ +dnl $Id: config9.m4,v 1.23 2007/05/24 23:31:15 sniper Exp $ dnl AC_ARG_ENABLE(cgi, @@ -44,15 +44,15 @@ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag) case $host_alias in *cygwin* ) -SAPI_CGI_PATH=sapi/cgi/php.exe +SAPI_CGI_PATH=sapi/cgi/php-cgi.exe ;; * ) -SAPI_CGI_PATH=sapi/cgi/php +SAPI_CGI_PATH=sapi/cgi/php-cgi ;; esac PHP_SUBST(SAPI_CGI_PATH) -INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" +INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)') case $host_alias in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
dmitry Mon May 21 08:48:13 2007 UTC Modified files: /php-srcconfigure.in Log: libfcgi cleanup (Andrei Nigmatulin) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.624&r2=1.625&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.624 php-src/configure.in:1.625 --- php-src/configure.in:1.624 Sat Mar 3 20:41:11 2007 +++ php-src/configure.inMon May 21 08:48:13 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.624 2007/03/03 20:41:11 helly Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.625 2007/05/21 08:48:13 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -258,12 +258,6 @@ PTHREADS_FLAGS fi -if test "$PHP_ENABLE_FASTCGI" = "yes"; then - PHP_CONFIGURE_PART(Running FastCGI checks) - sinclude(sapi/cgi/libfcgi/acinclude.m4) - sinclude(sapi/cgi/libfcgi/libfcgi.m4) -fi - divert(3) dnl ## In diversion 3 we check for compile-time options to the PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c /main php_streams.h /main/streams glob_wrapper.c php_stream_glob_wrapper.h plain_wrapper.c
helly Sat Mar 3 20:41:12 2007 UTC
Added files:
/php-src/main/streams glob_wrapper.c php_stream_glob_wrapper.h
Modified files:
/php-srcconfigure.in
/php-src/main php_streams.h
/php-src/main/streams plain_wrapper.c
/php-src/ext/standard basic_functions.c
Log:
- Add glob stream wrapper
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.623&r2=1.624&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.623 php-src/configure.in:1.624
--- php-src/configure.in:1.623 Tue Feb 20 20:10:53 2007
+++ php-src/configure.inSat Mar 3 20:41:11 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.623 2007/02/20 20:10:53 tony2001 Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.624 2007/03/03 20:41:11 helly Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1229,7 +1229,7 @@
PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \
- unicode_filter.c )
+ unicode_filter.c glob_wrapper.c)
PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.125&r2=1.126&diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.125 php-src/main/php_streams.h:1.126
--- php-src/main/php_streams.h:1.125Wed Feb 21 21:56:45 2007
+++ php-src/main/php_streams.h Sat Mar 3 20:41:11 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.125 2007/02/21 21:56:45 tony2001 Exp $ */
+/* $Id: php_streams.h,v 1.126 2007/03/03 20:41:11 helly Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -545,6 +545,7 @@
#include "streams/php_stream_transport.h"
#include "streams/php_stream_plain_wrapper.h"
+#include "streams/php_stream_glob_wrapper.h"
#include "streams/php_stream_userspace.h"
#include "streams/php_stream_mmap.h"
@@ -614,6 +615,9 @@
/* get (or create) a persistent version of the stream */
#define STREAM_OPEN_PERSISTENT 2048
+/* use glob stream for directory open in plain files stream */
+#define STREAM_USE_GLOB_DIR_OPEN 4096
+
/* Antique - no longer has meaning */
#define IGNORE_URL_WIN 0
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.82&r2=1.83&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.82
php-src/main/streams/plain_wrapper.c:1.83
--- php-src/main/streams/plain_wrapper.c:1.82 Fri Feb 23 23:08:40 2007
+++ php-src/main/streams/plain_wrapper.cSat Mar 3 20:41:12 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.82 2007/02/23 23:08:40 pollita Exp $ */
+/* $Id: plain_wrapper.c,v 1.83 2007/03/03 20:41:12 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -836,6 +836,10 @@
DIR *dir = NULL;
php_stream *stream = NULL;
+ if (options & STREAM_USE_GLOB_DIR_OPEN) {
+ return
php_glob_stream_wrapper.wops->dir_opener(&php_glob_stream_wrapper, path, mode,
options, opened_path, context STREAMS_REL_CC TSRMLS_CC);
+ }
+
if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) &&
php_check_open_basedir(path TSRMLS_CC)) {
return NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.849&r2=1.850&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.849
php-src/ext/standard/basic_functions.c:1.850
--- php-src/ext/standard/basic_functions.c:1.849Thu Feb 22 08:23:44 2007
+++ php-src/ext/standard/basic_functions.c Sat Mar 3 20:41:12 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.849 2007/02/22 08:23:44 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.850 2007/03/03 20:41:12 helly Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4064,6 +4064,7 @@
php_register_url_stream_wrapper("php", &php_stream_php_wrapper
TSRMLS_CC);
php_register_url_stream_wrapper("file", &php_plain_files_wrapper
TSRMLS_CC);
+ php_register_url_stream_wrapper("glob", &php_glob_stream_wrapper
TSRMLS_CC);
php_register_url_stream_wrapper("data", &php_stream_rfc2397_wrapper
TSRMLS_CC);
#ifndef PHP_CURL_URL_WRAPPERS
php_register_url_stream_wrapper("http", &php_stream_http_wrapper
TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/glob_wrapper.c?view=markup&rev=1.1
Index: php-src/main/streams/glob_wrapper.c
+++ php-src/main/streams/glob_wrapper.c
/*
+--+
| PHP Version 5|
+-
[PHP-CVS] cvs: php-src / configure.in
tony2001Fri Jan 26 11:13:50 2007 UTC Modified files: /php-srcconfigure.in Log: check if -no-cpp-precomp is supported by GCC before using it (mac os only) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.621&r2=1.622&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.621 php-src/configure.in:1.622 --- php-src/configure.in:1.621 Fri Jan 12 18:57:11 2007 +++ php-src/configure.inFri Jan 26 11:13:50 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.621 2007/01/12 18:57:11 andrei Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.622 2007/01/26 11:13:50 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -166,7 +166,12 @@ *dgux*) CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";; *darwin*|*rhapsody*) -CPPFLAGS="$CPPFLAGS -no-cpp-precomp" +if test -n "$GCC"; then + PHP_CHECK_GCC_ARG(-no-cpp-precomp, gcc_no_cpp_precomp=yes) + if test "$gcc_no_cpp_precomp" = "yes"; then +CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + fi +fi AC_DEFINE(BIND_8_COMPAT, 1, [Enabling BIND8 compatibility for Panther]) php_multiple_shlib_versions_ok=yes;; *beos*) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Mon Dec 25 15:40:14 2006 UTC Modified files: /php-srcconfigure.in Log: fix bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install path) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.618&r2=1.619&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.618 php-src/configure.in:1.619 --- php-src/configure.in:1.618 Tue Dec 12 07:36:37 2006 +++ php-src/configure.inMon Dec 25 15:40:14 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.618 2006/12/12 07:36:37 tony2001 Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.619 2006/12/25 15:40:14 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1052,6 +1052,15 @@ fi fi +case $PHP_LAYOUT in + GNU) +datarootdir=$prefix/share +;; + *) +datarootdir=$prefix/php +;; +esac + dnl Expand all directory names for use in macros/constants EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` @@ -1141,6 +1150,7 @@ PHP_SUBST(prefix) PHP_SUBST(localstatedir) PHP_SUBST(datadir) +PHP_SUBST(datarootdir) PHP_SUBST(sysconfdir) PHP_SUBST(EXEEXT) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /win32/build config.w32 ZendEngine2 Makefile.am Zend.dsp ZendTS.dsp zend_mm.c zend_mm.h
dmitry Tue Dec 5 08:08:33 2006 UTC
Removed files:
/ZendEngine2zend_mm.c zend_mm.h
Modified files:
/php-srcconfigure.in
/ZendEngine2Makefile.am Zend.dsp ZendTS.dsp
/php-src/win32/buildconfig.w32
Log:
Removed unused zend_mm.*
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.616&r2=1.617&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.616 php-src/configure.in:1.617
--- php-src/configure.in:1.616 Mon Dec 4 18:28:34 2006
+++ php-src/configure.inTue Dec 5 08:08:33 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.616 2006/12/04 18:28:34 tony2001 Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.617 2006/12/05 08:08:33 dmitry Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1284,7 +1284,7 @@
zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c
zend_strtol.c)
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
- PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c
zend_objects_API.c zend_mm.c \
+ PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c
zend_objects_API.c \
zend_default_classes.c)
fi
http://cvs.php.net/viewvc.cgi/ZendEngine2/Makefile.am?r1=1.60&r2=1.61&diff_format=u
Index: ZendEngine2/Makefile.am
diff -u ZendEngine2/Makefile.am:1.60 ZendEngine2/Makefile.am:1.61
--- ZendEngine2/Makefile.am:1.60Thu Nov 17 22:57:16 2005
+++ ZendEngine2/Makefile.am Tue Dec 5 08:08:33 2006
@@ -14,7 +14,7 @@
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
- zend_objects_API.c zend_ts_hash.c zend_stream.c zend_mm.c \
+ zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
zend_strtod.c zend_strtod.c zend_strtol.c
http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.dsp?r1=1.25&r2=1.26&diff_format=u
Index: ZendEngine2/Zend.dsp
diff -u ZendEngine2/Zend.dsp:1.25 ZendEngine2/Zend.dsp:1.26
--- ZendEngine2/Zend.dsp:1.25 Thu Nov 4 02:05:36 2004
+++ ZendEngine2/Zend.dspTue Dec 5 08:08:33 2006
@@ -195,10 +195,6 @@
# End Source File
# Begin Source File
-SOURCE=.\zend_mm.c
-# End Source File
-# Begin Source File
-
SOURCE=.\zend_object_handlers.c
# End Source File
# Begin Source File
@@ -375,10 +371,6 @@
# End Source File
# Begin Source File
-SOURCE=.\zend_mm.h
-# End Source File
-# Begin Source File
-
SOURCE=.\zend_modules.h
# End Source File
# Begin Source File
http://cvs.php.net/viewvc.cgi/ZendEngine2/ZendTS.dsp?r1=1.47&r2=1.48&diff_format=u
Index: ZendEngine2/ZendTS.dsp
diff -u ZendEngine2/ZendTS.dsp:1.47 ZendEngine2/ZendTS.dsp:1.48
--- ZendEngine2/ZendTS.dsp:1.47 Thu Nov 4 02:05:36 2004
+++ ZendEngine2/ZendTS.dsp Tue Dec 5 08:08:33 2006
@@ -228,10 +228,6 @@
# End Source File
# Begin Source File
-SOURCE=.\zend_mm.c
-# End Source File
-# Begin Source File
-
SOURCE=.\zend_object_handlers.c
# End Source File
# Begin Source File
@@ -412,10 +408,6 @@
# End Source File
# Begin Source File
-SOURCE=.\zend_mm.h
-# End Source File
-# Begin Source File
-
SOURCE=.\zend_modules.h
# End Source File
# Begin Source File
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.59&r2=1.60&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.59 php-src/win32/build/config.w32:1.60
--- php-src/win32/build/config.w32:1.59 Tue Nov 14 14:20:41 2006
+++ php-src/win32/build/config.w32 Tue Dec 5 08:08:33 2006
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.59 2006/11/14 14:20:41 dmitry Exp $
+// $Id: config.w32,v 1.60 2006/12/05 08:08:33 dmitry Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -275,7 +275,7 @@
zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c
\
- zend_mm.c zend_default_classes.c zend_execute.c zend_strtod.c");
+ zend_default_classes.c zend_execute.c zend_strtod.c");
ADD_SOURCES("main", "main.c snprintf.c spprintf.c fopen_wrappers.c \
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
iliaa Thu Nov 30 17:10:55 2006 UTC Modified files: /php-srcconfigure.in Log: MFB: Added check for crypt_r() http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.614&r2=1.615&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.614 php-src/configure.in:1.615 --- php-src/configure.in:1.614 Mon Sep 25 11:05:29 2006 +++ php-src/configure.inThu Nov 30 17:10:55 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.614 2006/09/25 11:05:29 tony2001 Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.615 2006/11/30 17:10:55 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -464,6 +464,7 @@ ctime_r \ cuserid \ crypt \ +crypt_r \ flock \ ftok \ funopen \ @@ -478,6 +479,8 @@ getrusage \ gettimeofday \ gmtime_r \ +getpwnam_r \ +getgrnam_r \ grantpt \ inet_ntoa \ inet_ntop \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Mon Sep 25 11:05:29 2006 UTC
Modified files:
/php-srcconfigure.in
Log:
change CXXFLAGS along with CFLAGS as there might be C++ code
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.613&r2=1.614&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.613 php-src/configure.in:1.614
--- php-src/configure.in:1.613 Tue Aug 22 13:01:27 2006
+++ php-src/configure.inMon Sep 25 11:05:29 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.613 2006/08/22 13:01:27 tony2001 Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.614 2006/09/25 11:05:29 tony2001 Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -663,10 +663,12 @@
dnl Remove all optimization flags from CFLAGS
changequote({,})
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+ CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`
changequote([,])
dnl Add the special gcc flags
CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
+ CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage"
fi
PHP_ARG_ENABLE(debug, whether to include debugging symbols,
@@ -677,8 +679,10 @@
ZEND_DEBUG=yes
changequote({,})
CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+ CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`
changequote([,])
CFLAGS="$CFLAGS -O0"
+ CXXFLAGS="$CXXFLAGS -O0"
else
PHP_DEBUG=0
ZEND_DEBUG=no
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Tue Aug 15 20:12:59 2006 UTC Modified files: /php-srcconfigure.in Log: fix #38467 (--enable-versioning causes make fail on OS X) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.611&r2=1.612&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.611 php-src/configure.in:1.612 --- php-src/configure.in:1.611 Tue Aug 8 10:53:06 2006 +++ php-src/configure.inTue Aug 15 20:12:59 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.611 2006/08/08 10:53:06 tony2001 Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.612 2006/08/15 20:12:59 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -894,6 +894,13 @@ if test -n "$PHP_MODULES"; then AC_MSG_ERROR([--enable-versioning cannot be used with shared modules]) fi + + case $host_alias in +*darwin*) + AC_MSG_ERROR([--enable-versioning is not supported on your platform]) + ;; + esac + test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym" if test -f "$PHP_SYM_FILE"; then EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
tony2001Sun Aug 6 20:45:43 2006 UTC
Modified files:
/php-srcconfigure.in
Log:
use -O0 with --enable-debug
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.608&r2=1.609&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.608 php-src/configure.in:1.609
--- php-src/configure.in:1.608 Thu Jul 27 08:51:50 2006
+++ php-src/configure.inSun Aug 6 20:45:42 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.608 2006/07/27 08:51:50 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.609 2006/08/06 20:45:42 tony2001 Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -674,6 +674,10 @@
if test "$PHP_DEBUG" = "yes"; then
PHP_DEBUG=1
ZEND_DEBUG=yes
+ changequote({,})
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+ changequote([,])
+ CFLAGS="$CFLAGS -O0"
else
PHP_DEBUG=0
ZEND_DEBUG=no
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h /scripts php-config.in /scripts/man1 php-config.1.in
Hello Jani, Thursday, July 27, 2006, 1:50:42 AM, you wrote: > sniper Thu Jul 27 08:50:42 2006 UTC > Modified files: > /php-srcconfigure.in > /php-src/scriptsphp-config.in > /php-src/scripts/man1 php-config.1.in > /php-src/main php_version.h > Log: > - Added PHP_VERSION_ID == PHP_VERSION as integer value. > > > http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.606&r2=1.607&diff_format=u > Index: php-src/configure.in > diff -u php-src/configure.in:1.606 php-src/configure.in:1.607 > --- php-src/configure.in:1.606 Wed Jul 26 08:57:10 2006 > +++ php-src/configure.inThu Jul 27 08:50:40 2006 > @@ -1,4 +1,4 @@ > - ## $Id: configure.in,v 1.606 2006/07/26 08:57:10 tony2001 Exp $ -*- > autoconf -*- > + ## $Id: configure.in,v 1.607 2006/07/27 08:50:40 sniper Exp $ -*- autoconf > -*- > dnl ## Process this file with autoconf to produce a configure script. > > divert(1) > @@ -43,7 +43,8 @@ > MINOR_VERSION=0 > RELEASE_VERSION=0 > EXTRA_VERSION="-dev" > -VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" > +PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" > +PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + > [$]RELEASE_VERSION` > > dnl Define where extension directories are located in the configure context > AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl > @@ -54,7 +55,6 @@ > dnl Setting up the PHP version based on the information above. > dnl > - > > -PHP_VERSION=$VERSION > echo "/* automatically generated by configure */" > php_version.h.new > echo "/* edit configure.in to change version number */" >> php_version.h.new > echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new > @@ -62,6 +62,7 @@ > echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new > echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new > echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new > +echo "#define PHP_VERSION_ID \"$PHP_VERSION_ID\"" >> php_version.h.new > cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 > if test $? -ne 0 ; then > rm -f $srcdir/main/php_version.h && mv php_version.h.new > $srcdir/main/php_version.h && \ > @@ -1145,6 +1146,7 @@ > PHP_SUBST(PHP_RPATHS) > PHP_SUBST(PHP_SAPI) > PHP_SUBST_OLD(PHP_VERSION) > +PHP_SUBST_OLD(PHP_VERSION_ID) > PHP_SUBST(SHELL) > PHP_SUBST(SHARED_LIBTOOL) > PHP_SUBST(WARNING_LEVEL) > http://cvs.php.net/viewvc.cgi/php-src/scripts/php-config.in?r1=1.6&r2=1.7&diff_format=u > Index: php-src/scripts/php-config.in > diff -u php-src/scripts/php-config.in:1.6 php-src/scripts/php-config.in:1.7 > --- php-src/scripts/php-config.in:1.6 Thu Jul 27 01:19:42 2006 > +++ php-src/scripts/php-config.in Thu Jul 27 08:50:41 2006 > @@ -3,6 +3,7 @@ > prefix="@prefix@" > exec_prefix="@exec_prefix@" > version="@PHP_VERSION@" > +version_id="@PHP_VERSION_ID@" > includedir="@includedir@/php" > includes="-I$includedir -I$includedir/main -I$includedir/TSRM > -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib" > ldflags="@PHP_LDFLAGS@" > @@ -30,8 +31,10 @@ > echo $php_binary;; > --version) > echo $version;; > +--vernum) > + echo $version_id;; > *) > - echo "Usage: $0 > [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version]" > + echo "Usage: $0 > [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version|--vernum]" > exit 1;; > esac > > http://cvs.php.net/viewvc.cgi/php-src/scripts/man1/php-config.1.in?r1=1.5&r2=1.6&diff_format=u > Index: php-src/scripts/man1/php-config.1.in > diff -u php-src/scripts/man1/php-config.1.in:1.5 > php-src/scripts/man1/php-config.1.in:1.6 > --- php-src/scripts/man1/php-config.1.in:1.5Sun Jan 1 13:09:58 2006 > +++ php-src/scripts/man1/php-config.1.inThu Jul 27 08:50:41 2006 > @@ -43,6 +43,10 @@ > .B \-\-version > PHP version > .TP > +.PD 0 > +.B \-\-vernum > +PHP version as integer > +.TP > .PD 1 > .P > .SH SEE ALSO > http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.113&r2=1.114&diff_format=u > Index: php-src/main/php_version.h > diff -u php-src/main/php_version.h:1.113 php-src/main/php_version.h:1.114 > --- php-src/main/php_version.h:1.113Tue Aug 9 08:47:58 2005 > +++ php-src/main/php_version.h Thu Jul 27 08:50:41 2006 > @@ -5,3 +5,4 @@ > #define PHP_RELEASE_VERSION 0 > #define PHP_EXTRA_VERSION "-dev" > #define PHP_VERSION "6.0.0-dev" > +#define PHP_VERSION_ID "6" Shouldn't CLI/CGI suppor this too? Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Thu Jul 27 08:51:50 2006 UTC Modified files: /php-srcconfigure.in Log: - Removed unnecessary quotes http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.607&r2=1.608&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.607 php-src/configure.in:1.608 --- php-src/configure.in:1.607 Thu Jul 27 08:50:40 2006 +++ php-src/configure.inThu Jul 27 08:51:50 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.607 2006/07/27 08:50:40 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.608 2006/07/27 08:51:50 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -62,7 +62,7 @@ echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new -echo "#define PHP_VERSION_ID \"$PHP_VERSION_ID\"" >> php_version.h.new +echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 if test $? -ne 0 ; then rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h /scripts php-config.in /scripts/man1 php-config.1.in
sniper Thu Jul 27 08:50:42 2006 UTC Modified files: /php-srcconfigure.in /php-src/scriptsphp-config.in /php-src/scripts/man1 php-config.1.in /php-src/main php_version.h Log: - Added PHP_VERSION_ID == PHP_VERSION as integer value. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.606&r2=1.607&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.606 php-src/configure.in:1.607 --- php-src/configure.in:1.606 Wed Jul 26 08:57:10 2006 +++ php-src/configure.inThu Jul 27 08:50:40 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.606 2006/07/26 08:57:10 tony2001 Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.607 2006/07/27 08:50:40 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -43,7 +43,8 @@ MINOR_VERSION=0 RELEASE_VERSION=0 EXTRA_VERSION="-dev" -VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" +PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" +PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION` dnl Define where extension directories are located in the configure context AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl @@ -54,7 +55,6 @@ dnl Setting up the PHP version based on the information above. dnl - -PHP_VERSION=$VERSION echo "/* automatically generated by configure */" > php_version.h.new echo "/* edit configure.in to change version number */" >> php_version.h.new echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new @@ -62,6 +62,7 @@ echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new +echo "#define PHP_VERSION_ID \"$PHP_VERSION_ID\"" >> php_version.h.new cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 if test $? -ne 0 ; then rm -f $srcdir/main/php_version.h && mv php_version.h.new $srcdir/main/php_version.h && \ @@ -1145,6 +1146,7 @@ PHP_SUBST(PHP_RPATHS) PHP_SUBST(PHP_SAPI) PHP_SUBST_OLD(PHP_VERSION) +PHP_SUBST_OLD(PHP_VERSION_ID) PHP_SUBST(SHELL) PHP_SUBST(SHARED_LIBTOOL) PHP_SUBST(WARNING_LEVEL) http://cvs.php.net/viewvc.cgi/php-src/scripts/php-config.in?r1=1.6&r2=1.7&diff_format=u Index: php-src/scripts/php-config.in diff -u php-src/scripts/php-config.in:1.6 php-src/scripts/php-config.in:1.7 --- php-src/scripts/php-config.in:1.6 Thu Jul 27 01:19:42 2006 +++ php-src/scripts/php-config.in Thu Jul 27 08:50:41 2006 @@ -3,6 +3,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" +version_id="@PHP_VERSION_ID@" includedir="@includedir@/php" includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib" ldflags="@PHP_LDFLAGS@" @@ -30,8 +31,10 @@ echo $php_binary;; --version) echo $version;; +--vernum) + echo $version_id;; *) - echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version]" + echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version|--vernum]" exit 1;; esac http://cvs.php.net/viewvc.cgi/php-src/scripts/man1/php-config.1.in?r1=1.5&r2=1.6&diff_format=u Index: php-src/scripts/man1/php-config.1.in diff -u php-src/scripts/man1/php-config.1.in:1.5 php-src/scripts/man1/php-config.1.in:1.6 --- php-src/scripts/man1/php-config.1.in:1.5Sun Jan 1 13:09:58 2006 +++ php-src/scripts/man1/php-config.1.inThu Jul 27 08:50:41 2006 @@ -43,6 +43,10 @@ .B \-\-version PHP version .TP +.PD 0 +.B \-\-vernum +PHP version as integer +.TP .PD 1 .P .SH SEE ALSO http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.113&r2=1.114&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.113 php-src/main/php_version.h:1.114 --- php-src/main/php_version.h:1.113Tue Aug 9 08:47:58 2005 +++ php-src/main/php_version.h Thu Jul 27 08:50:41 2006 @@ -5,3 +5,4 @@ #define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" #define PHP_VERSION "6.0.0-dev" +#define PHP_VERSION_ID "6" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c
tony2001Wed Jul 26 08:57:11 2006 UTC Modified files: /php-srcconfigure.in /php-src/ext/standard basic_functions.c Log: fix compile warning on Solaris, getloadavg() is in sys/loadavg.h there http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.605&r2=1.606&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.605 php-src/configure.in:1.606 --- php-src/configure.in:1.605 Mon Jun 26 20:28:30 2006 +++ php-src/configure.inWed Jul 26 08:57:10 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.605 2006/06/26 20:28:30 bjori Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.606 2006/07/26 08:57:10 tony2001 Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -372,6 +372,7 @@ sys/sysexits.h \ sys/varargs.h \ sys/wait.h \ +sys/loadavg.h \ termios.h \ unistd.h \ unix.h \ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.796&r2=1.797&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.796 php-src/ext/standard/basic_functions.c:1.797 --- php-src/ext/standard/basic_functions.c:1.796Tue Jul 25 16:40:11 2006 +++ php-src/ext/standard/basic_functions.c Wed Jul 26 08:57:11 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.796 2006/07/25 16:40:11 bjori Exp $ */ +/* $Id: basic_functions.c,v 1.797 2006/07/26 08:57:11 tony2001 Exp $ */ #include "php.h" #include "php_streams.h" @@ -78,6 +78,10 @@ # include #endif +#if HAVE_SYS_LOADAVG_H +# include +#endif + #ifdef HARTMUT_0 #include #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c basic_functions.h
bjori Mon Jun 26 20:28:31 2006 UTC
Modified files:
/php-srcconfigure.in
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
MFB: sys_getloadavg()
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.604&r2=1.605&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.604 php-src/configure.in:1.605
--- php-src/configure.in:1.604 Sat Jun 17 11:14:21 2006
+++ php-src/configure.inMon Jun 26 20:28:30 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.604 2006/06/17 11:14:21 nlopess Exp $ -*- autoconf
-*-
+ ## $Id: configure.in,v 1.605 2006/06/26 20:28:30 bjori Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -466,6 +466,7 @@
funopen \
gai_strerror \
gcvt \
+getloadavg \
getlogin \
getprotobyname \
getprotobynumber \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.782&r2=1.783&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.782
php-src/ext/standard/basic_functions.c:1.783
--- php-src/ext/standard/basic_functions.c:1.782Mon Jun 26 13:10:31 2006
+++ php-src/ext/standard/basic_functions.c Mon Jun 26 20:28:30 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.782 2006/06/26 13:10:31 rasmus Exp $ */
+/* $Id: basic_functions.c,v 1.783 2006/06/26 20:28:30 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3343,7 +3343,9 @@
#ifdef HAVE_GETOPT
PHP_FE(getopt,
arginfo_getopt)
#endif
-
+#ifdef HAVE_GETLOADAVG
+ PHP_FE(sys_getloadavg,
NULL)
+#endif
#ifdef HAVE_GETTIMEOFDAY
PHP_FE(microtime,
arginfo_microtime)
PHP_FE(gettimeofday,
arginfo_gettimeofday)
@@ -6199,6 +6201,23 @@
}
/* }}} */
+#ifdef HAVE_GETLOADAVG
+PHP_FUNCTION(sys_getloadavg)
+{
+ double load[3];
+
+ if (getloadavg(load, 3) == -1) {
+ RETURN_FALSE;
+ } else {
+ array_init(return_value);
+ add_index_double(return_value, 0, load[0]);
+ add_index_double(return_value, 1, load[1]);
+ add_index_double(return_value, 2, load[2]);
+ }
+}
+#endif
+
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.145
php-src/ext/standard/basic_functions.h:1.146
--- php-src/ext/standard/basic_functions.h:1.145Wed Mar 8 14:41:45 2006
+++ php-src/ext/standard/basic_functions.h Mon Jun 26 20:28:30 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.145 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: basic_functions.h,v 1.146 2006/06/26 20:28:30 bjori Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -116,6 +116,9 @@
PHP_FUNCTION(register_tick_function);
PHP_FUNCTION(unregister_tick_function);
+#ifdef HAVE_GETLOADAVG
+PHP_FUNCTION(sys_getloadavg);
+#endif
PHP_FUNCTION(is_uploaded_file);
PHP_FUNCTION(move_uploaded_file);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /sapi/cgi cgi_main.c
nlopess Sat Jun 17 11:14:21 2006 UTC
Modified files:
/php-srcconfigure.in
/php-src/sapi/cgi cgi_main.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.603&r2=1.604&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.603 php-src/configure.in:1.604
--- php-src/configure.in:1.603 Mon Apr 10 12:16:08 2006
+++ php-src/configure.inSat Jun 17 11:14:21 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.603 2006/04/10 12:16:08 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.604 2006/06/17 11:14:21 nlopess Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -502,6 +502,7 @@
setitimer \
setlocale \
localeconv \
+setenv \
setpgid \
setsockopt \
setvbuf \
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.292&r2=1.293&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.292 php-src/sapi/cgi/cgi_main.c:1.293
--- php-src/sapi/cgi/cgi_main.c:1.292 Tue Jun 13 14:22:27 2006
+++ php-src/sapi/cgi/cgi_main.c Sat Jun 17 11:14:21 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.292 2006/06/13 14:22:27 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.293 2006/06/17 11:14:21 nlopess Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -385,6 +385,18 @@
return fcgi_putenv(request, name, name_len, value);
}
+#if HAVE_SETENV
+ if (value) {
+ setenv(name, value, 1);
+ }
+#endif
+#if HAVE_UNSETENV
+ if (!value) {
+ unsetenv(name);
+ }
+#endif
+
+#if !HAVE_SETENV || !HAVE_UNSETENV
/* if cgi, or fastcgi and not found in fcgi env
check the regular environment
this leaks, but it's only cgi anyway, we'll fix
@@ -395,12 +407,19 @@
if (buf == NULL) {
return getenv(name);
}
+#endif
+#if !HAVE_SETENV
if (value) {
len = snprintf(buf, len - 1, "%s=%s", name, value);
- } else {
+ putenv(buf);
+ }
+#endif
+#if !HAVE_UNSETENV
+ if (!value) {
len = snprintf(buf, len - 1, "%s=", name);
+ putenv(buf);
}
- putenv(buf);
+#endif
return getenv(name);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
pollita Wed Mar 29 01:52:28 2006 UTC Modified files: /php-srcconfigure.in Log: Ooops, missed a file http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.600&r2=1.601&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.600 php-src/configure.in:1.601 --- php-src/configure.in:1.600 Wed Mar 8 14:41:45 2006 +++ php-src/configure.inWed Mar 29 01:52:28 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.600 2006/03/08 14:41:45 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.601 2006/03/29 01:52:28 pollita Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1229,7 +1229,8 @@ output.c ) PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \ - plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c) + plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \ + unicode_filter.c ) PHP_ADD_SOURCES(/main, internal_functions.c,, sapi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard basic_functions.c filestat.c php_filestat.h TSRM tsrm_virtual_cwd.c tsrm_virtual_cwd.h
derick Wed Jan 4 12:22:23 2006 UTC
Modified files:
/php-srcconfigure.in
/TSRM tsrm_virtual_cwd.c tsrm_virtual_cwd.h
/php-src/ext/standard basic_functions.c filestat.c php_filestat.h
Log:
- Added the lchown() and lchgrp() functions which change permissions and group
permissions on symbolic links.
#- We'll also add this to PHP 5.1.3? or PHP 5.2, so I didn't add it to NEWS.
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.598&r2=1.599&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.598 php-src/configure.in:1.599
--- php-src/configure.in:1.598 Mon Dec 12 12:20:45 2005
+++ php-src/configure.inWed Jan 4 12:22:23 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.598 2005/12/12 12:20:45 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.599 2006/01/04 12:22:23 derick Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -482,6 +482,7 @@
link \
localtime_r \
lockf \
+lchown \
lrand48 \
memcpy \
memmove \
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.78&r2=1.79&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.78 TSRM/tsrm_virtual_cwd.c:1.79
--- TSRM/tsrm_virtual_cwd.c:1.78Sun Jan 1 13:09:48 2006
+++ TSRM/tsrm_virtual_cwd.c Wed Jan 4 12:22:23 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.78 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.79 2006/01/04 12:22:23 derick Exp $ */
#include
#include
@@ -777,7 +777,7 @@
}
#if !defined(TSRM_WIN32) && !defined(NETWARE)
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group
TSRMLS_DC)
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int
link TSRMLS_DC)
{
cwd_state new_state;
int ret;
@@ -785,7 +785,15 @@
CWD_STATE_COPY(&new_state, &CWDG(cwd));
virtual_file_ex(&new_state, filename, NULL, 0);
- ret = chown(new_state.cwd, owner, group);
+ if (link) {
+#if HAVE_LCHOWN
+ ret = lchown(new_state.cwd, owner, group);
+#else
+ ret = -1;
+#endif
+ } else {
+ ret = chown(new_state.cwd, owner, group);
+ }
CWD_STATE_FREE(&new_state);
return ret;
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.49&r2=1.50&diff_format=u
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.49 TSRM/tsrm_virtual_cwd.h:1.50
--- TSRM/tsrm_virtual_cwd.h:1.49Sun Jan 1 13:09:48 2006
+++ TSRM/tsrm_virtual_cwd.h Wed Jan 4 12:22:23 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.49 2006/01/01 13:09:48 sniper Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.50 2006/01/04 12:22:23 derick Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -190,7 +190,7 @@
#endif
CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
#if !defined(TSRM_WIN32) && !defined(NETWARE)
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group
TSRMLS_DC);
+CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int
link TSRMLS_DC);
#endif
CWD_API int virtual_file_ex(cwd_state *state, const char *path,
verify_path_func verify_path, int use_realpath);
@@ -262,7 +262,8 @@
#endif
#define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
-#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group
TSRMLS_CC)
+#define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group, 0
TSRMLS_CC)
+#define VCWD_LCHOWN(path, owner, group) virtual_chown(path, owner, group, 1
TSRMLS_CC)
#endif
#else
@@ -305,6 +306,7 @@
#define VCWD_CHMOD(path, mode) chmod(path, mode)
#if !defined(TSRM_WIN32) && !defined(NETWARE)
#define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
+#define VCWD_LCHOWN(path, owner, group) lchown(path, owner, group)
#endif
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.744&r2=1.745&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.744
php-src/ext/standard/basic_functions.c:1.745
--- php-src/ext/standard/basic_functions.c:1.744Sun Jan 1 13:09:54 2006
+++ php-src/ext/standard/basic_functions.c Wed Jan 4 12:22:23 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.744 2006/01/01 13:09:54 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.745 2006/01/04 12:22:23 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -696,6 +696,12 @@
PHP_FE(chown,
[PHP-CVS] cvs: php-src / configure.in
sniper Mon Dec 12 12:20:45 2005 EDT Modified files: /php-srcconfigure.in Log: - added missing configure help line http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.597&r2=1.598&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.597 php-src/configure.in:1.598 --- php-src/configure.in:1.597 Thu Dec 8 16:00:47 2005 +++ php-src/configure.inMon Dec 12 12:20:45 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.597 2005/12/08 16:00:47 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.598 2005/12/12 12:20:45 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -703,8 +703,9 @@ esac fi -PHP_ARG_WITH(config-file-scan-dir,[directory to be scanned for configuration files], -[ --with-config-file-scan-dir=PATH ], DEFAULT, no) +PHP_ARG_WITH(config-file-scan-dir,[where to scan for configuration files], +[ --with-config-file-scan-dir=PATH + Set the path where to scan for configuration files], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then PHP_CONFIG_FILE_SCAN_DIR= fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Tue Nov 29 17:38:36 2005 EDT Modified files: /php-srcconfigure.in Log: - Remove unnecessary libgcov entry (the gcc options handle it) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.594&r2=1.595&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.594 php-src/configure.in:1.595 --- php-src/configure.in:1.594 Mon Nov 21 18:07:31 2005 +++ php-src/configure.inTue Nov 29 17:38:32 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.594 2005/11/21 23:07:31 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.595 2005/11/29 22:38:32 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -608,6 +608,7 @@ fi dnl Check if ccache is being used + dnl FIXME: Need a check for ccache usage, the one below does not work! PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes]) if test "$gcc_ccache" = "yes"; then @@ -621,6 +622,8 @@ AC_CHECK_PROG(LTP, lcov, lcov) AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml) + PHP_SUBST(LTP) + PHP_SUBST(LTP_GENHTML) if test "$LTP"; then AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [ @@ -649,10 +652,6 @@ AC_MSG_ERROR([Could not find genhtml from the LTP package]) fi - PHP_SUBST(LTP) - PHP_SUBST(LTP_GENHTML) - - PHP_ADD_LIBRARY(gcov) AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov]) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
helly Thu Nov 17 17:58:08 2005 EDT Modified files: /php-srcconfigure.in Log: - Move Reflection into its own extension http://cvs.php.net/diff.php/php-src/configure.in?r1=1.592&r2=1.593&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.592 php-src/configure.in:1.593 --- php-src/configure.in:1.592 Thu Nov 10 03:06:08 2005 +++ php-src/configure.inThu Nov 17 17:58:07 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.592 2005/11/10 08:06:08 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.593 2005/11/17 22:58:07 helly Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1295,7 +1295,7 @@ if test -r "$abs_srcdir/Zend/zend_objects.c"; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c \ -zend_default_classes.c zend_reflection_api.c) +zend_default_classes.c) fi dnl Selectively disable optimization due to high RAM usage during -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Thu Nov 10 03:06:08 2005 EDT Modified files: /php-srcconfigure.in Log: - Added note about --enable-gcov being strictly for developers only! http://cvs.php.net/diff.php/php-src/configure.in?r1=1.591&r2=1.592&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.591 php-src/configure.in:1.592 --- php-src/configure.in:1.591 Wed Nov 9 14:55:25 2005 +++ php-src/configure.inThu Nov 10 03:06:08 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.591 2005/11/09 19:55:25 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.592 2005/11/10 08:06:08 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -599,7 +599,7 @@ PHP_HELP_SEPARATOR([General settings:]) PHP_ARG_ENABLE(gcov, whether to include gcov symbols, -[ --enable-gcov Enable GCOV code coverage (requires LTP)], no, no) +[ --enable-gcov Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!!], no, no) if test "$PHP_GCOV" = "yes"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Sun Nov 6 17:44:06 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
- Do the LTP thing properly
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.589&r2=1.590&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.589 php-src/configure.in:1.590
--- php-src/configure.in:1.589 Wed Oct 19 20:18:23 2005
+++ php-src/configure.inSun Nov 6 17:44:05 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.589 2005/10/20 00:18:23 john Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.590 2005/11/06 22:44:05 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -597,56 +597,65 @@
PHP_CONFIGURE_PART(General settings)
PHP_HELP_SEPARATOR([General settings:])
+
PHP_ARG_ENABLE(gcov, whether to include gcov symbols,
[ --enable-gcov Enable GCOV code coverage (requires LTP)], no, no)
if test "$PHP_GCOV" = "yes"; then
- AC_DEFUN([PHP_PROG_LTP],[
-ltp_version_list="1.4"
+ if test "$GCC" != "yes"; then
+AC_MSG_ERROR([GCC is required to be able use --enable-gcov])
+ fi
+
+ dnl Check if we can pass GCC the --ccache-disable option
+ PHP_CHECK_GCC_ARG([--ccache-disable], [CC="$CC --ccache-disable"])
-AC_CHECK_PROG(LTP, lcov, lcov)
-AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
-if test "$LTP"; then
- AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [
-php_cv_ltp_version=invalid
-ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'`
-for ltp_check_version in $ltp_version_list; do
- if test "$ltp_version" = "$ltp_check_version"; then
-php_cv_ltp_version="$ltp_check_version (ok)"
- fi
-done
- ])
-else
- ltp_msg="To enable code coverage reporting you must have one of the
following LTP versions installed: $ltp_version_list"
+ ltp_version_list="1.4"
+
+ AC_CHECK_PROG(LTP, lcov, lcov)
+ AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
+
+ if test "$LTP"; then
+AC_CACHE_CHECK([for ltp version], php_cv_ltp_version, [
+ php_cv_ltp_version=invalid
+ ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'`
+ for ltp_check_version in $ltp_version_list; do
+if test "$ltp_version" = "$ltp_check_version"; then
+ php_cv_ltp_version="$ltp_check_version (ok)"
+fi
+ done
+])
+ else
+ltp_msg="To enable code coverage reporting you must have one of the
following LTP versions installed: $ltp_version_list"
+AC_MSG_ERROR([$ltp_msg])
+ fi
+
+ case $php_cv_ltp_version in
+""|invalid[)]
+ ltp_msg="You must have one of the following versions of LTP:
$ltp_version_list (found: $ltp_version)."
AC_MSG_ERROR([$ltp_msg])
-fi
+ LTP="exit 0;"
+ ;;
+ esac
-case $php_cv_ltp_version in
- ""|invalid[)]
-ltp_msg="You must have one of the following versions of LTP:
$ltp_version_list (found: $ltp_version)."
-AC_MSG_ERROR([$ltp_msg])
-LTP="exit 0;"
-;;
-esac
+ if test -z "$LTP_GENHTML"; then
+AC_MSG_ERROR([Could not find genhtml from the LTP package])
+ fi
-if test "$LTP_GENHTML" = ""; then
- AC_MSG_ERROR([Could not find genhtml from the LTP package])
-fi
+ PHP_SUBST(LTP)
+ PHP_SUBST(LTP_GENHTML)
-PHP_SUBST(LTP)
-PHP_SUBST(LTP_GENHTML)
- ])
+ PHP_ADD_LIBRARY(gcov)
+ AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
+ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov, $abs_srcdir)
+
+ dnl Remove all optimization flags from CFLAGS
+ changequote({,})
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+ changequote([,])
- PHP_PROG_LTP
- AC_CHECK_LIB(gcov, __gcov_open, [
-PHP_ADD_LIBRARY(gcov)
-AC_DEFINE(HAVE_GCOV, 1, [Whether you have gcov])
-CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.gcov,$abs_srcdir)
- ], [
-AC_MSG_ERROR([Problem with enabling gcov. Please check config.log for
details.])
- ])
+ dnl Add the special gcc flags
+ CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
fi
PHP_ARG_ENABLE(debug, whether to include debugging symbols,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in
On Tue, 13 Sep 2005, Andrei Zmievski wrote: > WTF do you mean, optional? He prefers 1s of #ifdefs... Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Tue Sep 13 17:40:34 2005 EDT Modified files: /php-srcconfigure.in Log: ext/oracle is no more http://cvs.php.net/diff.php/php-src/configure.in?r1=1.587&r2=1.588&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.587 php-src/configure.in:1.588 --- php-src/configure.in:1.587 Tue Sep 13 05:50:53 2005 +++ php-src/configure.inTue Sep 13 17:40:33 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.587 2005/09/13 09:50:53 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.588 2005/09/13 21:40:33 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1358,7 +1358,7 @@ fi # Warn about linking Apache with libpthread if oci8 extension is enabled on linux. - if test "$PHP_OCI8" != "no" -o "$PHP_ORACLE" != "no"; then + if test "$PHP_OCI8" != "no"; then if test "$PHP_SAPI" = "apache"; then if test `uname` = "Linux"; then cat
Re: [PHP-CVS] cvs: php-src / configure.in
WTF do you mean, optional?
-Andrei
On Sep 13, 2005, at 2:50 AM, Jani Taskinen wrote:
sniper Tue Sep 13 05:50:59 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
Cleanup the configure mess, preparing for making unicode OPTIONAL
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.586&r2=1.587&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.586 php-src/configure.in:1.587
--- php-src/configure.in:1.586 Mon Aug 15 19:36:52 2005
+++ php-src/configure.inTue Sep 13 05:50:53 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.586 2005/08/15 23:36:52 sniper Exp $ -*-
autoconf -*-
+ ## $Id: configure.in,v 1.587 2005/09/13 09:50:53 sniper Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -765,45 +765,57 @@
AC_MSG_RESULT([$PHP_VERSIONING])
dnl ## check for ICU library location
-dnl ## until we bundle it
-PHP_ARG_WITH(icu-dir,[location of ICU headers and libraries],
-[ --with-icu-dir=DIR Specify where ICU libraries and headers
can be found], DEFAULT, no)
+AC_MSG_CHECKING([for location of ICU headers and libraries])
+AC_ARG_WITH(icu-dir,
+[ --with-icu-dir=DIR Specify where ICU libraries and headers
can be found],
+[
+ if test "x$withval" != "xyes"; then
+PHP_ICU_DIR=$withval
+ else
+PHP_ICU_DIR=DEFAULT
+ fi
+], [
+ PHP_ICU_DIR=DEFAULT
+])
+
if test "$PHP_ICU_DIR" = "DEFAULT"; then
- AC_MSG_CHECKING(for ICU in default path)
- for i in /usr/local /usr; do
-if test -r $i/include/unicode/utypes.h; then
- ICU_DIR=$i
- AC_MSG_RESULT(found in $i)
- break
+ ICU_CONFIG=icu-config
+ for i in /usr/local/bin /usr/bin; do
+if test -x "$i/icu-config"; then
+ ICU_CONFIG=$i/icu-config
+ break;
fi
done
else
- if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
-ICU_DIR=$PHP_ICU_DIR
- fi
+ ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
fi
-if test -z "$ICU_DIR"; then
- AC_MSG_RESULT(not found)
- AC_MSG_ERROR([Please specify where ICU libraries and header file
are located])
-fi
-ICU_CONFIG="icu-config"
-if ! test -x "$ICU_DIR/bin/$ICU_CONFIG"; then
- AC_MSG_ERROR([$ICU_CONFIG not found.])
-elif ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
- ICU_CONFIG=${ICU_DIR}/bin/icu-config
-fi
-AC_MSG_CHECKING(for ICU 3.4 or greater)
-icu_version_full=`$ICU_CONFIG --version`
-icu_version=`echo ${icu_version_full} | awk 'BEGIN { FS = "."; } {
printf "%d", ($1 * 1000 + $2) ;}'`
-if test "$icu_version" -ge 3004; then
- AC_MSG_RESULT($icu_version_full found)
- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+
+dnl Trust icu-config to know better what the install prefix is..
+icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
+if test -z "$icu_install_prefix"; then
+ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([Please specify the correct ICU install prefix.])
else
- AC_MSG_ERROR(ICU version 3.4 or later is required,
$icu_full_version found)
+ AC_MSG_RESULT([found in $icu_install_prefix])
+
+ dnl Check ICU version
+ AC_MSG_CHECKING([for ICU 3.4 or greater])
+ icu_version_full=`$ICU_CONFIG --version`
+ ac_IFS=$IFS
+ IFS="."
+ set $icu_version_full
+ IFS=$ac_IFS
+ icu_version=`expr [$]1 \* 1000 + [$]2`
+ AC_MSG_RESULT([found $icu_version_full])
+ if test "$icu_version" -lt "3004"; then
+AC_MSG_ERROR([ICU version 3.4 or later is required])
+ fi
+
+ ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
+ ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+ PHP_EVAL_INCLINE($ICU_INCS)
+ PHP_EVAL_LIBLINE($ICU_LIBS)
fi
-PHP_ADD_INCLUDE($ICU_DIR/include)
-PHP_EVAL_LIBLINE($ICU_LIBS, ICU_SHARED_LIBADD)
-PHP_SUBST(ICU_SHARED_LIBADD)
divert(5)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Tue Sep 13 05:50:59 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
Cleanup the configure mess, preparing for making unicode OPTIONAL
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.586&r2=1.587&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.586 php-src/configure.in:1.587
--- php-src/configure.in:1.586 Mon Aug 15 19:36:52 2005
+++ php-src/configure.inTue Sep 13 05:50:53 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.586 2005/08/15 23:36:52 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.587 2005/09/13 09:50:53 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -765,45 +765,57 @@
AC_MSG_RESULT([$PHP_VERSIONING])
dnl ## check for ICU library location
-dnl ## until we bundle it
-PHP_ARG_WITH(icu-dir,[location of ICU headers and libraries],
-[ --with-icu-dir=DIR Specify where ICU libraries and headers can be
found], DEFAULT, no)
+AC_MSG_CHECKING([for location of ICU headers and libraries])
+AC_ARG_WITH(icu-dir,
+[ --with-icu-dir=DIR Specify where ICU libraries and headers can be
found],
+[
+ if test "x$withval" != "xyes"; then
+PHP_ICU_DIR=$withval
+ else
+PHP_ICU_DIR=DEFAULT
+ fi
+], [
+ PHP_ICU_DIR=DEFAULT
+])
+
if test "$PHP_ICU_DIR" = "DEFAULT"; then
- AC_MSG_CHECKING(for ICU in default path)
- for i in /usr/local /usr; do
-if test -r $i/include/unicode/utypes.h; then
- ICU_DIR=$i
- AC_MSG_RESULT(found in $i)
- break
+ ICU_CONFIG=icu-config
+ for i in /usr/local/bin /usr/bin; do
+if test -x "$i/icu-config"; then
+ ICU_CONFIG=$i/icu-config
+ break;
fi
done
else
- if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
-ICU_DIR=$PHP_ICU_DIR
- fi
+ ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
fi
-if test -z "$ICU_DIR"; then
- AC_MSG_RESULT(not found)
- AC_MSG_ERROR([Please specify where ICU libraries and header file are
located])
-fi
-ICU_CONFIG="icu-config"
-if ! test -x "$ICU_DIR/bin/$ICU_CONFIG"; then
- AC_MSG_ERROR([$ICU_CONFIG not found.])
-elif ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
- ICU_CONFIG=${ICU_DIR}/bin/icu-config
-fi
-AC_MSG_CHECKING(for ICU 3.4 or greater)
-icu_version_full=`$ICU_CONFIG --version`
-icu_version=`echo ${icu_version_full} | awk 'BEGIN { FS = "."; } { printf
"%d", ($1 * 1000 + $2) ;}'`
-if test "$icu_version" -ge 3004; then
- AC_MSG_RESULT($icu_version_full found)
- ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+
+dnl Trust icu-config to know better what the install prefix is..
+icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
+if test -z "$icu_install_prefix"; then
+ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([Please specify the correct ICU install prefix.])
else
- AC_MSG_ERROR(ICU version 3.4 or later is required, $icu_full_version found)
+ AC_MSG_RESULT([found in $icu_install_prefix])
+
+ dnl Check ICU version
+ AC_MSG_CHECKING([for ICU 3.4 or greater])
+ icu_version_full=`$ICU_CONFIG --version`
+ ac_IFS=$IFS
+ IFS="."
+ set $icu_version_full
+ IFS=$ac_IFS
+ icu_version=`expr [$]1 \* 1000 + [$]2`
+ AC_MSG_RESULT([found $icu_version_full])
+ if test "$icu_version" -lt "3004"; then
+AC_MSG_ERROR([ICU version 3.4 or later is required])
+ fi
+
+ ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
+ ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+ PHP_EVAL_INCLINE($ICU_INCS)
+ PHP_EVAL_LIBLINE($ICU_LIBS)
fi
-PHP_ADD_INCLUDE($ICU_DIR/include)
-PHP_EVAL_LIBLINE($ICU_LIBS, ICU_SHARED_LIBADD)
-PHP_SUBST(ICU_SHARED_LIBADD)
divert(5)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Mon Aug 15 19:36:53 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
Fail gracefully if icu-config is not found
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.585&r2=1.586&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.585 php-src/configure.in:1.586
--- php-src/configure.in:1.585 Mon Aug 15 18:30:38 2005
+++ php-src/configure.inMon Aug 15 19:36:52 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.585 2005/08/15 22:30:38 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.586 2005/08/15 23:36:52 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -784,13 +784,14 @@
fi
if test -z "$ICU_DIR"; then
AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Please specify where ICU libraries and header file are located)
+ AC_MSG_ERROR([Please specify where ICU libraries and header file are
located])
fi
ICU_CONFIG="icu-config"
-if ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
+if ! test -x "$ICU_DIR/bin/$ICU_CONFIG"; then
+ AC_MSG_ERROR([$ICU_CONFIG not found.])
+elif ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
ICU_CONFIG=${ICU_DIR}/bin/icu-config
fi
-
AC_MSG_CHECKING(for ICU 3.4 or greater)
icu_version_full=`$ICU_CONFIG --version`
icu_version=`echo ${icu_version_full} | awk 'BEGIN { FS = "."; } { printf
"%d", ($1 * 1000 + $2) ;}'`
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Fri Aug 12 05:05:25 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
more tabs
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.583&r2=1.584&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.583 php-src/configure.in:1.584
--- php-src/configure.in:1.583 Thu Aug 11 20:15:03 2005
+++ php-src/configure.inFri Aug 12 05:05:21 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.583 2005/08/12 00:15:03 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.584 2005/08/12 09:05:21 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -788,7 +788,7 @@
fi
ICU_CONFIG="icu-config"
if ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
- ICU_CONFIG=${ICU_DIR}/bin/icu-config
+ ICU_CONFIG=${ICU_DIR}/bin/icu-config
fi
AC_MSG_CHECKING(for ICU 3.4 or greater)
@@ -804,7 +804,6 @@
PHP_EVAL_LIBLINE($ICU_LIBS, ICU_SHARED_LIBADD)
PHP_SUBST(ICU_SHARED_LIBADD)
-
divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Thu Aug 11 20:15:08 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
No tabs in config* files!
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.582&r2=1.583&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.582 php-src/configure.in:1.583
--- php-src/configure.in:1.582 Thu Aug 11 20:10:26 2005
+++ php-src/configure.inThu Aug 11 20:15:03 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.582 2005/08/12 00:10:26 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.583 2005/08/12 00:15:03 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -769,27 +769,28 @@
PHP_ARG_WITH(icu-dir,[location of ICU headers and libraries],
[ --with-icu-dir=DIR Specify where ICU libraries and headers can be
found], DEFAULT, no)
if test "$PHP_ICU_DIR" = "DEFAULT"; then
-AC_MSG_CHECKING(for ICU in default path)
-for i in /usr/local /usr; do
- if test -r $i/include/unicode/utypes.h; then
-ICU_DIR=$i
-AC_MSG_RESULT(found in $i)
-break
- fi
-done
+ AC_MSG_CHECKING(for ICU in default path)
+ for i in /usr/local /usr; do
+if test -r $i/include/unicode/utypes.h; then
+ ICU_DIR=$i
+ AC_MSG_RESULT(found in $i)
+ break
+fi
+ done
else
- if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
-ICU_DIR=$PHP_ICU_DIR
- fi
+ if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
+ICU_DIR=$PHP_ICU_DIR
+ fi
fi
if test -z "$ICU_DIR"; then
-AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Please specify where ICU libraries and header file are
located)
+ AC_MSG_RESULT(not found)
+ AC_MSG_ERROR(Please specify where ICU libraries and header file are located)
fi
ICU_CONFIG="icu-config"
if ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
ICU_CONFIG=${ICU_DIR}/bin/icu-config
fi
+
AC_MSG_CHECKING(for ICU 3.4 or greater)
icu_version_full=`$ICU_CONFIG --version`
icu_version=`echo ${icu_version_full} | awk 'BEGIN { FS = "."; } { printf
"%d", ($1 * 1000 + $2) ;}'`
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php.h php_version.h ZendEngine2 zend_extensions.h zend_modules.h
derick Tue Aug 9 04:47:58 2005 EDT
Modified files:
/php-srcconfigure.in
/ZendEngine2zend_extensions.h zend_modules.h
/php-src/main php.h php_version.h
Log:
- Changing the API numbers, which might be a bit premature, but it allows
to differentiate between different branches.
- Bumbed the version number to 6.0.0-dev. I know we didn't discuss this yet,
but I feel it should be 6.0. See mail to the mailinglist.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579&r2=1.580&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579 php-src/configure.in:1.580
--- php-src/configure.in:1.579 Mon Aug 8 12:06:47 2005
+++ php-src/configure.inTue Aug 9 04:47:52 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579 2005/08/08 16:06:47 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.580 2005/08/09 08:47:52 derick Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -39,8 +39,8 @@
AC_CONFIG_HEADER(main/php_config.h)
-MAJOR_VERSION=5
-MINOR_VERSION=1
+MAJOR_VERSION=6
+MINOR_VERSION=0
RELEASE_VERSION=0
EXTRA_VERSION="-dev"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
http://cvs.php.net/diff.php/ZendEngine2/zend_extensions.h?r1=1.67&r2=1.68&ty=u
Index: ZendEngine2/zend_extensions.h
diff -u ZendEngine2/zend_extensions.h:1.67 ZendEngine2/zend_extensions.h:1.68
--- ZendEngine2/zend_extensions.h:1.67 Wed Aug 3 09:30:52 2005
+++ ZendEngine2/zend_extensions.h Tue Aug 9 04:47:55 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_extensions.h,v 1.67 2005/08/03 13:30:52 sniper Exp $ */
+/* $Id: zend_extensions.h,v 1.68 2005/08/09 08:47:55 derick Exp $ */
#ifndef ZEND_EXTENSIONS_H
#define ZEND_EXTENSIONS_H
@@ -27,7 +27,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2 API no. is always greater than engine 1 API no..
*/
-#define ZEND_EXTENSION_API_NO 220050617
+#define ZEND_EXTENSION_API_NO 220050809
typedef struct _zend_extension_version_info {
int zend_extension_api_no;
http://cvs.php.net/diff.php/ZendEngine2/zend_modules.h?r1=1.67&r2=1.68&ty=u
Index: ZendEngine2/zend_modules.h
diff -u ZendEngine2/zend_modules.h:1.67 ZendEngine2/zend_modules.h:1.68
--- ZendEngine2/zend_modules.h:1.67 Wed Aug 3 09:30:55 2005
+++ ZendEngine2/zend_modules.h Tue Aug 9 04:47:56 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_modules.h,v 1.67 2005/08/03 13:30:55 sniper Exp $ */
+/* $Id: zend_modules.h,v 1.68 2005/08/09 08:47:56 derick Exp $ */
#ifndef MODULES_H
#define MODULES_H
@@ -38,7 +38,7 @@
extern struct _zend_arg_info fourth_arg_force_ref[5];
extern struct _zend_arg_info all_args_by_ref[1];
-#define ZEND_MODULE_API_NO 20050617
+#define ZEND_MODULE_API_NO 20050809
#ifdef ZTS
#define USING_ZTS 1
#else
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.221&r2=1.222&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221 php-src/main/php.h:1.222
--- php-src/main/php.h:1.221Sun Aug 7 11:13:50 2005
+++ php-src/main/php.h Tue Aug 9 04:47:57 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php.h,v 1.221 2005/08/07 15:13:50 hholzgra Exp $ */
+/* $Id: php.h,v 1.222 2005/08/09 08:47:57 derick Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -26,7 +26,7 @@
#include
#endif
-#define PHP_API_VERSION 20041225
+#define PHP_API_VERSION 20050809
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.112&r2=1.113&ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112 php-src/main/php_version.h:1.113
--- php-src/main/php_version.h:1.112Thu Jul 14 10:01:02 2005
+++ php-src/main/php_version.h Tue Aug 9 04:47:58 2005
@@ -1,7 +1,7 @@
/* automatically generated by configure */
/* edit configure.in to change version number */
-#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 1
+#define PHP_MAJOR_VERSION 6
+#define PHP_MINOR_VERSION 0
#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.1.0-dev"
+#define PHP_VERSION "6.0.0-dev"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Wed Jul 27 11:24:42 2005 EDT Modified files: /php-srcconfigure.in Log: ws http://cvs.php.net/diff.php/php-src/configure.in?r1=1.576&r2=1.577&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.576 php-src/configure.in:1.577 --- php-src/configure.in:1.576 Wed Jul 27 07:48:14 2005 +++ php-src/configure.inWed Jul 27 11:24:36 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.576 2005/07/27 11:48:14 hyanantha Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.577 2005/07/27 15:24:36 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -640,7 +640,7 @@ PHP_ARG_WITH(config-file-scan-dir,[directory to be scanned for configuration files], [ --with-config-file-scan-dir=PATH ], DEFAULT, no) if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then - PHP_CONFIG_FILE_SCAN_DIR="" + PHP_CONFIG_FILE_SCAN_DIR= fi test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" @@ -1044,20 +1044,22 @@ PHP_BUILD_DATE=`date '+%Y-%m-%d'` AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) + case $host_alias in *netware*) -PHP_OS="NetWare" -PHP_UNAME="NetWare" -AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host]) -AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) -;; + PHP_OS="NetWare" + PHP_UNAME="NetWare" + AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host]) + AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) + ;; *) -PHP_UNAME=`uname -a | xargs` -AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) -PHP_OS=`uname | xargs` -AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) -;; + PHP_UNAME=`uname -a | xargs` + AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) + PHP_OS=`uname | xargs` + AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) + ;; esac + if test "$PHP_SAPI_CLI" != "no"; then PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" PHP_INSTALL_CLI_TARGET="install-cli" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
hyanantha Wed Jul 27 07:48:15 2005 EDT Modified files: /php-srcconfigure.in Log: configure.in moved the PHP_OS and PHP_UNAME definitions near the place other oses define them currently it is ggeting redined to build machine values when ./configure script is generated using autoconf version 2.13 but works fine with autoconf 2.51. Defining the default EXTENSION_DIR for NetWare --Kamesh http://cvs.php.net/diff.php/php-src/configure.in?r1=1.575&r2=1.576&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.575 php-src/configure.in:1.576 --- php-src/configure.in:1.575 Thu Jul 14 10:00:57 2005 +++ php-src/configure.inWed Jul 27 07:48:14 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.575 2005/07/14 14:00:57 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.576 2005/07/27 11:48:14 hyanantha Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -178,14 +178,11 @@ fi ;; *netware*) -PHP_OS="NetWare" -PHP_UNAME="NetWare" -AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host]) -AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) PHP_BUILD_PROGRAM PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS) PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS) PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) +EXTENSION_DIR=sys:/php$MAJOR_VERSION/ext PHP_SUBST(PHP5LIB_SHARED_LIBADD) PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware) ;; @@ -1047,11 +1044,20 @@ PHP_BUILD_DATE=`date '+%Y-%m-%d'` AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) -PHP_UNAME=`uname -a | xargs` -AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) -PHP_OS=`uname | xargs` -AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) - +case $host_alias in +*netware*) +PHP_OS="NetWare" +PHP_UNAME="NetWare" +AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host]) +AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) +;; +*) +PHP_UNAME=`uname -a | xargs` +AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) +PHP_OS=`uname | xargs` +AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) +;; +esac if test "$PHP_SAPI_CLI" != "no"; then PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" PHP_INSTALL_CLI_TARGET="install-cli" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiThu Jul 14 10:01:02 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to -dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.574&r2=1.575&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.574 php-src/configure.in:1.575 --- php-src/configure.in:1.574 Thu Jul 14 09:44:03 2005 +++ php-src/configure.inThu Jul 14 10:00:57 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.574 2005/07/14 13:44:03 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.575 2005/07/14 14:00:57 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="b3" +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.291&r2=1.292&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.291 ZendEngine2/zend.h:1.292 --- ZendEngine2/zend.h:1.291Thu Jul 14 09:44:03 2005 +++ ZendEngine2/zend.h Thu Jul 14 10:01:02 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.291 2005/07/14 13:44:03 andi Exp $ */ +/* $Id: zend.h,v 1.292 2005/07/14 14:01:02 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0b3" +#define ZEND_VERSION "2.1.0-dev" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.111&r2=1.112&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.111 php-src/main/php_version.h:1.112 --- php-src/main/php_version.h:1.111Thu Jul 14 09:44:03 2005 +++ php-src/main/php_version.h Thu Jul 14 10:01:02 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b3" -#define PHP_VERSION "5.1.0b3" +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.1.0-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiTue Jul 12 16:25:28 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to -dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.571&r2=1.572&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.571 php-src/configure.in:1.572 --- php-src/configure.in:1.571 Tue Jul 12 15:59:51 2005 +++ php-src/configure.inTue Jul 12 16:25:27 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.571 2005/07/12 19:59:51 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.572 2005/07/12 20:25:27 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="b3" +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.289&r2=1.290&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.289 ZendEngine2/zend.h:1.290 --- ZendEngine2/zend.h:1.289Tue Jul 12 15:59:52 2005 +++ ZendEngine2/zend.h Tue Jul 12 16:25:28 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.289 2005/07/12 19:59:52 andi Exp $ */ +/* $Id: zend.h,v 1.290 2005/07/12 20:25:28 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0b3" +#define ZEND_VERSION "2.1.0-dev" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.109&r2=1.110&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.109 php-src/main/php_version.h:1.110 --- php-src/main/php_version.h:1.109Tue Jul 12 15:59:52 2005 +++ php-src/main/php_version.h Tue Jul 12 16:25:28 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b3" -#define PHP_VERSION "5.1.0b3" +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.1.0-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiTue Jul 12 15:59:53 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Beta 3 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.570&r2=1.571&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.570 php-src/configure.in:1.571 --- php-src/configure.in:1.570 Thu Jun 23 00:20:47 2005 +++ php-src/configure.inTue Jul 12 15:59:51 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.570 2005/06/23 04:20:47 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.571 2005/07/12 19:59:51 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="-dev" +EXTRA_VERSION="b3" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.288&r2=1.289&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.288 ZendEngine2/zend.h:1.289 --- ZendEngine2/zend.h:1.288Thu Jul 7 12:07:08 2005 +++ ZendEngine2/zend.h Tue Jul 12 15:59:52 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.288 2005/07/07 16:07:08 dmitry Exp $ */ +/* $Id: zend.h,v 1.289 2005/07/12 19:59:52 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0-dev" +#define ZEND_VERSION "2.1.0b3" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.108&r2=1.109&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.108 php-src/main/php_version.h:1.109 --- php-src/main/php_version.h:1.108Thu Jun 23 00:20:49 2005 +++ php-src/main/php_version.h Tue Jul 12 15:59:52 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.1.0-dev" +#define PHP_EXTRA_VERSION "b3" +#define PHP_VERSION "5.1.0b3" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiWed Jun 22 23:56:38 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Beta 2 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.568&r2=1.569&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.568 php-src/configure.in:1.569 --- php-src/configure.in:1.568 Tue Jun 21 12:31:15 2005 +++ php-src/configure.inWed Jun 22 23:56:37 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.568 2005/06/21 16:31:15 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.569 2005/06/23 03:56:37 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="-dev" +EXTRA_VERSION="b2" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.285&r2=1.286&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.285 ZendEngine2/zend.h:1.286 --- ZendEngine2/zend.h:1.285Tue Jun 21 12:31:19 2005 +++ ZendEngine2/zend.h Wed Jun 22 23:56:37 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.285 2005/06/21 16:31:19 andi Exp $ */ +/* $Id: zend.h,v 1.286 2005/06/23 03:56:37 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0-dev" +#define ZEND_VERSION "2.1.0b2" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.106&r2=1.107&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.106 php-src/main/php_version.h:1.107 --- php-src/main/php_version.h:1.106Tue Jun 21 12:31:19 2005 +++ php-src/main/php_version.h Wed Jun 22 23:56:37 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.1.0-dev" +#define PHP_EXTRA_VERSION "b2" +#define PHP_VERSION "5.1.0b2" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiTue Jun 21 12:31:19 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to -dev. Guys (n' Girls), give at least 1 hour before you start - complaining about not going back to -dev. I like checking the tarball - before I change it back. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.567&r2=1.568&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.567 php-src/configure.in:1.568 --- php-src/configure.in:1.567 Tue Jun 21 11:44:50 2005 +++ php-src/configure.inTue Jun 21 12:31:15 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.567 2005/06/21 15:44:50 andi Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.568 2005/06/21 16:31:15 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="b2" +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.284&r2=1.285&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.284 ZendEngine2/zend.h:1.285 --- ZendEngine2/zend.h:1.284Tue Jun 21 11:44:50 2005 +++ ZendEngine2/zend.h Tue Jun 21 12:31:19 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.284 2005/06/21 15:44:50 andi Exp $ */ +/* $Id: zend.h,v 1.285 2005/06/21 16:31:19 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0b2" +#define ZEND_VERSION "2.1.0-dev" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.105&r2=1.106&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.105 php-src/main/php_version.h:1.106 --- php-src/main/php_version.h:1.105Tue Jun 21 11:44:50 2005 +++ php-src/main/php_version.h Tue Jun 21 12:31:19 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b2" -#define PHP_VERSION "5.1.0b2" +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.1.0-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiSat Jun 11 13:03:43 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to -dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.562&r2=1.563&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.562 php-src/configure.in:1.563 --- php-src/configure.in:1.562 Sat Jun 11 12:59:22 2005 +++ php-src/configure.inSat Jun 11 13:03:41 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.562 2005/06/11 16:59:22 andi Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.563 2005/06/11 17:03:41 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="b2" +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.277&r2=1.278&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.277 ZendEngine2/zend.h:1.278 --- ZendEngine2/zend.h:1.277Sat Jun 11 12:59:24 2005 +++ ZendEngine2/zend.h Sat Jun 11 13:03:42 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.277 2005/06/11 16:59:24 andi Exp $ */ +/* $Id: zend.h,v 1.278 2005/06/11 17:03:42 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0b2" +#define ZEND_VERSION "2.1.0-dev" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.101&r2=1.102&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.101 php-src/main/php_version.h:1.102 --- php-src/main/php_version.h:1.101Sat Jun 11 12:59:24 2005 +++ php-src/main/php_version.h Sat Jun 11 13:03:42 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b2" -#define PHP_VERSION "5.1.0b2" +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.1.0-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
Hello Andi, i thought we were fixing the return at c-level first so that we can fix/finalize interface ArrayAccess? marcus Friday, June 10, 2005, 8:06:43 PM, you wrote: > andiFri Jun 10 14:06:43 2005 EDT > Modified files: > /php-srcconfigure.in > /ZendEngine2zend.h > /php-src/main php_version.h > Log: > - Go with 5.1.0b1 > http://cvs.php.net/diff.php/php-src/configure.in?r1=1.559&r2=1.560&ty=u > Index: php-src/configure.in > diff -u php-src/configure.in:1.559 php-src/configure.in:1.560 > --- php-src/configure.in:1.559 Tue Jun 7 13:22:39 2005 > +++ php-src/configure.inFri Jun 10 14:06:42 2005 > @@ -1,4 +1,4 @@ > -dnl ## $Id: configure.in,v 1.559 2005/06/07 17:22:39 sniper Exp $ -*- > autoconf -*- > +dnl ## $Id: configure.in,v 1.560 2005/06/10 18:06:42 andi Exp $ -*- autoconf > -*- > dnl ## Process this file with autoconf to produce a configure script. > divert(1) > @@ -42,7 +42,7 @@ > MAJOR_VERSION=5 > MINOR_VERSION=1 > RELEASE_VERSION=0 > -EXTRA_VERSION="-dev" > +EXTRA_VERSION="b1" > VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" > dnl Define where extension directories are located in the configure context > http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.274&r2=1.275&ty=u > Index: ZendEngine2/zend.h > diff -u ZendEngine2/zend.h:1.274 ZendEngine2/zend.h:1.275 > --- ZendEngine2/zend.h:1.274Mon Mar 7 17:23:13 2005 > +++ ZendEngine2/zend.h Fri Jun 10 14:06:42 2005 > @@ -17,12 +17,12 @@ > > +--+ > */ > -/* $Id: zend.h,v 1.274 2005/03/07 22:23:13 helly Exp $ */ > +/* $Id: zend.h,v 1.275 2005/06/10 18:06:42 andi Exp $ */ > #ifndef ZEND_H > #define ZEND_H > -#define ZEND_VERSION "2.1.0-dev" > +#define ZEND_VERSION "2.1.0b1" > #define ZEND_ENGINE_2 > http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.98&r2=1.99&ty=u > Index: php-src/main/php_version.h > diff -u php-src/main/php_version.h:1.98 php-src/main/php_version.h:1.99 > --- php-src/main/php_version.h:1.98 Wed Jul 21 19:02:28 2004 > +++ php-src/main/php_version.h Fri Jun 10 14:06:43 2005 > @@ -3,5 +3,5 @@ > #define PHP_MAJOR_VERSION 5 > #define PHP_MINOR_VERSION 1 > #define PHP_RELEASE_VERSION 0 > -#define PHP_EXTRA_VERSION "-dev" > -#define PHP_VERSION "5.1.0-dev" > +#define PHP_EXTRA_VERSION "b1" > +#define PHP_VERSION "5.1.0b1" -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiFri Jun 10 14:29:12 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Back to -dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.560&r2=1.561&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.560 php-src/configure.in:1.561 --- php-src/configure.in:1.560 Fri Jun 10 14:06:42 2005 +++ php-src/configure.inFri Jun 10 14:29:05 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.560 2005/06/10 18:06:42 andi Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.561 2005/06/10 18:29:05 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="b1" +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.275&r2=1.276&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.275 ZendEngine2/zend.h:1.276 --- ZendEngine2/zend.h:1.275Fri Jun 10 14:06:42 2005 +++ ZendEngine2/zend.h Fri Jun 10 14:29:10 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.275 2005/06/10 18:06:42 andi Exp $ */ +/* $Id: zend.h,v 1.276 2005/06/10 18:29:10 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0b1" +#define ZEND_VERSION "2.1.0-dev" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.99&r2=1.100&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.99 php-src/main/php_version.h:1.100 --- php-src/main/php_version.h:1.99 Fri Jun 10 14:06:43 2005 +++ php-src/main/php_version.h Fri Jun 10 14:29:10 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "b1" -#define PHP_VERSION "5.1.0b1" +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.1.0-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h ZendEngine2 zend.h
andiFri Jun 10 14:06:43 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend.h /php-src/main php_version.h Log: - Go with 5.1.0b1 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.559&r2=1.560&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.559 php-src/configure.in:1.560 --- php-src/configure.in:1.559 Tue Jun 7 13:22:39 2005 +++ php-src/configure.inFri Jun 10 14:06:42 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.559 2005/06/07 17:22:39 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.560 2005/06/10 18:06:42 andi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION="-dev" +EXTRA_VERSION="b1" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.274&r2=1.275&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.274 ZendEngine2/zend.h:1.275 --- ZendEngine2/zend.h:1.274Mon Mar 7 17:23:13 2005 +++ ZendEngine2/zend.h Fri Jun 10 14:06:42 2005 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.274 2005/03/07 22:23:13 helly Exp $ */ +/* $Id: zend.h,v 1.275 2005/06/10 18:06:42 andi Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "2.1.0-dev" +#define ZEND_VERSION "2.1.0b1" #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.98&r2=1.99&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.98 php-src/main/php_version.h:1.99 --- php-src/main/php_version.h:1.98 Wed Jul 21 19:02:28 2004 +++ php-src/main/php_version.h Fri Jun 10 14:06:43 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.1.0-dev" +#define PHP_EXTRA_VERSION "b1" +#define PHP_VERSION "5.1.0b1" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/standard info.c ZendEngine2 zend_alloc.h
derick Tue Jun 7 09:36:09 2005 EDT Modified files: /php-srcconfigure.in /ZendEngine2zend_alloc.h /php-src/ext/standard info.c Log: - Added the --disable-zend-memory-manager switch to disable the Zend memory manager. #- I discussed this with Dmitry today - we found it useful. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.557&r2=1.558&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.557 php-src/configure.in:1.558 --- php-src/configure.in:1.557 Thu Jun 2 17:29:24 2005 +++ php-src/configure.inTue Jun 7 09:36:06 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.557 2005/06/02 21:29:24 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.558 2005/06/07 13:36:06 derick Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -623,6 +623,16 @@ ZEND_DEBUG=no fi +PHP_ARG_ENABLE(zend-memory-manager,whether to enable the Zend memory manager, +[ --disable-zend-memory-manager + Disable the Zend memory manager (DEVELOPERS ONLY)],yes, no) + +if test "$PHP_ZEND_MEMORY_MANAGER" = "yes"; then + AC_DEFINE(USE_ZEND_ALLOC, 1, [ ]) +else + AC_DEFINE(USE_ZEND_ALLOC, 0, [ ]) +fi + PHP_ARG_WITH(layout,[layout of installed files], [ --with-layout=TYPE Set how installed files will be laid out. Type is one of "PHP" or "GNU" [TYPE=PHP]], PHP, no) http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.h?r1=1.61&r2=1.62&ty=u Index: ZendEngine2/zend_alloc.h diff -u ZendEngine2/zend_alloc.h:1.61 ZendEngine2/zend_alloc.h:1.62 --- ZendEngine2/zend_alloc.h:1.61 Thu Apr 7 16:15:21 2005 +++ ZendEngine2/zend_alloc.hTue Jun 7 09:36:08 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_alloc.h,v 1.61 2005/04/07 20:15:21 sniper Exp $ */ +/* $Id: zend_alloc.h,v 1.62 2005/06/07 13:36:08 derick Exp $ */ #ifndef ZEND_ALLOC_H #define ZEND_ALLOC_H @@ -85,8 +85,6 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; -#define USE_ZEND_ALLOC 1 - #if USE_ZEND_ALLOC /* Standard wrapper macros */ http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.247&r2=1.248&ty=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.247 php-src/ext/standard/info.c:1.248 --- php-src/ext/standard/info.c:1.247 Sun May 8 13:24:38 2005 +++ php-src/ext/standard/info.c Tue Jun 7 09:36:08 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: info.c,v 1.247 2005/05/08 17:24:38 rasmus Exp $ */ +/* $Id: info.c,v 1.248 2005/06/07 13:36:08 derick Exp $ */ #include "php.h" #include "php_ini.h" @@ -469,6 +469,12 @@ php_info_print_table_row(2, "Thread Safety", "disabled" ); #endif +#if USE_ZEND_ALLOC + php_info_print_table_row(2, "Zend Memory Manager", "enabled" ); +#else + php_info_print_table_row(2, "Zend Memory Manager", "disabled" ); +#endif + #if HAVE_IPV6 php_info_print_table_row(2, "IPv6 Support", "enabled" ); #else -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Thu Jun 2 17:29:24 2005 EDT Modified files: /php-srcconfigure.in Log: - Fixed bug #28605 (Need to use -[m]ieee option for Alpha CPUs) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.556&r2=1.557&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.556 php-src/configure.in:1.557 --- php-src/configure.in:1.556 Sun May 29 19:16:39 2005 +++ php-src/configure.inThu Jun 2 17:29:24 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.556 2005/05/29 23:16:39 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.557 2005/06/02 21:29:24 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -143,6 +143,17 @@ dnl Platform-specific compile settings. dnl - +dnl See bug #28605 +case $host_cpu in +alpha*) +if test "$GCC" = "yes"; then + CFLAGS="$CFLAGS -mieee" +else + CFLAGS="$CFLAGS -ieee" +fi +;; +esac + case $host_alias in *solaris*) CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /sapi/cli config.w32 php_cli.c php_cli_readline.c php_cli_readline.h
helly Sat May 14 15:33:18 2005 EDT
Added files:
/php-src/sapi/cli php_cli_readline.c php_cli_readline.h
Modified files:
/php-srcconfigure.in
/php-src/sapi/cli config.w32 php_cli.c
Log:
- Add command completion to CLI's -a mode
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.553&r2=1.554&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.553 php-src/configure.in:1.554
--- php-src/configure.in:1.553 Fri May 6 22:51:50 2005
+++ php-src/configure.inSat May 14 15:33:17 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.553 2005/05/07 02:51:50 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.554 2005/05/14 19:33:17 helly Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1054,7 +1054,7 @@
if test "$PHP_SAPI_CLI" != "no"; then
PHP_CLI_TARGET="\$(SAPI_CLI_PATH)"
PHP_INSTALL_CLI_TARGET="install-cli"
- PHP_ADD_SOURCES(sapi/cli, php_cli.c getopt.c,, cli)
+ PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c getopt.c,, cli)
fi
PHP_SUBST(PHP_CLI_TARGET)
http://cvs.php.net/diff.php/php-src/sapi/cli/config.w32?r1=1.3&r2=1.4&ty=u
Index: php-src/sapi/cli/config.w32
diff -u php-src/sapi/cli/config.w32:1.3 php-src/sapi/cli/config.w32:1.4
--- php-src/sapi/cli/config.w32:1.3 Tue Jan 13 22:14:17 2004
+++ php-src/sapi/cli/config.w32 Sat May 14 15:33:18 2005
@@ -1,18 +1,18 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2004/01/14 03:14:17 wez Exp $
+// $Id: config.w32,v 1.4 2005/05/14 19:33:18 helly Exp $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
ARG_ENABLE('cli-win32', 'Build console-less CLI version of PHP', 'no');
if (PHP_CLI == "yes") {
- SAPI('cli', 'getopt.c php_cli.c', 'php.exe');
+ SAPI('cli', 'getopt.c php_cli.c php_cli_readline.c', 'php.exe');
if (PHP_CRT_DEBUG == "yes") {
ADD_FLAG("CFLAGS_CLI", "/D PHP_WIN32_DEBUG_HEAP");
}
}
if (PHP_CLI_WIN32 == "yes") {
- SAPI('cli_win32', 'getopt.c cli_win32.c', 'php-win.exe');
+ SAPI('cli_win32', 'getopt.c cli_win32.c php_cli_readline.c',
'php-win.exe');
}
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.123&r2=1.124&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.123 php-src/sapi/cli/php_cli.c:1.124
--- php-src/sapi/cli/php_cli.c:1.123Sat May 7 08:24:18 2005
+++ php-src/sapi/cli/php_cli.c Sat May 14 15:33:18 2005
@@ -14,12 +14,13 @@
+--+
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
| Marcus Boerger <[EMAIL PROTECTED]> |
+ | Johannes Schlueter <[EMAIL PROTECTED]>|
| Parts based on CGI SAPI Module by|
| Rasmus Lerdorf, Stig Bakken and Zeev Suraski |
+--+
*/
-/* $Id: php_cli.c,v 1.123 2005/05/07 12:24:18 helly Exp $ */
+/* $Id: php_cli.c,v 1.124 2005/05/14 19:33:18 helly Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -74,7 +75,7 @@
#if !HAVE_LIBEDIT
#include
#endif
-#endif
+#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
#include "zend_compile.h"
#include "zend_execute.h"
@@ -83,6 +84,7 @@
#include "php_getopt.h"
+#include "php_cli_readline.h"
#ifndef O_BINARY
#define O_BINARY 0
@@ -539,216 +541,6 @@
}
/* }}} */
-#if HAVE_LIBREADLINE || HAVE_LIBEDIT
-
-/* {{{ cli_is_valid_code
- */
-typedef enum {
- body,
- sstring,
- dstring,
- sstring_esc,
- dstring_esc,
- comment_line,
- comment_block,
- heredoc_start,
- heredoc,
- outside,
-} php_code_type;
-
-static int cli_is_valid_code(char *code, int len, char **prompt TSRMLS_DC)
-{
- int valid_end = 1;
- int brackets_count = 0;
- int brace_count = 0;
- int i;
- php_code_type code_type = body;
- char *heredoc_tag;
- int heredoc_len;
-
- for (i = 0; i < len; ++i) {
- switch(code_type) {
- default:
- switch(code[i]) {
- case '{':
- brackets_count++;
- valid_end = 0;
- break;
- case '}':
- if (brackets_count > 0) {
- brackets_count--;
- }
- valid_end = brackets_count ? 0
: 1;
- break;
-
[PHP-CVS] cvs: php-src / configure.in /scripts Makefile.frag /scripts/man1 php-config.1.in phpize.1.in
sniper Sat Apr 30 00:27:24 2005 EDT Added files: /php-src/scripts/man1 php-config.1.in phpize.1.in Modified files: /php-srcconfigure.in /php-src/scriptsMakefile.frag Log: - Added man pages for "phpize" and "php-config" scripts. (Jakub Vrana) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.551&r2=1.552&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.551 php-src/configure.in:1.552 --- php-src/configure.in:1.551 Fri Apr 29 21:52:22 2005 +++ php-src/configure.inSat Apr 30 00:27:23 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.551 2005/04/30 01:52:22 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.552 2005/04/30 04:27:23 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1249,9 +1249,11 @@ $php_shtool mkdir -p pear/scripts $php_shtool mkdir -p scripts +$php_shtool mkdir -p scripts/man1 ALL_OUTPUT_FILES="php5.spec main/build-defs.h \ -scripts/phpize scripts/php-config \ +scripts/phpize scripts/man1/phpize.1 \ +scripts/php-config scripts/man1/php-config.1 \ $PHP_OUTPUT_FILES" AC_OUTPUT($ALL_OUTPUT_FILES, [], [ http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.18&r2=1.19&ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.18 php-src/scripts/Makefile.frag:1.19 --- php-src/scripts/Makefile.frag:1.18 Fri Apr 29 22:40:18 2005 +++ php-src/scripts/Makefile.frag Sat Apr 30 00:27:23 2005 @@ -22,6 +22,7 @@ bin_SCRIPTS = phpize php-config bin_src_SCRIPTS = +man_PAGES = phpize.1 php-config.1 install-build: @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" @@ -78,7 +79,13 @@ echo " program: $(program_prefix)$$prog$(program_suffix)"; \ $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - + @echo "Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/" + @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 + @for page in $(man_PAGES); do \ + echo " page: $$page"; \ + $(INSTALL_DATA) $(builddir)/man1/$$page $(INSTALL_ROOT)$(mandir)/man1/$$page; \ + done + $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status (CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status) http://cvs.php.net/co.php/php-src/scripts/man1/php-config.1.in?r=1.1&p=1 Index: php-src/scripts/man1/php-config.1.in +++ php-src/scripts/man1/php-config.1.in../" +--+../" | PHP Version 5|../" +--+../" | Copyright (c) 1997-2004 The PHP Group|../" +--+../" | This source file is subject to version 3.0 of the PHP license, |../" | that is bundled with this package in the file LICENSE, and is|../" | available through the world-wide-web at the following url: |../" | http://www.php.net/license/3_0.txt. |../" | If you did not receive a copy of the PHP license and are unable to |../" | obtain it through the world-wide-web, please send a note to |../" | [EMAIL PROTECTED] so we can mail you a copy immediately. |../" +--+../" | Author: Jakub Vrana <[EMAIL PROTECTED]> |../" +--+../" ../" $Id: php-config.1.in,v 1.1 2005/04/30 04:27:23 sniper Exp $../" ..TH php\-config 1 "Apr 2005" "The PHP Group" "Scripting Language"..SH NAME..TP 15..B php\-config Get information about PHP configuration..SH SYNOPSIS..B php\-config [options]..LP..SH DESCRIPTION..B php\-config is a simple shell script for obtaining information about installed PHP configuration...SH OPTIONS..TP 15..PD 0..B \-\-prefix Directory prefix where PHP is installed, e.g. /usr/local..TP..PD 0..B \-\-includes List of \-I options with all include files..TP..PD 0..B \-\-ldflags LD Flags which PHP was compiled with..TP..PD 0..B \-\-libs Extra libraries which PHP was compiled with..TP..PD 0..B \-\-extension-dir Directory where extensions are searched by default..TP..PD 0..B \-\-version PHP version..TP..PD 1..P..SH SEE ALSO..BR php (1)..SH VERSION INFORMATION This manpage describes \fBphp\fP, version @[EMAIL PROTECTED] COPYRIGHT Copyright \(co 1997\-2005 The PHP Group..LP This source file is subject to version 3.0 of the PHP license, that is bundled with this package in the file LICENSE, and is available through the world-wide-web at.
[PHP-CVS] cvs: php-src / configure.in
sniper Thu Apr 21 11:02:35 2005 EDT Modified files: /php-srcconfigure.in Log: - Allow using --enable-versioning with any SAPI module # It's only used if the php.sym file exists! # Have fun Sara :) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.549&r2=1.550&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.549 php-src/configure.in:1.550 --- php-src/configure.in:1.549 Thu Apr 21 10:57:50 2005 +++ php-src/configure.inThu Apr 21 11:02:34 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.549 2005/04/21 14:57:50 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.550 2005/04/21 15:02:34 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -762,11 +762,7 @@ AC_ARG_ENABLE(versioning, [ --enable-versioning Export only required symbols. See INSTALL for more information], [ - if test "x$APXS" != "x"; then -PHP_VERSIONING=$enableval - else -PHP_VERSIONING=no - fi + PHP_VERSIONING=$enableval ],[ PHP_VERSIONING=no ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /sapi/cgi config9.m4 /sapi/cli config.m4
sniper Thu Apr 21 10:57:53 2005 EDT Modified files: /php-srcconfigure.in /php-src/sapi/cli config.m4 /php-src/sapi/cgi config9.m4 Log: Expose EXEEXT and use for cli/cgi binaries http://cvs.php.net/diff.php/php-src/configure.in?r1=1.548&r2=1.549&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.548 php-src/configure.in:1.549 --- php-src/configure.in:1.548 Mon Apr 18 05:46:53 2005 +++ php-src/configure.inThu Apr 21 10:57:50 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.548 2005/04/18 09:46:53 hyanantha Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.549 2005/04/21 14:57:50 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1092,6 +1092,7 @@ PHP_SUBST(datadir) PHP_SUBST(sysconfdir) +PHP_SUBST(EXEEXT) PHP_SUBST(CC) PHP_SUBST(CFLAGS) PHP_SUBST(CFLAGS_CLEAN) http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.18&r2=1.19&ty=u Index: php-src/sapi/cli/config.m4 diff -u php-src/sapi/cli/config.m4:1.18 php-src/sapi/cli/config.m4:1.19 --- php-src/sapi/cli/config.m4:1.18 Mon Dec 1 10:17:10 2003 +++ php-src/sapi/cli/config.m4 Thu Apr 21 10:57:53 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2003/12/01 15:17:10 sniper Exp $ +dnl $Id: config.m4,v 1.19 2005/04/21 14:57:53 sniper Exp $ dnl AC_MSG_CHECKING(for CLI build) @@ -22,15 +22,11 @@ *darwin*) BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; - *cygwin*) -SAPI_CLI_PATH=sapi/cli/php.exe -BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" -;; *) BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; esac - INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" PHP_SUBST(BUILD_CLI) PHP_SUBST(INSTALL_CLI) http://cvs.php.net/diff.php/php-src/sapi/cgi/config9.m4?r1=1.14&r2=1.15&ty=u Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.14 php-src/sapi/cgi/config9.m4:1.15 --- php-src/sapi/cgi/config9.m4:1.14Sun Mar 6 18:16:44 2005 +++ php-src/sapi/cgi/config9.m4 Thu Apr 21 10:57:53 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.14 2005/03/06 23:16:44 sniper Exp $ +dnl $Id: config9.m4,v 1.15 2005/04/21 14:57:53 sniper Exp $ dnl AC_ARG_ENABLE(cgi, @@ -149,7 +149,7 @@ AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) AC_MSG_RESULT($PHP_ENABLE_FASTCGI) -INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" +INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)') case $host_alias in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
hyanantha Mon Apr 18 05:46:55 2005 EDT Modified files: /php-srcconfigure.in Log: PHP_OS and PHP_UNAME need to be hardcoded for cross builds http://cvs.php.net/diff.php/php-src/configure.in?r1=1.547&r2=1.548&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.547 php-src/configure.in:1.548 --- php-src/configure.in:1.547 Fri Apr 8 09:36:23 2005 +++ php-src/configure.inMon Apr 18 05:46:53 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.547 2005/04/08 13:36:23 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.548 2005/04/18 09:46:53 hyanantha Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -167,6 +167,10 @@ fi ;; *netware*) +PHP_OS="NetWare" +PHP_UNAME="NetWare" +AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[hardcode for each of the cross compiler host]) +AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[hardcode for each of the cross compiler host]) PHP_BUILD_PROGRAM PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php) ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Fri Apr 8 09:36:26 2005 EDT Modified files: /php-srcconfigure.in Log: remove duplicate entry http://cvs.php.net/diff.php/php-src/configure.in?r1=1.546&r2=1.547&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.546 php-src/configure.in:1.547 --- php-src/configure.in:1.546 Fri Mar 25 22:09:09 2005 +++ php-src/configure.inFri Apr 8 09:36:23 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.546 2005/03/26 03:09:09 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.547 2005/04/08 13:36:23 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -363,8 +363,7 @@ utime.h \ sys/utsname.h \ sys/ipc.h \ -dlfcn.h \ -inttypes.h +dlfcn.h ],[],[],[ #ifdef HAVE_SYS_PARAM_H #include -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /build libtool.m4
sniper Fri Mar 25 22:09:10 2005 EDT
Modified files:
/php-srcconfigure.in
/php-src/build libtool.m4
Log:
- Prevent compiling shared extensions when --enable-versioning is used
- Fix -export-symbols in Linux in the bundled libtool.m4:
o http://lists.gnu.org/archive/html/libtool/2002-07/msg00029.html
# more about this:
# http://marc.theaimsgroup.com/?l=php-dev&m=106629582813118&w=2
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.545&r2=1.546&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.545 php-src/configure.in:1.546
--- php-src/configure.in:1.545 Thu Mar 17 03:15:50 2005
+++ php-src/configure.inFri Mar 25 22:09:09 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.545 2005/03/17 08:15:50 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.546 2005/03/26 03:09:09 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -808,6 +808,9 @@
dnl -
if test "$PHP_VERSIONING" = "yes"; then
+ if test -n "$PHP_MODULES"; then
+AC_MSG_ERROR([--enable-versioning cannot be used with shared modules])
+ fi
test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
if test -f "$PHP_SYM_FILE"; then
EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS"
http://cvs.php.net/diff.php/php-src/build/libtool.m4?r1=1.2&r2=1.3&ty=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.2 php-src/build/libtool.m4:1.3
--- php-src/build/libtool.m4:1.2Tue Feb 15 03:51:10 2005
+++ php-src/build/libtool.m4Fri Mar 25 22:09:09 2005
@@ -1403,6 +1403,23 @@
hardcode_shlibpath_var=no
;;
+ linux*)
+if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname
$wl$soname -o $lib'
+ archive_expsym_cmds='echo "{" > $output_objdir/$libname.ver;
+echo "global:" >> $output_objdir/$libname.ver;
+ cat $export_symbols | while read symbol; do
+ echo " \$symbol;" >> $output_objdir/$libname.ver;
+ done;
+echo "local: *;" >> $output_objdir/$libname.ver;
+echo "};" >> $output_objdir/$libname.ver~
+$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname
${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib~
+rm -f $output_objdir/$libname.ver'
+else
+ ld_shlibs=no
+fi
+;;
+
*)
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname
$wl$soname -o $lib'
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Thu Mar 17 03:15:50 2005 EDT Modified files: /php-srcconfigure.in Log: Fixed build properly http://cvs.php.net/diff.php/php-src/configure.in?r1=1.544&r2=1.545&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.544 php-src/configure.in:1.545 --- php-src/configure.in:1.544 Wed Mar 16 01:36:42 2005 +++ php-src/configure.inThu Mar 17 03:15:50 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.544 2005/03/16 06:36:42 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.545 2005/03/17 08:15:50 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -269,7 +269,6 @@ CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi -INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib) @@ -923,6 +922,9 @@ PHP_THREAD_SAFETY=no fi +INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" +INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" + if test "$abs_srcdir" != "$abs_builddir"; then INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend" INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/" @@ -1094,7 +1096,6 @@ PHP_SUBST(CXXFLAGS) PHP_SUBST(CXXFLAGS_CLEAN) PHP_SUBST_OLD(DEBUG_CFLAGS) -PHP_SUBST(DEFS) PHP_SUBST_OLD(EXTENSION_DIR) PHP_SUBST_OLD(EXTRA_LDFLAGS) PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /scripts php-config.in
sniper Wed Mar 16 01:36:44 2005 EDT Modified files: /php-srcconfigure.in /php-src/scriptsphp-config.in Log: - Remove these relics from era when TSRM was optional. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.543&r2=1.544&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.543 php-src/configure.in:1.544 --- php-src/configure.in:1.543 Mon Mar 14 16:11:33 2005 +++ php-src/configure.inWed Mar 16 01:36:42 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.543 2005/03/14 21:11:33 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.544 2005/03/16 06:36:42 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -916,10 +916,6 @@ LIBZEND_DLSYM_CHECK LIBZEND_OTHER_CHECKS -TSRM_LIB='TSRM/libtsrm.la' -TSRM_DIR=TSRM -CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM" - if test "$ZEND_MAINTAINER_ZTS" = "yes"; then AC_DEFINE(ZTS,1,[ ]) PHP_THREAD_SAFETY=yes @@ -1122,8 +1118,6 @@ PHP_SUBST_OLD(PHP_VERSION) PHP_SUBST(SHELL) PHP_SUBST(SHARED_LIBTOOL) -PHP_SUBST(TSRM_DIR) -PHP_SUBST(TSRM_LIB) PHP_SUBST(WARNING_LEVEL) PHP_SUBST(PHP_FRAMEWORKS) PHP_SUBST(PHP_FRAMEWORKPATH) http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.1&r2=1.2&ty=u Index: php-src/scripts/php-config.in diff -u php-src/scripts/php-config.in:1.1 php-src/scripts/php-config.in:1.2 --- php-src/scripts/php-config.in:1.1 Tue Jan 28 05:59:11 2003 +++ php-src/scripts/php-config.in Wed Mar 16 01:36:44 2005 @@ -3,12 +3,9 @@ prefix="@prefix@" version="@PHP_VERSION@" includedir="@includedir@/php" -includes="-I$includedir -I$includedir/main -I$includedir/Zend" +includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend" ldflags="@PHP_LDFLAGS@" libs="@EXTRA_LIBS@" -if test '@TSRM_DIR@' != ''; then -includes="$includes -I$includedir/TSRM" -fi extension_dir='@EXTENSION_DIR@' case "$1" in -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Mon Mar 14 16:11:36 2005 EDT Modified files: /php-srcconfigure.in Log: - Fixed bug #32200 (prevent using both --with-apxs2 and --with-apxs2filter) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.542&r2=1.543&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.542 php-src/configure.in:1.543 --- php-src/configure.in:1.542 Thu Feb 24 14:27:10 2005 +++ php-src/configure.inMon Mar 14 16:11:33 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.542 2005/02/24 19:27:10 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.543 2005/03/14 21:11:33 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -82,7 +82,11 @@ AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together]) fi +if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then + AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together]) +fi + dnl Settings we want to make before the checks. dnl - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Mon Feb 7 07:48:13 2005 EDT Modified files: /php-srcconfigure.in Log: - Fixed bug #31858 (--disable-cli does not force --without-pear) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.538&r2=1.539&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.538 php-src/configure.in:1.539 --- php-src/configure.in:1.538 Wed Jan 19 19:51:41 2005 +++ php-src/configure.inMon Feb 7 07:48:11 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.538 2005/01/20 00:51:41 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.539 2005/02/07 12:48:11 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -934,6 +934,11 @@ with_pear=no fi +# If CLI is disabled -> disable PEAR +if test "$PHP_SAPI_CLI" = "no"; then + with_pear=no +fi + PHP_ARG_WITH(pear, [whether to install PEAR], [ --with-pear=DIR Install PEAR in DIR (default PREFIX/lib/php) --without-pear Do not install PEAR], DEFAULT, yes) @@ -943,17 +948,13 @@ dnl dnl PEAR dependancies dnl - if test "$PHP_SAPI_CLI" = "no"; then -pear_error_msg="$pear_error_msg -PEAR requires CLI to be enabled. Add --enable-cli to the configure line. (or --disable-pear)" - fi if test "$PHP_PCRE_REGEX" = "no"; then pear_error_msg="$pear_error_msg -PEAR requires PCRE to be enabled.Add --with-pcre-regex to the configure line. (or --disable-pear)" +PEAR requires PCRE to be enabled.Add --with-pcre-regex to the configure line. (or --without-pear)" fi if test "$PHP_XML" = "no"; then pear_error_msg="$pear_error_msg -PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --disable-pear)" +PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" fi dnl @@ -961,7 +962,7 @@ dnl dnl if test "$PHP_XMLRPC" = "no"; then dnlpear_error_msg="$pear_error_msg -dnlPEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --disable-pear)" +dnlPEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)" dnl fi dnl @@ -978,6 +979,8 @@ *) PEAR_INSTALLDIR=$libdir/php;; esac fi + + PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) fi @@ -1327,7 +1330,6 @@ PHP_ADD_BUILD_DIR(Zend) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts) -PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend) PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Wed Jan 19 19:51:42 2005 EDT Modified files: /php-srcconfigure.in Log: - Removed obsolete AC_PROG_RANLIB (AC_PROG_LIBTOOL does it) - configure --help output cleanup for --with-libdir http://cvs.php.net/diff.php/php-src/configure.in?r1=1.537&r2=1.538&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.537 php-src/configure.in:1.538 --- php-src/configure.in:1.537 Wed Jan 19 12:35:55 2005 +++ php-src/configure.inWed Jan 19 19:51:41 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.537 2005/01/19 17:35:55 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.538 2005/01/20 00:51:41 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -127,14 +127,13 @@ dnl Support systems with system libraries in e.g. /usr/lib64 AC_ARG_WITH(libdir, -[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], +[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib], [PHP_LIBDIR=$withval], [PHP_LIBDIR=lib]) dnl check for -R, etc. switch PHP_RUNPATH_SWITCH PHP_PROG_RE2C -AC_PROG_RANLIB AC_PROG_LN_S dnl Some vendors force mawk before gawk; mawk is broken so we don't like that, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Sun Jan 9 20:11:10 2005 EDT
Modified files:
/php-srcconfigure.in
Log:
- The pic/no-pic patch by Joe Orton.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.535&r2=1.536&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.535 php-src/configure.in:1.536
--- php-src/configure.in:1.535 Sun Jan 9 16:05:04 2005
+++ php-src/configure.inSun Jan 9 20:11:09 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.535 2005/01/09 21:05:04 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.536 2005/01/10 01:11:09 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -232,6 +232,21 @@
;;
esac
+# Disable PIC mode by default where it is known to be safe to do so,
+# to avoid the performance hit from the lost register
+AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
+case $host_alias in
+i?86-*-linux*|i?86-*-freebsd*)
+if test "${with_pic+set}" != "set"; then
+ with_pic=no
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+;;
+*) AC_MSG_RESULT(no) ;;
+esac
+
dnl Include Zend and TSRM configurations.
dnl -
@@ -881,7 +896,6 @@
enable_shared=yes
enable_static=yes
-unset with_pic
case $php_build_target in
program|static)
@@ -892,7 +906,9 @@
;;
shared)
enable_static=no
-standard_libtool_flag=-prefer-pic
+if test "${with_pic+set}" != "set"; then
+ standard_libtool_flag='-prefer-pic'
+fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
esac
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/bcmath/libbcmath/src config.h /ext/gd gdcache.c gdttf.c /ext/mcve mcve.c /ext/odbc birdstep.c /ext/pcre/pcrelib internal.h /ext/sqlite config.m4 /ext/standard html.c /main alloca.c php_compat.h php_scandir.h php_sprintf.c php_syslog.h /sapi/cgi/libfcgi/include fcgi_config.h TSRM TSRM.h tsrm_config_common.h ZendEngine2 zend.h
sniper Sun Jan 9 16:05:07 2005 EDT Modified files: /php-srcconfigure.in /TSRM TSRM.h tsrm_config_common.h /ZendEngine2zend.h /php-src/ext/bcmath/libbcmath/src config.h /php-src/ext/gd gdcache.c gdttf.c /php-src/ext/mcve mcve.c /php-src/ext/odbc birdstep.c /php-src/ext/pcre/pcrelib internal.h /php-src/ext/sqlite config.m4 /php-src/ext/standard html.c /php-src/main alloca.c php_compat.h php_scandir.h php_sprintf.c php_syslog.h /php-src/sapi/cgi/libfcgi/include fcgi_config.h Log: - Fix outside-source-tree builds. Always include generated header files with #include to make sure the correct file is used. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.534&r2=1.535&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.534 php-src/configure.in:1.535 --- php-src/configure.in:1.534 Fri Jan 7 01:12:41 2005 +++ php-src/configure.inSun Jan 9 16:05:04 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.534 2005/01/07 06:12:41 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.535 2005/01/09 21:05:04 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1338,12 +1338,12 @@ # test -d TSRM || $php_shtool mkdir TSRM -echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h +echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h test -d Zend || $php_shtool mkdir Zend cat >Zend/zend_config.h < #if defined(APACHE) && defined(PHP_API_VERSION) #undef HAVE_DLFCN_H #endif http://cvs.php.net/diff.php/TSRM/TSRM.h?r1=1.43&r2=1.44&ty=u Index: TSRM/TSRM.h diff -u TSRM/TSRM.h:1.43 TSRM/TSRM.h:1.44 --- TSRM/TSRM.h:1.43Wed Dec 3 09:26:41 2003 +++ TSRM/TSRM.h Sun Jan 9 16:05:05 2005 @@ -15,7 +15,7 @@ /* #ifndef WIN32 */ #if !defined(WIN32) && !defined(NETWARE) -# include "tsrm_config.h" +# include #endif #ifdef WIN32 http://cvs.php.net/diff.php/TSRM/tsrm_config_common.h?r1=1.13&r2=1.14&ty=u Index: TSRM/tsrm_config_common.h diff -u TSRM/tsrm_config_common.h:1.13 TSRM/tsrm_config_common.h:1.14 --- TSRM/tsrm_config_common.h:1.13 Mon Aug 25 19:24:29 2003 +++ TSRM/tsrm_config_common.h Sun Jan 9 16:05:05 2005 @@ -10,7 +10,7 @@ #elif defined(NETWARE) # include "tsrm_config.nw.h" #else -# include "tsrm_config.h" +# include # include #endif http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.266&r2=1.267&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.266 ZendEngine2/zend.h:1.267 --- ZendEngine2/zend.h:1.266Wed Nov 3 18:05:17 2004 +++ ZendEngine2/zend.h Sun Jan 9 16:05:05 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend.h,v 1.266 2004/11/03 23:05:17 moriyoshi Exp $ */ +/* $Id: zend.h,v 1.267 2005/01/09 21:05:05 sniper Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -48,10 +48,10 @@ # include "acconfig.h" # define ZEND_PATHS_SEPARATOR ';' #elif defined(__riscos__) -# include "zend_config.h" +# include # define ZEND_PATHS_SEPARATOR ';' #else -# include "zend_config.h" +# include # define ZEND_PATHS_SEPARATOR ':' #endif http://cvs.php.net/diff.php/php-src/ext/bcmath/libbcmath/src/config.h?r1=1.7&r2=1.8&ty=u Index: php-src/ext/bcmath/libbcmath/src/config.h diff -u php-src/ext/bcmath/libbcmath/src/config.h:1.7 php-src/ext/bcmath/libbcmath/src/config.h:1.8 --- php-src/ext/bcmath/libbcmath/src/config.h:1.7 Sun Feb 16 22:07:32 2003 +++ php-src/ext/bcmath/libbcmath/src/config.h Sun Jan 9 16:05:05 2005 @@ -3,7 +3,7 @@ #elif defined(NETWARE) #include "config.nw.h" #else -#include "php_config.h" +#include #endif #include "php.h" http://cvs.php.net/diff.php/php-src/ext/gd/gdcache.c?r1=1.9&r2=1.10&ty=u Index: php-src/ext/gd/gdcache.c diff -u php-src/ext/gd/gdcache.c:1.9 php-src/ext/gd/gdcache.c:1.10 --- php-src/ext/gd/gdcache.c:1.9Sun Dec 28 16:08:46 2003 +++ php-src/ext/gd/gdcache.cSun Jan 9 16:05:05 2005 @@ -1,5 +1,5 @@ /* - * $Id: gdcache.c,v 1.9 2003/12/28 21:08:46 iliaa Exp $ + * $Id: gdcache.c,v 1.10 2005/01/09 21:05:05 sniper Exp $ * * Caches of pointers to user structs in which the least-recently-used * element is replaced in the event of a cache miss after the cache has @@ -42,7 +42,7 @@ #if PHP_WIN32 #define ENABLE_GD_TTF #else -#include "php_config.h" +#include #endif #if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE) http://cvs.php.net/diff.php/php-src/ext/gd/gdttf.c?r1=1.20&r2=1.21&ty=u Index: php-src/ext/gd/gdttf.c diff -u php-src/ext/gd/gdttf.c:1.20 php-src/ext/gd/gdttf.c:1.21 --- php-src/ext/gd/gdttf.c:1.20 Sun Dec 28 16:08:46 2003 +++ php-src/ext/gd/gdttf.c Sun Jan 9 16:05:05 2005 @@ -2,14 +2,14 @@ /* */ /* John Ellson [EMAIL PROTECTED] */ -/* $Id: gdttf.c,v 1.20 2003/12/28 21:
