subject:"\[PHP\-CVS\] cvs\: php\-src \/ Makefile.global"

Re: [PHP-CVS] cvs: php-src / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c

2008-08-14 Thread Dmitry Stogov


These two are failed.

using invalid combinations of cmdline options [sapi/cgi/tests/005.phpt]
using invalid combinations of cmdline options [sapi/cli/tests/009.phpt]


Thanks. Dmitry.

Jani Taskinen wrote:
Because it didn't make sense not to allow using both. I thought I fixed 
those tests..?

Or which ones do you mean?

--Jani



Dmitry Stogov [EMAIL PROTECTED] kirjoitti:

Hi Jani,

What is the reason of removing -n and -c option check in cli/cgi?
It breaks two tests.

Thanks. Dmitry.

Jani Taskinen wrote:
 janiWed Aug 13 00:49:59 2008 UTC
Modified files:   /php-srcMakefile.global 
 /php-src/ext/standardinfo.c  /php-src/mainphp_ini.c 
 /php-src/sapi/cgicgi_main.c  /php-src/sapi/cli
php_cli.c  /php-src/sapi/milterphp_milter.cLog:
   [DOC]- Added methods to change/disable 
--with-config-file-scan-dir=PATH at

   [DOC]  startup:
   [DOC]
   [DOC]  To disable: Override default php.ini by using both -c and 
-n with
   [DOC]  CGI/CLI or set PHP_INI_SCAN_DIR environment 
variable

   [DOC]  to an empty string.[DOC]
   [DOC]  To change: Simply set PHP_INI_SCAN_DIR environment 
variable to point[DOC] to another path.
  - Fixed bug #42604 (make test fails with 
--with-config-file-scan-dir=/some/path)
   - Implemented FR #45114 (Option to change 
--with-config-file-scan-dir)

 
--
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

Re: [PHP-CVS] cvs: php-src / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c

2008-08-14 Thread Jani Taskinen



Should be fixed now among couple of others that failed for me for various 
reasons. :)

--Jani


Dmitry Stogov [EMAIL PROTECTED] kirjoitti: 

These two are failed.

using invalid combinations of cmdline options [sapi/cgi/tests/005.phpt]
using invalid combinations of cmdline options [sapi/cli/tests/009.phpt]


Thanks. Dmitry.

Jani Taskinen wrote:
 Because it didn't make sense not to allow using both. I thought I fixed 
 those tests..?

 Or which ones do you mean?
 
 --Jani
 
 
 
 Dmitry Stogov [EMAIL PROTECTED] kirjoitti:

 Hi Jani,

 What is the reason of removing -n and -c option check in cli/cgi?
 It breaks two tests.

 Thanks. Dmitry.

 Jani Taskinen wrote:
  janiWed Aug 13 00:49:59 2008 UTC
 Modified files:   /php-srcMakefile.global 
  /php-src/ext/standardinfo.c  /php-src/mainphp_ini.c 
  /php-src/sapi/cgicgi_main.c  /php-src/sapi/cli
 php_cli.c  /php-src/sapi/milterphp_milter.cLog:
[DOC]- Added methods to change/disable 
 --with-config-file-scan-dir=PATH at

[DOC]  startup:
[DOC]
[DOC]  To disable: Override default php.ini by using both -c and 
 -n with
[DOC]  CGI/CLI or set PHP_INI_SCAN_DIR environment 
 variable

[DOC]  to an empty string.[DOC]
[DOC]  To change: Simply set PHP_INI_SCAN_DIR environment 
 variable to point[DOC] to another path.
   - Fixed bug #42604 (make test fails with 
 --with-config-file-scan-dir=/some/path)
- Implemented FR #45114 (Option to change 
 --with-config-file-scan-dir)

  
 -- 
 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

Re: [PHP-CVS] cvs: php-src / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c

2008-08-13 Thread Dmitry Stogov


Hi Jani,

What is the reason of removing -n and -c option check in cli/cgi?
It breaks two tests.

Thanks. Dmitry.

Jani Taskinen wrote:

janiWed Aug 13 00:49:59 2008 UTC

  Modified files:  
/php-src	Makefile.global 
/php-src/ext/standard	info.c 
/php-src/main	php_ini.c 
/php-src/sapi/cgi	cgi_main.c 
/php-src/sapi/cli	php_cli.c 
/php-src/sapi/milter	php_milter.c 
  Log:

  [DOC]- Added methods to change/disable --with-config-file-scan-dir=PATH at
  [DOC]  startup:
  [DOC]
  [DOC]  To disable: Override default php.ini by using both -c and -n with
  [DOC]  CGI/CLI or set PHP_INI_SCAN_DIR environment variable
  [DOC]  to an empty string. 
  [DOC]
  [DOC]  To change: Simply set PHP_INI_SCAN_DIR environment variable to point 
  [DOC] to another path.
  
  - Fixed bug #42604 (make test fails with --with-config-file-scan-dir=/some/path)

  - Implemented FR #45114 (Option to change --with-config-file-scan-dir)
  
  
  



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c

2008-08-13 Thread Jani Taskinen


Because it didn't make sense not to allow using both. I thought I fixed those 
tests..?
Or which ones do you mean?

--Jani



Dmitry Stogov [EMAIL PROTECTED] kirjoitti: 

Hi Jani,

What is the reason of removing -n and -c option check in cli/cgi?
It breaks two tests.

Thanks. Dmitry.

Jani Taskinen wrote:
 jani   Wed Aug 13 00:49:59 2008 UTC
 
   Modified files:  
 /php-src	Makefile.global 
 /php-src/ext/standard	info.c 
 /php-src/main	php_ini.c 
 /php-src/sapi/cgi	cgi_main.c 
 /php-src/sapi/cli	php_cli.c 
 /php-src/sapi/milter	php_milter.c 
   Log:

   [DOC]- Added methods to change/disable --with-config-file-scan-dir=PATH at
   [DOC]  startup:
   [DOC]
   [DOC]  To disable: Override default php.ini by using both -c and -n with
   [DOC]  CGI/CLI or set PHP_INI_SCAN_DIR environment variable
   [DOC]  to an empty string. 
   [DOC]
   [DOC]  To change: Simply set PHP_INI_SCAN_DIR environment variable to point 
   [DOC] to another path.
   
   - Fixed bug #42604 (make test fails with --with-config-file-scan-dir=/some/path)

   - Implemented FR #45114 (Option to change --with-config-file-scan-dir)
   
   
   
 


--
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 / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c

2008-08-12 Thread Jani Taskinen

janiWed Aug 13 00:49:59 2008 UTC

  Modified files:  
/php-srcMakefile.global 
/php-src/ext/standard   info.c 
/php-src/main   php_ini.c 
/php-src/sapi/cgi   cgi_main.c 
/php-src/sapi/cli   php_cli.c 
/php-src/sapi/milterphp_milter.c 
  Log:
  [DOC]- Added methods to change/disable --with-config-file-scan-dir=PATH at
  [DOC]  startup:
  [DOC]
  [DOC]  To disable: Override default php.ini by using both -c and -n with
  [DOC]  CGI/CLI or set PHP_INI_SCAN_DIR environment variable
  [DOC]  to an empty string. 
  [DOC]
  [DOC]  To change: Simply set PHP_INI_SCAN_DIR environment variable to point 
  [DOC] to another path.
  
  - Fixed bug #42604 (make test fails with 
--with-config-file-scan-dir=/some/path)
  - Implemented FR #45114 (Option to change --with-config-file-scan-dir)
  
  
  http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.87r2=1.88diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.87 php-src/Makefile.global:1.88
--- php-src/Makefile.global:1.87Mon Jun  9 19:27:43 2008
+++ php-src/Makefile.global Wed Aug 13 00:49:58 2008
@@ -87,16 +87,21 @@
CC=$(CC) \
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
-   INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
+   INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -d 
'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2 /dev/null`; \
if test $$INI_FILE; then \
$(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' 
$$INI_FILE  $(top_builddir)/tmp-php.ini; \
else \
echo  $(top_builddir)/tmp-php.ini; \
fi; \
+   INI_SCANNED_PATH=`$(top_builddir)/$(SAPI_CLI_PATH) -d 
'display_errors=stderr' -r '$$a = explode(,\n, 
trim(php_ini_scanned_files())); echo $$a[0];' 2 /dev/null`; \
+   if test $$INI_SCANNED_PATH; then \
+   INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d 
$$INI_SCANNED_PATH`; \
+   $(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\ 
]*=' $$INI_SCANNED_PATH/*.ini  $(top_builddir)/tmp-php.ini; \
+   fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -n -c 
$(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n 
-c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.291r2=1.292diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.291 php-src/ext/standard/info.c:1.292
--- php-src/ext/standard/info.c:1.291   Tue Jul 22 10:04:53 2008
+++ php-src/ext/standard/info.c Wed Aug 13 00:49:59 2008
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.291 2008/07/22 10:04:53 pajoye Exp $ */
+/* $Id: info.c,v 1.292 2008/08/13 00:49:59 jani Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -59,6 +59,7 @@
} \
 
 PHPAPI extern char *php_ini_opened_path;
+PHPAPI extern char *php_ini_scanned_path;
 PHPAPI extern char *php_ini_scanned_files;
 
 static int php_info_print_html_esc(const char *str, int len) /* {{{ */
@@ -567,14 +568,9 @@
 
php_info_print_table_row(2, Configuration File (php.ini) 
Path, PHP_CONFIG_FILE_PATH);
php_info_print_table_row(2, Loaded Configuration File, 
php_ini_opened_path ? php_ini_opened_path : (none));
+   php_info_print_table_row(2, Scan this dir for additional .ini 
files, php_ini_scanned_path ? php_ini_scanned_path : (none));
+   php_info_print_table_row(2, additional .ini files parsed, 
php_ini_scanned_files ? php_ini_scanned_files : (none));
 
-   if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
-   php_info_print_table_row(2, Scan this dir for 
additional .ini files, PHP_CONFIG_FILE_SCAN_DIR);
-   if (php_ini_scanned_files) {
-   php_info_print_table_row(2, additional .ini 
files parsed, php_ini_scanned_files);
-   }
-   }
-

[PHP-CVS] cvs: php-src / Makefile.global

2008-06-09 Thread Felipe Pena

felipe  Mon Jun  9 19:27:43 2008 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  - Removed ntest and utest
  - Removed -U flag to `make test' just to test once each test
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.86r2=1.87diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.86 php-src/Makefile.global:1.87
--- php-src/Makefile.global:1.86Sun Feb 17 20:49:46 2008
+++ php-src/Makefile.global Mon Jun  9 19:27:43 2008
@@ -85,7 +85,7 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
+   $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
if test $$INI_FILE; then \
@@ -96,39 +96,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-   else \
-   echo ERROR: Cannot run tests without CLI sapi.; \
-   fi
-
-utest: all
-   [EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
-   INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
-   if test $$INI_FILE; then \
-   $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE  
$(top_builddir)/tmp-php.ini; \
-   else \
-   echo  $(top_builddir)/tmp-php.ini; \
-   fi; \
-   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-   TEST_PHP_SRCDIR=$(top_srcdir) \
-   CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -u -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
-   else \
-   echo ERROR: Cannot run tests without CLI sapi.; \
-   fi
-
-ntest: all
-   [EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
-   INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
-   if test $$INI_FILE; then \
-   $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE  
$(top_builddir)/tmp-php.ini; \
-   else \
-   echo  $(top_builddir)/tmp-php.ini; \
-   fi; \
-   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-   TEST_PHP_SRCDIR=$(top_srcdir) \
-   CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -N -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in

2008-02-17 Thread Marcus Boerger

helly   Sun Feb 17 20:49:46 2008 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in Makefile.global 
  Log:
  - Allow zend_extensions to be build inside ext and tested with 'make test'
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.385r2=1.386diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.385 php-src/acinclude.m4:1.386
--- php-src/acinclude.m4:1.385  Mon Dec 31 04:27:47 2007
+++ php-src/acinclude.m4Sun Feb 17 20:49:45 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.385 2007/12/31 04:27:47 jon Exp $
+dnl $Id: acinclude.m4,v 1.386 2008/02/17 20:49:45 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -837,7 +837,7 @@
 ])
 
 dnl
-dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx)
+dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx, zend_ext)
 dnl
 dnl Basically sets up the link-stage for building module-name
 dnl from object_var in build-dir.
@@ -860,7 +860,11 @@
   ;;
   esac
 
-  PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix
+  if test x$5 = xyes; then
+PHP_ZEND_EX=$PHP_ZEND_EX \$(phplibdir)/$1.$suffix
+  else
+PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix
+  fi
   PHP_SUBST($2)
   cat Makefile.objectsEOF
 \$(phplibdir)/$1.$suffix: $3/$1.$suffix
@@ -916,7 +920,7 @@
 ])
 
 dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, 
cxx)
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, 
cxx[, zend_ext])
 dnl
 dnl Includes an extension in the build.
 dnl
@@ -950,10 +954,10 @@
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
   case $host_alias in
 *netware*[)]
-  PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6)
+  PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6, $7)
   ;;
 *[)]
-  PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
+  PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7)
   ;;
   esac
   AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to 
build $1 as dynamic module)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.646r2=1.647diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.646 php-src/configure.in:1.647
--- php-src/configure.in:1.646  Thu Feb 14 10:25:10 2008
+++ php-src/configure.inSun Feb 17 20:49:46 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.646 2008/02/14 10:25:10 dmitry Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.647 2008/02/17 20:49:46 helly Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -870,7 +870,7 @@
 case $php_build_target in
 program|static)
 standard_libtool_flag='-prefer-non-pic -static'
-if test -z $PHP_MODULES; then
+if test -z $PHP_MODULES  test -z $PHP_ZEND_EX; then
 enable_shared=no
 fi
 ;;
@@ -1076,6 +1076,7 @@
 PHP_SUBST(PHP_GLOBAL_OBJS)
 
 PHP_SUBST(PHP_MODULES)
+PHP_SUBST(PHP_ZEND_EX)
 
 PHP_SUBST(EXT_LIBS)
 
@@ -1156,6 +1157,17 @@
   CPPFLAGS=$CPPFLAGS -DTHREAD=1
 fi
 
+if test $PHP_DEBUG = yes  test $PHP_THREAD_SAFETY = yes; then
+ZEND_EXT_TYPE=zend_extension_debug_ts
+elif test $PHP_DEBUG = yes; then
+ZEND_EXT_TYPE=zend_extension_debug
+elif test $PHP_THREAD_SAFETY = yes; then
+ZEND_EXT_TYPE=zend_extension_ts
+else
+ZEND_EXT_TYPE=zend_extension
+fi
+PHP_SUBST(ZEND_EXT_TYPE)
+
 dnl
 dnl Libtool creation
 dnl
@@ -1192,7 +1204,7 @@
 INLINE_CFLAGS=$INLINE_CFLAGS $standard_libtool_flag
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
-all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) 
\$(PHP_CLI_TARGET)
+all_targets=$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) 
\$(PHP_CLI_TARGET)
 install_targets=$install_modules install-build install-headers 
install-programs
 
 case $PHP_SAPI in
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.85r2=1.86diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.85 php-src/Makefile.global:1.86
--- php-src/Makefile.global:1.85Fri Aug  3 14:01:40 2007
+++ php-src/Makefile.global Sun Feb 17 20:49:46 2008
@@ -11,7 +11,7 @@
@echo Don't forget to run 'make test'.
@echo

-build-modules: $(PHP_MODULES)
+build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
@@ -73,6 +73,11 @@
for i in $(PHP_MODULES); do \
. $$i; $(top_srcdir)/build/shtool echo -n --  -d 
extension=$$dlname; \
done; \
+   fi; \
+   if test x$(PHP_ZEND_EX) != x; then \
+   for i in $(PHP_ZEND_EX); do \
+   . $$i;

[PHP-CVS] cvs: php-src / Makefile.global

2007-08-03 Thread Jani Taskinen

janiFri Aug  3 14:01:40 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  - Fix issue with broken shells 
  # I truly hate Solaris..
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.84r2=1.85diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.84 php-src/Makefile.global:1.85
--- php-src/Makefile.global:1.84Thu Jul 26 22:45:22 2007
+++ php-src/Makefile.global Fri Aug  3 14:01:40 2007
@@ -69,8 +69,8 @@
 
 PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
-   if test $(PHP_MODULES); then \
-   for i in $(PHP_MODULES); do \
+   if test x$(PHP_MODULES) != x; then \
+   for i in $(PHP_MODULES); do \
. $$i; $(top_srcdir)/build/shtool echo -n --  -d 
extension=$$dlname; \
done; \
fi`

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 buildconf configure.in /win32/build confutils.js

2007-07-26 Thread Jani Taskinen

janiThu Jul 26 22:45:22 2007 UTC

  Modified files:  
/php-srcMakefile.global acinclude.m4 buildconf configure.in 
/php-src/win32/buildconfutils.js 
  Log:
  - Made build system less dependant for the PHP major version to also
ease MFB/MFH as acinclude.m4 and Makefile.global are identical in both
branches.
  
  http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.83r2=1.84diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.83 php-src/Makefile.global:1.84
--- php-src/Makefile.global:1.83Wed Jul  4 10:15:47 2007
+++ php-src/Makefile.global Thu Jul 26 22:45:22 2007
@@ -13,22 +13,22 @@

 build-modules: $(PHP_MODULES)
 
-libphp6.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-   [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp6.la 
$(phptempdir)/libphp6.la /dev/null 21
+   [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp $@ 
$(phptempdir)/$@ /dev/null 21
 
-libs/libphp6.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) 
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ 
libs/libphp6.so
+libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) 
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ 
libs/libphp$(PHP_MAJOR_VERSION).so
 
 install: $(all_targets) $(install_targets)
 
 install-sapi: $(OVERALL_TARGET)
@echo Installing PHP SAPI module:   $(PHP_SAPI)
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-   [EMAIL PROTECTED] test ! -r 
$(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); then \
+   [EMAIL PROTECTED] test ! -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
-   if test -r 
$(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
-   $(LN_S) 
$(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); \
+   if test -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+   $(LN_S) 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
@@ -134,10 +134,10 @@
find . -name \*.la -o -name \*.a | xargs rm -f 
find . -name \*.so | xargs rm -f
find . -name .libs -a -type d|xargs rm -rf
-   rm -f libphp6.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+   rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) 
modules/* libs/*
 
 distclean: clean
-   rm -f config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h php5.spec 
sapi/apache/libphp6.module buildmk.stamp
+   rm -f config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h php5.spec 
sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 
's/.*//'|xargs rm -f
find . -name Makefile | xargs rm -f
 
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.381r2=1.382diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.381 php-src/acinclude.m4:1.382
--- php-src/acinclude.m4:1.381  Wed Jul 25 23:47:32 2007
+++ php-src/acinclude.m4Thu Jul 26 22:45:22 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.381 2007/07/25 23:47:32 jani Exp $
+dnl $Id: acinclude.m4,v 1.382 2007/07/26 22:45:22 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -773,7 +773,7 @@
 dnl
 AC_DEFUN([PHP_BUILD_SHARED],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libphp6.la
+  OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
   php_build_target=shared
   
   php_c_pre=$shared_c_pre
@@ -790,7 +790,7 @@
 dnl
 AC_DEFUN([PHP_BUILD_STATIC],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libphp6.la
+  OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la]
   php_build_target=static
 ])
 
@@ -799,7 +799,7 @@
 dnl
 AC_DEFUN([PHP_BUILD_BUNDLE],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libs/libphp6.bundle
+  OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
   php_build_target=static
 ])
 
@@ -2701,6 +2701,12 @@
   # All the rest must be set using the PHP_ARG_* macros

[PHP-CVS] cvs: php-src / Makefile.global run-tests.php

2007-07-04 Thread Dmitry Stogov

dmitry  Wed Jul  4 10:15:49 2007 UTC

  Modified files:  
/php-srcMakefile.global run-tests.php 
  Log:
  Fixed make test
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.82r2=1.83diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.82 php-src/Makefile.global:1.83
--- php-src/Makefile.global:1.82Tue Jul  3 15:56:43 2007
+++ php-src/Makefile.global Wed Jul  4 10:15:47 2007
@@ -98,22 +98,32 @@
 
 utest: all
[EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
-   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? 
php_ini_loaded_file() : no_ini_file;'`  $(top_builddir)/tmp-php.ini; \
+   INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
+   if test $$INI_FILE; then \
+   $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE  
$(top_builddir)/tmp-php.ini; \
+   else \
+   echo  $(top_builddir)/tmp-php.ini; \
+   fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -u -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -u -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
 
 ntest: all
[EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
-   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? 
php_ini_loaded_file() : no_ini_file;'`  $(top_builddir)/tmp-php.ini; \
+   INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
+   if test $$INI_FILE; then \
+   $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE  
$(top_builddir)/tmp-php.ini; \
+   else \
+   echo  $(top_builddir)/tmp-php.ini; \
+   fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -N -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -N -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.327r2=1.328diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.327 php-src/run-tests.php:1.328
--- php-src/run-tests.php:1.327 Fri Jun 29 09:49:40 2007
+++ php-src/run-tests.php   Wed Jul  4 10:15:47 2007
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.327 2007/06/29 09:49:40 dmitry Exp $ */
+/* $Id: run-tests.php,v 1.328 2007/07/04 10:15:47 dmitry Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -407,7 +407,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.327 $'.\n;
+   echo '$Revision: 1.328 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -1231,7 +1231,7 @@
$env['USE_ZEND_ALLOC'] = '1';
}
 
-   $output = system_with_timeout($extra $php -q 
$ini_settings $test_skipif, $env);
+   $output = system_with_timeout($extra $php 
$pass_options -q $ini_settings $test_skipif, $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
}
@@ -1462,7 +1462,7 @@
settings2params($clean_params);
$extra = substr(PHP_OS, 0, 3) !== WIN ?
unset REQUEST_METHOD; unset 
QUERY_STRING; unset

[PHP-CVS] cvs: php-src / Makefile.global

2007-07-03 Thread Dmitry Stogov

dmitry  Tue Jul  3 15:56:43 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  Fixed make test mistakes
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.81r2=1.82diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.81 php-src/Makefile.global:1.82
--- php-src/Makefile.global:1.81Fri Jun 29 15:13:33 2007
+++ php-src/Makefile.global Tue Jul  3 15:56:43 2007
@@ -83,15 +83,15 @@
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
-   if test $(INI_FILE); then \
-   $(EGREP) -v '^extension[\t\ ]=' $(INI_FILE)  
$(top_builddir)/tmp-php.ini; \
+   if test $$INI_FILE; then \
+   $(EGREP) -v '^extension[\t\ ]*=' $$INI_FILE  
$(top_builddir)/tmp-php.ini; \
else \
echo  $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d 
extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-29 Thread Antony Dovgal

tony2001Fri Jun 29 09:14:43 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  fix `make test` with shared extensions
  
  # ok, this is the last ksh-related fix. 
  # it seems to be completely impossible to make it work, so I won't even try 
to do it anymore.
  # complain to Sun and ksh authors if you have any problems.
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.77r2=1.78diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.77 php-src/Makefile.global:1.78
--- php-src/Makefile.global:1.77Wed Jun 27 22:17:31 2007
+++ php-src/Makefile.global Fri Jun 29 09:14:42 2007
@@ -67,7 +67,7 @@
done; \
fi
 
-PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n '-d extension=$$dlname '; done; fi;)`
+PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n -d extension=$$dlname ; done; fi;)`
 PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
 
 test: all

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-29 Thread Antony Dovgal

tony2001Fri Jun 29 11:47:30 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  remove the quotes in for
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.78r2=1.79diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.78 php-src/Makefile.global:1.79
--- php-src/Makefile.global:1.78Fri Jun 29 09:14:42 2007
+++ php-src/Makefile.global Fri Jun 29 11:47:30 2007
@@ -67,7 +67,7 @@
done; \
fi
 
-PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n -d extension=$$dlname ; done; fi;)`
+PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n -d extension=$$dlname ; done; fi;)`
 PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
 
 test: all

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-29 Thread Jani Taskinen

sniper  Fri Jun 29 14:30:25 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  - More portable solution
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.79r2=1.80diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.79 php-src/Makefile.global:1.80
--- php-src/Makefile.global:1.79Fri Jun 29 11:47:30 2007
+++ php-src/Makefile.global Fri Jun 29 14:30:25 2007
@@ -67,8 +67,14 @@
done; \
fi
 
-PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n -d extension=$$dlname ; done; fi;)`
-PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
+PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
+PHP_TEST_SHARED_EXTENSIONS =  ` \
+   if test $(PHP_MODULES); then \
+   for i in $(PHP_MODULES); do \
+   . $$i; shared_exts=$$exts -d extension=$$dlname; \
+   done; \
+   echo $$shared_exts; \
+   fi`
 
 test: all
[EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
@@ -78,10 +84,10 @@
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo 
php_ini_loaded_file();'`; \
-   if test -z $(INI_FILE); then \
-   echo   $(top_builddir)/tmp-php.ini; \
-   else \
+   if test $(INI_FILE); then \
$(EGREP) -v '^extension[\t\ ]=' $(INI_FILE)  
$(top_builddir)/tmp-php.ini; \
+   else \
+   echo  $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-29 Thread Jani Taskinen

sniper  Fri Jun 29 15:13:33 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  - More portable..
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.80r2=1.81diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.80 php-src/Makefile.global:1.81
--- php-src/Makefile.global:1.80Fri Jun 29 14:30:25 2007
+++ php-src/Makefile.global Fri Jun 29 15:13:33 2007
@@ -70,10 +70,9 @@
 PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
 PHP_TEST_SHARED_EXTENSIONS =  ` \
if test $(PHP_MODULES); then \
-   for i in $(PHP_MODULES); do \
-   . $$i; shared_exts=$$exts -d extension=$$dlname; \
+   for i in $(PHP_MODULES); do \
+   . $$i; $(top_srcdir)/build/shtool echo -n --  -d 
extension=$$dlname; \
done; \
-   echo $$shared_exts; \
fi`
 
 test: all

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-27 Thread Antony Dovgal

tony2001Wed Jun 27 22:17:31 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  more ksh fixes
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.76r2=1.77diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.76 php-src/Makefile.global:1.77
--- php-src/Makefile.global:1.76Tue Jun 26 10:22:36 2007
+++ php-src/Makefile.global Wed Jun 27 22:17:31 2007
@@ -67,7 +67,7 @@
done; \
fi
 
-PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n -d extension=$$dlname ; done; fi;)`
+PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z $(PHP_MODULES); then for i in 
$(PHP_MODULES); do . $$i ; echo -n '-d extension=$$dlname '; done; fi;)`
 PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
 
 test: all

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-09 Thread Jani Taskinen

sniper  Sat Jun  9 11:52:49 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  - fix make test issue with extension entries
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.73r2=1.74diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.73 php-src/Makefile.global:1.74
--- php-src/Makefile.global:1.73Wed Jun  6 18:27:54 2007
+++ php-src/Makefile.global Sat Jun  9 11:52:49 2007
@@ -77,6 +77,7 @@
CC=$(CC) \
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
+   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`  
$(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
@@ -87,6 +88,7 @@
 
 utest: all
[EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
+   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`  
$(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
@@ -97,6 +99,7 @@
 
 ntest: all
[EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
+   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`  
$(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-09 Thread Jani Taskinen

sniper  Sat Jun  9 12:07:40 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.74r2=1.75diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.74 php-src/Makefile.global:1.75
--- php-src/Makefile.global:1.74Sat Jun  9 11:52:49 2007
+++ php-src/Makefile.global Sat Jun  9 12:07:40 2007
@@ -77,7 +77,7 @@
CC=$(CC) \
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
-   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`  
$(top_builddir)/tmp-php.ini; \
+   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? 
php_ini_loaded_file() : no_ini_file;'`  $(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
@@ -88,7 +88,7 @@
 
 utest: all
[EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
-   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`  
$(top_builddir)/tmp-php.ini; \
+   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? 
php_ini_loaded_file() : no_ini_file;'`  $(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
@@ -99,7 +99,7 @@
 
 ntest: all
[EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
-   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`  
$(top_builddir)/tmp-php.ini; \
+   $(EGREP) -v '^extension[\t\ ]=' 
`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? 
php_ini_loaded_file() : no_ini_file;'`  $(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-06-06 Thread Jani Taskinen

sniper  Wed Jun  6 18:27:54 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  - Fix for passing of shared extensions to run-tests.php
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.72r2=1.73diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.72 php-src/Makefile.global:1.73
--- php-src/Makefile.global:1.72Wed Apr 11 16:02:56 2007
+++ php-src/Makefile.global Wed Jun  6 18:27:54 2007
@@ -66,38 +66,41 @@
fi \
done; \
fi
+   
+PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do . $$i ; echo -n -d 
extension=$$dlname ; done)`
+PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'output_buffering=0' -d 
'memory_limit=-1'
 
-test: all 
+test: all
[EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
+   $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -U 
$(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -U -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
 
 utest: all
-   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
$(SAPI_CLI_PATH); then \
+   [EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -u 
$(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -u -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
 
 ntest: all
-   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
$(SAPI_CLI_PATH); then \
+   [EMAIL PROTECTED] test ! -z $(SAPI_CLI_PATH)  test -x 
$(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -N 
$(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) 
$(top_srcdir)/run-tests.php -N -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-04-11 Thread Antony Dovgal

tony2001Wed Apr 11 16:02:56 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  we don't ship libmysql anymore, so there is no need for this message
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.71r2=1.72diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.71 php-src/Makefile.global:1.72
--- php-src/Makefile.global:1.71Mon Feb 26 14:51:26 2007
+++ php-src/Makefile.global Wed Apr 11 16:02:56 2007
@@ -9,7 +9,6 @@
@echo
@echo Build complete.
@echo Don't forget to run 'make test'.
-   @echo (It is safe to ignore warnings about tempnam and tmpnam).
@echo

 build-modules: $(PHP_MODULES)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2007-02-26 Thread Antony Dovgal

tony2001Mon Feb 26 14:51:26 2007 UTC

  Modified files:  
/php-srcMakefile.global 
  Log:
  remind about 'make test'
  
  
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.70r2=1.71diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.70 php-src/Makefile.global:1.71
--- php-src/Makefile.global:1.70Wed Jan 10 23:46:08 2007
+++ php-src/Makefile.global Mon Feb 26 14:51:26 2007
@@ -8,6 +8,7 @@
 all: $(all_targets) 
@echo
@echo Build complete.
+   @echo Don't forget to run 'make test'.
@echo (It is safe to ignore warnings about tempnam and tmpnam).
@echo


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /main build-defs.h.in /scripts phpize.m4

2006-04-08 Thread Andrei Zmievski

andrei  Sat Apr  8 17:34:57 2006 UTC

  Modified files:  
/php-srcMakefile.global acinclude.m4 configure.in 
/php-src/main   build-defs.h.in 
/php-src/scriptsphpize.m4 
  Log:
  Separate suffixes of shared libraries that we link against and the ones
  we load with dlopen(). This matters on Mac OS X, for example.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.global?r1=1.68r2=1.69diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.68 php-src/Makefile.global:1.69
--- php-src/Makefile.global:1.68Wed Apr  5 20:21:59 2006
+++ php-src/Makefile.global Sat Apr  8 17:34:57 2006
@@ -25,10 +25,10 @@
 install-sapi: $(OVERALL_TARGET)
@echo Installing PHP SAPI module:   $(PHP_SAPI)
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-   [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); 
then \
+   [EMAIL PROTECTED] test ! -r 
$(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
-   if test -r 
$(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
-   $(LN_S) 
$(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i 
$(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
+   if test -r 
$(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+   $(LN_S) 
$(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.342r2=1.343diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.342 php-src/acinclude.m4:1.343
--- php-src/acinclude.m4:1.342  Mon Mar 27 05:01:48 2006
+++ php-src/acinclude.m4Sat Apr  8 17:34:57 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.342 2006/03/27 05:01:48 andrei Exp $
+dnl $Id: acinclude.m4,v 1.343 2006/04/08 17:34:57 andrei Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1877,20 +1877,43 @@
 dnl -
 
 dnl
-dnl PHP_SHLIB_SUFFIX_NAME
+dnl PHP_SHLIB_BUILD_SUFFIX_NAME
 dnl
-dnl Determines shared library suffix 
+dnl Determines link library suffix
 dnl suffix can be: .so, .sl or .dylib
 dnl
+AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[
+ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
+ PHP_SUBST(SHLIB_SUFFIX_NAME)
+ SHLIB_SUFFIX_NAME=so
+ case $host_alias in
+ *hpux*[)]
+   SHLIB_SUFFIX_NAME=sl
+   ;;
+ *darwin*[)]
+   SHLIB_SUFFIX_NAME=dylib
+   ;;
+ esac
+])
+
+dnl
+dnl PHP_SHLIB_SUFFIX_NAME
+dnl
+dnl Determines shared library suffix
+dnl suffix can be: .so or .sl
+dnl
 AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
-  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
-  PHP_SUBST(SHLIB_SUFFIX_NAME)
-  SHLIB_SUFFIX_NAME=so
-  case $host_alias in
-  *hpux*[)]
-SHLIB_SUFFIX_NAME=sl
-;;
-  esac
+ AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
+ PHP_SUBST(SHLIB_DL_SUFFIX_NAME)
+ SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
+ case $host_alias in
+ *hpux*[)]
+   SHLIB_DL_SUFFIX_NAME=sl
+   ;;
+ *darwin*[)]
+   SHLIB_DL_SUFFIX_NAME=so
+   ;;
+ esac
 ])
 
 dnl
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.601r2=1.602diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.601 php-src/configure.in:1.602
--- php-src/configure.in:1.601  Wed Mar 29 01:52:28 2006
+++ php-src/configure.inSat Apr  8 17:34:57 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.601 2006/03/29 01:52:28 pollita Exp $ -*- autoconf 
-*-
+ ## $Id: configure.in,v 1.602 2006/04/08 17:34:57 andrei Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -225,6 +225,7 @@
 PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAME
+PHP_SHLIB_BUILD_SUFFIX_NAME
 PHP_SAPI=default
 PHP_BUILD_PROGRAM
 
@@ -233,7 +234,7 @@
 dnl -
 
 dnl paths to the targets are relative to the build directory
-SAPI_SHARED=libs/libphp5.$SHLIB_SUFFIX_NAME
+SAPI_SHARED=libs/libphp5.$SHLIB_DL_SUFFIX_NAME
 SAPI_STATIC=libs/libphp5.a
 SAPI_LIBTOOL=libphp5.la
 
@@ -1148,6 +1149,7 @@
 PHP_SUBST(PHP_FRAMEWORKS)
 PHP_SUBST(PHP_FRAMEWORKPATH)
 PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
+PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
 PHP_SUBST(INSTALL_HEADERS)
 
 old_CC=$CC
http://cvs.php.net/viewcvs.cgi/php-src/main/build-defs.h.in?r1=1.17r2=1.18diff_format=u
Index: php-src/main/build-defs.h.in
diff -u php-src/main/build-defs.h.in:1.17 php-src/main/build-defs.h.in:1.18
--- php-src/main/build-defs.h.in:1.17   Sun Jan  1 13:09:57 2006
+++ php-src/main/build-defs.h.inSat Apr  8 17:34:57 2006
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: build-defs.h.in,v 1.17 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id:

[PHP-CVS] cvs: php-src / Makefile.global run-tests.php

2005-12-23 Thread Marcus Boerger

helly   Fri Dec 23 21:01:05 2005 EDT

  Modified files:  
/php-srcMakefile.global run-tests.php 
  Log:
  - Add make target make ntest to test in unicode mode
  - Change make target test to check native and unicode mode
  
  
http://cvs.php.net/viewcvs.cgi/php-src/Makefile.global?r1=1.65r2=1.66diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.65 php-src/Makefile.global:1.66
--- php-src/Makefile.global:1.65Tue Nov 22 00:51:24 2005
+++ php-src/Makefile.global Fri Dec 23 21:01:05 2005
@@ -77,7 +77,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -U $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi
@@ -92,6 +92,16 @@
echo ERROR: Cannot run tests without CLI sapi.; \
fi
 
+ntest: all
+   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
$(SAPI_CLI_PATH); then \
+   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+   TEST_PHP_SRCDIR=$(top_srcdir) \
+   CC=$(CC) \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -N $(TESTS); \
+   else \
+   echo ERROR: Cannot run tests without CLI sapi.; \
+   fi
+
 clean:
find . -name \*.gcno -o -name \*.gcda | xargs rm -f
find . -name \*.lo -o -name \*.o | xargs rm -f
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.266r2=1.267diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.266 php-src/run-tests.php:1.267
--- php-src/run-tests.php:1.266 Fri Dec 23 19:40:01 2005
+++ php-src/run-tests.php   Fri Dec 23 21:01:05 2005
@@ -23,7 +23,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.266 2005/12/23 19:40:01 helly Exp $ */
+/* $Id: run-tests.php,v 1.267 2005/12/23 21:01:05 helly Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -323,6 +323,10 @@
}
$pass_option_n = true;
break;
+   case 'N':
+   $unicode_and_native = false;
+   $unicode_testing = false;
+   break;
case 'q':
putenv('NO_INTERACTION=1');
break;
@@ -382,7 +386,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.266 $'.\n;
+   echo '$Revision: 1.267 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -417,6 +421,8 @@
 
 -m  Test for memory leaks with Valgrind.
 
+-N  Test with unicode_semantics set off.
+
 -s file   Write output to file.
 
 -q  Quite, no user interaction (same as environment 
NO_INTERACTION).

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /ext/standard config.m4 /scripts Makefile.frag php-config.in phpize.m4 /scripts/man1 php-config.1.in

2005-11-21 Thread Jani Taskinen

sniper  Mon Nov 21 18:07:36 2005 EDT

  Modified files:  
/php-srcMakefile.global acinclude.m4 configure.in 
/php-src/ext/standard   config.m4 
/php-src/scriptsMakefile.frag php-config.in phpize.m4 
/php-src/scripts/man1   php-config.1.in 
  Log:
  - Fixed header installing under phpize builds
  http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.63r2=1.64ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.63 php-src/Makefile.global:1.64
--- php-src/Makefile.global:1.63Wed Nov  9 00:41:09 2005
+++ php-src/Makefile.global Mon Nov 21 18:07:31 2005
@@ -5,9 +5,6 @@
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main 
-I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) 
$(PHP_FRAMEWORKPATH)
 
-CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
-INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
-
 all: $(all_targets) 
@echo
@echo Build complete.
@@ -45,6 +42,31 @@
@rm -f modules/*.la /dev/null 21
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
+install-headers:
+   [EMAIL PROTECTED] test $(INSTALL_HEADERS); then
+   for i in $(INSTALL_HEADERS); do \
+   i=`$(top_srcdir)/build/shtool path -d $$i`; \
+   paths=$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i; \
+   done; \
+   $(mkinstalldirs) $$paths  \
+   echo Installing header files:  
$(INSTALL_ROOT)$(phpincludedir)/  \
+   for i in $(INSTALL_HEADERS); do \
+   if test $(PHP_PECL_EXTENSION); then \
+   src=`echo $$i | $(SED) -e 
s#ext/$(PHP_PECL_EXTENSION)/##g`; \
+   else \
+   src=$$i; \
+   fi; \
+   if test -f $(top_srcdir)/$$src; then \
+   $(INSTALL_DATA) $(top_srcdir)/$$src 
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
+   elif test -f $(top_builddir)/$$src; then \
+   $(INSTALL_DATA) $(top_builddir)/$$src 
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
+   else \
+   (cd $(top_srcdir)/$$src  $(INSTALL_DATA) *.h 
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
+   cd $(top_builddir)/$$src  $(INSTALL_DATA) *.h 
$(INSTALL_ROOT)$(phpincludedir)/$$i) 2/dev/null || true; \
+   fi \
+   done; \
+   fi
+
 test: all 
[EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.336r2=1.337ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.336 php-src/acinclude.m4:1.337
--- php-src/acinclude.m4:1.336  Thu Oct 13 16:16:39 2005
+++ php-src/acinclude.m4Mon Nov 21 18:07:31 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.336 2005/10/13 20:16:39 rrichards Exp $
+dnl $Id: acinclude.m4,v 1.337 2005/11/21 23:07:31 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -971,6 +971,13 @@
 EXT_CLI_STATIC=$EXT_CLI_STATIC $1
   fi
   PHP_ADD_BUILD_DIR($ext_builddir)
+
+dnl Set for phpize builds only
+dnl --- 
+  if test $ext_builddir = .; then
+PHP_PECL_EXTENSION=$1
+PHP_SUBST(PHP_PECL_EXTENSION)
+  fi
 ])
 
 dnl
@@ -2375,7 +2382,7 @@
   ifelse([$2],[],[
 for header_file in $1; do
   PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
-INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_file
+INSTALL_HEADERS=$INSTALL_HEADERS $header_file
   ])
 done 
   ], [
@@ -2383,7 +2390,7 @@
 for header_file in $2; do
   hp_hf=$header_path/$header_file
   PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
-INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $hp_hf
+INSTALL_HEADERS=$INSTALL_HEADERS $hp_hf
   ])
 done 
   ])
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.593r2=1.594ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.593 php-src/configure.in:1.594
--- php-src/configure.in:1.593  Thu Nov 17 17:58:07 2005
+++ php-src/configure.inMon Nov 21 18:07:31 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.593 2005/11/17 22:58:07 helly Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.594 2005/11/21 23:07:31 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1188,7 +1188,7 @@
 PHP_SUBST(PHP_FRAMEWORKS)
 PHP_SUBST(PHP_FRAMEWORKPATH)
 PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
-PHP_SUBST(INSTALL_EXT_HEADERS)
+PHP_SUBST(INSTALL_HEADERS)
 
 old_CC=$CC
 
@@ -1257,6 +1257,8 @@
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 
+PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
+
 PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c

[PHP-CVS] cvs: php-src / Makefile.global

2005-11-21 Thread Michael Wallner

mikeMon Nov 21 19:51:24 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  - MF51: fix make install
  
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.64r2=1.65ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.64 php-src/Makefile.global:1.65
--- php-src/Makefile.global:1.64Mon Nov 21 18:07:31 2005
+++ php-src/Makefile.global Mon Nov 21 19:51:24 2005
@@ -43,7 +43,7 @@
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
 install-headers:
-   [EMAIL PROTECTED] test $(INSTALL_HEADERS); then
+   [EMAIL PROTECTED] test $(INSTALL_HEADERS); then \
for i in $(INSTALL_HEADERS); do \
i=`$(top_srcdir)/build/shtool path -d $$i`; \
paths=$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i; \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2005-11-08 Thread Jani Taskinen

sniper  Wed Nov  9 00:41:11 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  Cleanup the code coverage files
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.62r2=1.63ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.62 php-src/Makefile.global:1.63
--- php-src/Makefile.global:1.62Thu Oct  6 15:51:47 2005
+++ php-src/Makefile.global Wed Nov  9 00:41:09 2005
@@ -71,6 +71,7 @@
fi
 
 clean:
+   find . -name \*.gcno -o -name \*.gcda | xargs rm -f
find . -name \*.lo -o -name \*.o | xargs rm -f
find . -name \*.la -o -name \*.a | xargs rm -f 
find . -name \*.so | xargs rm -f

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2005-10-06 Thread Marcus Boerger

helly   Thu Oct  6 15:51:47 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  - Use run-tests.ph -u rather then defining the ini settings one by one
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.61r2=1.62ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.61 php-src/Makefile.global:1.62
--- php-src/Makefile.global:1.61Tue Sep 20 05:21:11 2005
+++ php-src/Makefile.global Thu Oct  6 15:51:47 2005
@@ -65,7 +65,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -d 'unicode_semantics=on' -d 
'unicode.output_encoding=utf-8' $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -u $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2005-09-20 Thread Marcus Boerger

helly   Tue Sep 20 05:21:14 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  - Synch utest with test
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.60r2=1.61ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.60 php-src/Makefile.global:1.61
--- php-src/Makefile.global:1.60Wed Sep 14 13:57:22 2005
+++ php-src/Makefile.global Tue Sep 20 05:21:11 2005
@@ -60,12 +60,12 @@
echo ERROR: Cannot run tests without CLI sapi.; \
fi
 
-utest: 
+utest: all
[EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
$(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php -d 
'unicode_semantics=on' -d 'unicode.output_encoding=utf-8' $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php -d 'unicode_semantics=on' -d 
'unicode.output_encoding=utf-8' $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2005-09-14 Thread Jani Taskinen

sniper  Wed Sep 14 13:57:24 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  Silence warnings under Solaris
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.59r2=1.60ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.59 php-src/Makefile.global:1.60
--- php-src/Makefile.global:1.59Mon Aug 15 18:30:38 2005
+++ php-src/Makefile.global Wed Sep 14 13:57:22 2005
@@ -46,12 +46,12 @@
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
 test: all 
-   [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
+   [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
$(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' 
-d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
-   elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
+   elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global configure.in makerpm run-tests.php server-tests.php /main build-defs.h.in

2005-08-15 Thread Jani Taskinen

sniper  Mon Aug 15 18:30:40 2005 EDT

  Modified files:  
/php-srcMakefile.global configure.in makerpm run-tests.php 
server-tests.php 
/php-src/main   build-defs.h.in 
  Log:
  Goodbye PEAR
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.58r2=1.59ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.58 php-src/Makefile.global:1.59
--- php-src/Makefile.global:1.58Thu Aug 11 19:35:51 2005
+++ php-src/Makefile.global Mon Aug 15 18:30:38 2005
@@ -45,8 +45,6 @@
@rm -f modules/*.la /dev/null 21
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
-install-su: install-pear
-
 test: all 
[EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.584r2=1.585ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.584 php-src/configure.in:1.585
--- php-src/configure.in:1.584  Fri Aug 12 05:05:21 2005
+++ php-src/configure.inMon Aug 15 18:30:38 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.584 2005/08/12 09:05:21 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.585 2005/08/15 22:30:38 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -882,67 +882,6 @@
 
 unset LIBS LDFLAGS
 
-dnl PEAR
-dnl -
-
-PHP_HELP_SEPARATOR([PEAR:])
-PHP_CONFIGURE_PART(Configuring PEAR)
-
-# compatibility
-if test -z $with_pear  test $enable_pear = no; then
-  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 [PREFIX/lib/php]
-  --without-pear  Do not install PEAR], DEFAULT, yes)
-
-if test $PHP_PEAR != no; then
-
-  dnl
-  dnl PEAR dependancies
-  dnl
-  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 --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 --without-pear)
-  fi
-
-dnl
-dnl ext/xmlrpc is not really there yet to be a requirement..
-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 --without-pear)
-dnl fi
-dnl
-
-  if test $pear_error_msg; then
-AC_MSG_ERROR([$pear_error_msg])
-  fi
-
-  install_pear=install-pear
-  PEAR_INSTALLDIR=$PHP_PEAR
-
-  if test $PHP_PEAR = DEFAULT || test $PHP_PEAR = yes; then
-case $PHP_LAYOUT in
-  GNU) PEAR_INSTALLDIR=$datadir/pear;;
-  *)   PEAR_INSTALLDIR=$libdir/php;;
-esac
-  fi
-
-  
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
-fi
-
-
 dnl Configuring Zend and TSRM.
 dnl -
 
@@ -1043,7 +982,6 @@
 fi
 
 dnl Expand all directory names for use in macros/constants
-EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR`
 EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR`
 EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir`
 EXPANDED_BINDIR=`eval echo $bindir`
@@ -1052,14 +990,13 @@
 EXPANDED_DATADIR=$datadir
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo $PHP_CONFIG_FILE_PATH`
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo $PHP_CONFIG_FILE_SCAN_DIR`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH=.
 
 exec_prefix=$old_exec_prefix
 libdir=$old_libdir
 datadir=$old_datadir
 
 AC_SUBST(INCLUDE_PATH)
-AC_SUBST(EXPANDED_PEAR_INSTALLDIR)
 AC_SUBST(EXPANDED_EXTENSION_DIR)
 AC_SUBST(EXPANDED_BINDIR)
 AC_SUBST(EXPANDED_LIBDIR)
@@ -1158,7 +1095,6 @@
 PHP_SUBST(LIBTOOL)
 PHP_SUBST(LN_S)
 PHP_SUBST_OLD(NATIVE_RPATHS)
-PHP_SUBST_OLD(PEAR_INSTALLDIR)
 PHP_SUBST(PHP_BUILD_DATE)
 PHP_SUBST_OLD(PHP_LDFLAGS)
 PHP_SUBST_OLD(PHP_LIBS)
@@ -1224,7 +1160,7 @@
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets=$install_modules $install_pear install-build install-headers 
install-programs
+install_targets=$install_modules install-build install-headers 
install-programs
 
 case $PHP_SAPI in
   cgi)
@@ -1307,7 +1243,6 @@
 
 AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
 
-$php_shtool mkdir -p pear/scripts
 $php_shtool mkdir -p scripts
 $php_shtool mkdir -p scripts/man1
 
http://cvs.php.net/diff.php/php-src/makerpm?r1=1.8r2=1.9ty=u
Index: php-src/makerpm
diff -u php-src/makerpm:1.8 php-src/makerpm:1.9
--- php-src/makerpm:1.8 Sun Feb  8 17:49:47 2004
+++ php-src/makerpm Mon Aug 15 18:30:38 2005
@@ -64,7 +64,6 @@
 sh ./configure --prefix=/usr \

[PHP-CVS] cvs: php-src / Makefile.global configure.in /scripts Makefile.frag php-config.in phpize.in phpize.m4 /scripts/man1 php-config.1.in

2005-08-08 Thread Jani Taskinen

sniper  Mon Aug  8 12:06:51 2005 EDT

  Modified files:  
/php-srcMakefile.global configure.in 
/php-src/scriptsMakefile.frag php-config.in phpize.in phpize.m4 
/php-src/scripts/man1   php-config.1.in 
  Log:
  - Made it possible to do make test for phpized extensions
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.55r2=1.56ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.55 php-src/Makefile.global:1.56
--- php-src/Makefile.global:1.55Thu Jun 16 14:58:04 2005
+++ php-src/Makefile.global Mon Aug  8 12:06:47 2005
@@ -45,15 +45,15 @@
@rm -f modules/*.la /dev/null 21
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
-install-tester:
-   @echo Installing regression tester: 
$(INSTALL_ROOT)$(PEAR_INSTALLDIR)/
-   @$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-   @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php 
$(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-
-install-su: install-pear install-tester
+install-su: install-pear
 
 test: 
-   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
$(SAPI_CLI_PATH); then \
+   [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
+   TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+   TEST_PHP_SRCDIR=$(top_srcdir) \
+   CC=$(CC) \
+   $(PHP_EXECUTABLE) -d 'extension_dir=modules/' -d 
'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php tests/; \
+   elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.578r2=1.579ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.578 php-src/configure.in:1.579
--- php-src/configure.in:1.578  Sun Aug  7 16:47:29 2005
+++ php-src/configure.inMon Aug  8 12:06:47 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.578 2005/08/07 20:47:29 hholzgra Exp $ -*- autoconf 
-*-
+ ## $Id: configure.in,v 1.579 2005/08/08 16:06:47 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1082,8 +1082,8 @@
 
 PHP_SUBST(bindir)
 PHP_SUBST(exec_prefix)
-PHP_SUBST(program_prefix)
-PHP_SUBST(program_suffix)
+PHP_SUBST_OLD(program_prefix)
+PHP_SUBST_OLD(program_suffix)
 PHP_SUBST(includedir)
 PHP_SUBST(libdir)
 PHP_SUBST(mandir)
@@ -1183,7 +1183,7 @@
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets=$install_modules $install_pear install-build install-headers 
install-programs install-tester
+install_targets=$install_modules $install_pear install-build install-headers 
install-programs
 
 case $PHP_SAPI in
   cgi)
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.23r2=1.24ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.23 php-src/scripts/Makefile.frag:1.24
--- php-src/scripts/Makefile.frag:1.23  Tue Jun  7 17:56:09 2005
+++ php-src/scripts/Makefile.frag   Mon Aug  8 12:06:48 2005
@@ -13,7 +13,9 @@
build/libtool.m4 \
Makefile.global \
acinclude.m4 \
-   ltmain.sh
+   ltmain.sh \
+   run-tests.php \
+   run-tests-config.php
 
 BUILD_FILES_EXEC = \
build/shtool \
http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.2r2=1.3ty=u
Index: php-src/scripts/php-config.in
diff -u php-src/scripts/php-config.in:1.2 php-src/scripts/php-config.in:1.3
--- php-src/scripts/php-config.in:1.2   Wed Mar 16 01:36:44 2005
+++ php-src/scripts/php-config.in   Mon Aug  8 12:06:49 2005
@@ -1,12 +1,17 @@
 #! /bin/sh
 
 prefix=@prefix@
+exec_prefix=@exec_prefix@
 version=@PHP_VERSION@
 includedir=@includedir@/php
 includes=-I$includedir -I$includedir/main -I$includedir/TSRM 
-I$includedir/Zend
 ldflags=@PHP_LDFLAGS@
 libs=@EXTRA_LIBS@
 extension_dir='@EXTENSION_DIR@'
+program_prefix=@program_prefix@
+program_suffix=@program_suffix@
+exe_extension=@EXEEXT@
+php_binary=@bindir@/${program_prefix}php${program_suffix}${exe_extension}
 
 case $1 in
 --prefix)
@@ -19,10 +24,12 @@
echo $libs;;
 --extension-dir)
echo $extension_dir;;
+--php-binary)
+   echo $php_binary;;
 --version)
echo $version;;
 *)
-   echo Usage: $0 
[--prefix|--includes|--ldflags|--libs|--extension-dir|--version]
+   echo Usage: $0 
[--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]
exit 1;;
 esac
 
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.26r2=1.27ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.26 php-src/scripts/phpize.in:1.27
--- php-src/scripts/phpize.in:1.26  Thu Aug  4 12:57:15 2005
+++ php-src/scripts/phpize.in   Mon Aug

[PHP-CVS] cvs: php-src / Makefile.global

2005-08-08 Thread Hartmut Holzgraefe

hholzgraMon Aug  8 13:49:32 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  put the -d extension loading options in the right place,
  get rid of basename
  
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.56r2=1.57ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.56 php-src/Makefile.global:1.57
--- php-src/Makefile.global:1.56Mon Aug  8 12:06:47 2005
+++ php-src/Makefile.global Mon Aug  8 13:49:32 2005
@@ -47,12 +47,12 @@
 
 install-su: install-pear
 
-test: 
+test: all 
[EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(PHP_EXECUTABLE) -d 'extension_dir=modules/' -d 
'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php tests/; \
+   $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' 
-d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` 
tests/; \
elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.global configure.in /scripts Makefile.frag php-config.in phpize.in phpize.m4 /scripts/man1 php-config.1.in

2005-08-08 Thread Marcus Boerger

Hello Jani,

  what about server-tests.php?

marcus

Monday, August 8, 2005, 6:06:51 PM, you wrote:

 sniper  Mon Aug  8 12:06:51 2005 EDT

   Modified files:  
 /php-srcMakefile.global configure.in 
 /php-src/scriptsMakefile.frag php-config.in phpize.in phpize.m4 
 /php-src/scripts/man1   php-config.1.in 
   Log:
   - Made it possible to do make test for phpized extensions
  
 http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.55r2=1.56ty=u
 Index: php-src/Makefile.global
 diff -u php-src/Makefile.global:1.55 php-src/Makefile.global:1.56
 --- php-src/Makefile.global:1.55Thu Jun 16 14:58:04 2005
 +++ php-src/Makefile.global Mon Aug  8 12:06:47 2005
 @@ -45,15 +45,15 @@
 @rm -f modules/*.la /dev/null 21
 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
 -install-tester:
 -   @echo Installing regression tester: 
 $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/
 -   @$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 -   @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php 
 $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 -
 -install-su: install-pear install-tester
 +install-su: install-pear
 
  test: 
 -   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
 $(SAPI_CLI_PATH); then \
 +   [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
 $(PHP_EXECUTABLE); then \
 +   TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 +   TEST_PHP_SRCDIR=$(top_srcdir) \
 +   CC=$(CC) \
 +   $(PHP_EXECUTABLE) -d 'extension_dir=modules/'
 -d 'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d
 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
 $(top_srcdir)/run-tests.php tests/; \
 +   elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
 TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 TEST_PHP_SRCDIR=$(top_srcdir) \
 CC=$(CC) \
 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.578r2=1.579ty=u
 Index: php-src/configure.in
 diff -u php-src/configure.in:1.578 php-src/configure.in:1.579
 --- php-src/configure.in:1.578  Sun Aug  7 16:47:29 2005
 +++ php-src/configure.inMon Aug  8 12:06:47 2005
 @@ -1,4 +1,4 @@
 - ## $Id: configure.in,v 1.578 2005/08/07 20:47:29 hholzgra Exp $ -*- 
 autoconf -*-
 + ## $Id: configure.in,v 1.579 2005/08/08 16:06:47 sniper Exp $ -*- autoconf 
 -*-
  dnl ## Process this file with autoconf to produce a configure script.
 
  divert(1)
 @@ -1082,8 +1082,8 @@
 
  PHP_SUBST(bindir)
  PHP_SUBST(exec_prefix)
 -PHP_SUBST(program_prefix)
 -PHP_SUBST(program_suffix)
 +PHP_SUBST_OLD(program_prefix)
 +PHP_SUBST_OLD(program_suffix)
  PHP_SUBST(includedir)
  PHP_SUBST(libdir)
  PHP_SUBST(mandir)
 @@ -1183,7 +1183,7 @@
  CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
  all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
 -install_targets=$install_modules $install_pear install-build
 install-headers install-programs install-tester
 +install_targets=$install_modules $install_pear install-build 
 install-headers install-programs
 
  case $PHP_SAPI in
cgi)
 http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.23r2=1.24ty=u
 Index: php-src/scripts/Makefile.frag
 diff -u php-src/scripts/Makefile.frag:1.23 php-src/scripts/Makefile.frag:1.24
 --- php-src/scripts/Makefile.frag:1.23  Tue Jun  7 17:56:09 2005
 +++ php-src/scripts/Makefile.frag   Mon Aug  8 12:06:48 2005
 @@ -13,7 +13,9 @@
 build/libtool.m4 \
 Makefile.global \
 acinclude.m4 \
 -   ltmain.sh
 +   ltmain.sh \
 +   run-tests.php \
 +   run-tests-config.php
 
  BUILD_FILES_EXEC = \
 build/shtool \
 http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.2r2=1.3ty=u
 Index: php-src/scripts/php-config.in
 diff -u php-src/scripts/php-config.in:1.2 php-src/scripts/php-config.in:1.3
 --- php-src/scripts/php-config.in:1.2   Wed Mar 16 01:36:44 2005
 +++ php-src/scripts/php-config.in   Mon Aug  8 12:06:49 2005
 @@ -1,12 +1,17 @@
  #! /bin/sh
 
  prefix=@prefix@
 +exec_prefix=@exec_prefix@
  version=@PHP_VERSION@
  includedir=@includedir@/php
  includes=-I$includedir -I$includedir/main -I$includedir/TSRM 
 -I$includedir/Zend
  ldflags=@PHP_LDFLAGS@
  libs=@EXTRA_LIBS@
  extension_dir='@EXTENSION_DIR@'
 +program_prefix=@program_prefix@
 +program_suffix=@program_suffix@
 +exe_extension=@EXEEXT@
 +php_binary=@bindir@/${program_prefix}php${program_suffix}${exe_extension}
 
  case $1 in
  --prefix)
 @@ -19,10 +24,12 @@
 echo $libs;;
  --extension-dir)
 echo $extension_dir;;
 +--php-binary)
 +   echo $php_binary;;
  --version)
 echo $version;;
  *)
 -   echo Usage: $0
 [--prefix|--includes|--ldflags|--libs|--extension-dir|--version]
 +   echo Usage: $0
 [--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]
 exit 1;;
  esac

Re: [PHP-CVS] cvs: php-src / Makefile.global configure.in /scripts Makefile.frag php-config.in phpize.in phpize.m4 /scripts/man1 php-config.1.in

2005-08-08 Thread Jani Taskinen



What's that? :)

--Jani

On Mon, 8 Aug 2005, Marcus Boerger wrote:


Hello Jani,

 what about server-tests.php?

marcus

Monday, August 8, 2005, 6:06:51 PM, you wrote:


sniper  Mon Aug  8 12:06:51 2005 EDT



  Modified files:
/php-srcMakefile.global configure.in
/php-src/scriptsMakefile.frag php-config.in phpize.in phpize.m4
/php-src/scripts/man1   php-config.1.in
  Log:
  - Made it possible to do make test for phpized extensions



http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.55r2=1.56ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.55 php-src/Makefile.global:1.56
--- php-src/Makefile.global:1.55Thu Jun 16 14:58:04 2005
+++ php-src/Makefile.global Mon Aug  8 12:06:47 2005
@@ -45,15 +45,15 @@
@rm -f modules/*.la /dev/null 21
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)



-install-tester:
-   @echo Installing regression tester: 
$(INSTALL_ROOT)$(PEAR_INSTALLDIR)/
-   @$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-   @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php 
$(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-
-install-su: install-pear install-tester
+install-su: install-pear



 test:
-   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z 
$(SAPI_CLI_PATH); then \
+   [EMAIL PROTECTED] test ! -z $(PHP_EXECUTABLE)  test -x 
$(PHP_EXECUTABLE); then \
+   TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+   TEST_PHP_SRCDIR=$(top_srcdir) \
+   CC=$(CC) \
+   $(PHP_EXECUTABLE) -d 'extension_dir=modules/'
-d 'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
$(top_srcdir)/run-tests.php tests/; \
+   elif test ! -z $(SAPI_CLI_PATH)  test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.578r2=1.579ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.578 php-src/configure.in:1.579
--- php-src/configure.in:1.578  Sun Aug  7 16:47:29 2005
+++ php-src/configure.inMon Aug  8 12:06:47 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.578 2005/08/07 20:47:29 hholzgra Exp $ -*- autoconf 
-*-
+ ## $Id: configure.in,v 1.579 2005/08/08 16:06:47 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.



 divert(1)
@@ -1082,8 +1082,8 @@



 PHP_SUBST(bindir)
 PHP_SUBST(exec_prefix)
-PHP_SUBST(program_prefix)
-PHP_SUBST(program_suffix)
+PHP_SUBST_OLD(program_prefix)
+PHP_SUBST_OLD(program_suffix)
 PHP_SUBST(includedir)
 PHP_SUBST(libdir)
 PHP_SUBST(mandir)
@@ -1183,7 +1183,7 @@
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag



 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets=$install_modules $install_pear install-build
install-headers install-programs install-tester
+install_targets=$install_modules $install_pear install-build install-headers 
install-programs



 case $PHP_SAPI in
   cgi)
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.23r2=1.24ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.23 php-src/scripts/Makefile.frag:1.24
--- php-src/scripts/Makefile.frag:1.23  Tue Jun  7 17:56:09 2005
+++ php-src/scripts/Makefile.frag   Mon Aug  8 12:06:48 2005
@@ -13,7 +13,9 @@
build/libtool.m4 \
Makefile.global \
acinclude.m4 \
-   ltmain.sh
+   ltmain.sh \
+   run-tests.php \
+   run-tests-config.php



 BUILD_FILES_EXEC = \
build/shtool \
http://cvs.php.net/diff.php/php-src/scripts/php-config.in?r1=1.2r2=1.3ty=u
Index: php-src/scripts/php-config.in
diff -u php-src/scripts/php-config.in:1.2 php-src/scripts/php-config.in:1.3
--- php-src/scripts/php-config.in:1.2   Wed Mar 16 01:36:44 2005
+++ php-src/scripts/php-config.in   Mon Aug  8 12:06:49 2005
@@ -1,12 +1,17 @@
 #! /bin/sh



 prefix=@prefix@
+exec_prefix=@exec_prefix@
 version=@PHP_VERSION@
 includedir=@includedir@/php
 includes=-I$includedir -I$includedir/main -I$includedir/TSRM 
-I$includedir/Zend
 ldflags=@PHP_LDFLAGS@
 libs=@EXTRA_LIBS@
 extension_dir='@EXTENSION_DIR@'
+program_prefix=@program_prefix@
+program_suffix=@program_suffix@
+exe_extension=@EXEEXT@
+php_binary=@bindir@/${program_prefix}php${program_suffix}${exe_extension}



 case $1 in
 --prefix)
@@ -19,10 +24,12 @@
echo $libs;;
 --extension-dir)
echo $extension_dir;;
+--php-binary)
+   echo $php_binary;;
 --version)
echo $version;;
 *)
-   echo Usage: $0
[--prefix|--includes|--ldflags|--libs|--extension-dir|--version]
+   echo Usage: $0
[--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]
exit 1;;
 esac



http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.26r2=1.27ty=u
Index: php-src/scripts/phpize.in
diff

[PHP-CVS] cvs: php-src / Makefile.global

2005-06-16 Thread Marcus Boerger

helly   Thu Jun 16 14:58:05 2005 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  - No more memory_limit for running tests
  
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.54r2=1.55ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.54 php-src/Makefile.global:1.55
--- php-src/Makefile.global:1.54Fri May 27 09:10:01 2005
+++ php-src/Makefile.global Thu Jun 16 14:58:04 2005
@@ -57,7 +57,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.global

2005-06-16 Thread Jani Taskinen



You meant Use memory_limit for running tests., right ?
(memory_limit=1 switches it on..afaik :)

-Jani

On Thu, 16 Jun 2005, Marcus Boerger wrote:


helly   Thu Jun 16 14:58:05 2005 EDT

 Modified files:
   /php-src Makefile.global
 Log:
 - No more memory_limit for running tests

http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.54r2=1.55ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.54 php-src/Makefile.global:1.55
--- php-src/Makefile.global:1.54Fri May 27 09:10:01 2005
+++ php-src/Makefile.global Thu Jun 16 14:58:04 2005
@@ -57,7 +57,7 @@
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' 
$(top_srcdir)/run-tests.php $(TESTS); \
else \
echo ERROR: Cannot run tests without CLI sapi.; \
fi




--
Donate @ http://pecl.php.net/wishlist.php/sniper

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / Makefile.global

2005-06-16 Thread Marcus Boerger

Hello Jani,

 no i meant switching it off (i wrote memory_limit=-1) since in my case the
ini default of 8M no longer works.

marcus

Friday, June 17, 2005, 12:34:39 AM, you wrote:


  You meant Use memory_limit for running tests., right ?
  (memory_limit=1 switches it on..afaik :)

  -Jani

 On Thu, 16 Jun 2005, Marcus Boerger wrote:

 helly Thu Jun 16 14:58:05 2005 EDT

  Modified files:
/php-src   Makefile.global
  Log:
  - No more memory_limit for running tests

 http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.54r2=1.55ty=u
 Index: php-src/Makefile.global
 diff -u php-src/Makefile.global:1.54 php-src/Makefile.global:1.55
 --- php-src/Makefile.global:1.54  Fri May 27 09:10:01 2005
 +++ php-src/Makefile.global   Thu Jun 16 14:58:04 2005
 @@ -57,7 +57,7 @@
   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
   TEST_PHP_SRCDIR=$(top_srcdir) \
   CC=$(CC) \
 - $(top_builddir)/$(SAPI_CLI_PATH) -d
 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0'
 $(top_srcdir)/run-tests.php $(TESTS); \
 + $(top_builddir)/$(SAPI_CLI_PATH) -d
 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d
 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
   else \
   echo ERROR: Cannot run tests without CLI sapi.; \
   fi






-- 
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 / Makefile.global acinclude.m4

2005-05-27 Thread Jani Taskinen

sniper  Fri May 27 09:10:01 2005 EDT

  Modified files:  
/php-srcacinclude.m4 Makefile.global 
  Log:
  - Use $SED and $EGREP where possible
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.307r2=1.308ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.307 php-src/acinclude.m4:1.308
--- php-src/acinclude.m4:1.307  Sat May 21 14:42:39 2005
+++ php-src/acinclude.m4Fri May 27 09:10:01 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.307 2005/05/21 18:42:39 rasmus Exp $
+dnl $Id: acinclude.m4,v 1.308 2005/05/27 13:10:01 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -47,7 +47,7 @@
 dnl
 AC_DEFUN([PHP_RUN_ONCE],[
   changequote({,})
-  unique=`echo $2|sed 's/[^a-zA-Z0-9]/_/g'`
+  unique=`echo $2|$SED 's/[^a-zA-Z0-9]/_/g'`
   changequote([,])
   cmd=echo $ac_n \\$$1$unique$ac_c\
   if test -n $unique  test `eval $cmd` =  ; then
@@ -66,7 +66,7 @@
 $2=$1
   else
 changequote({,})
-ep_dir=`echo $1|sed 's%/*[^/][^/]*/*$%%'`
+ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'`
 changequote([,])
 ep_realdir=`(cd \$ep_dir\  pwd)`
 $2=$ep_realdir/`basename \$1\`
@@ -143,7 +143,7 @@
  Makefile.fragments
 dnl We need to play tricks here to avoid matching the grep line itself
 pattern=define
-egrep $pattern'.*include/php' $srcdir/configure|sed 's/.*//'|xargs touch 
2/dev/null
+$EGREP $pattern'.*include/php' $srcdir/configure|$SED 's/.*//'|xargs touch 
2/dev/null
 ])
 
 dnl
@@ -177,7 +177,7 @@
   ifelse($1,,src=$ext_srcdir/Makefile.frag,src=$1)
   ifelse($2,,ac_srcdir=$ext_srcdir,ac_srcdir=$2)
   ifelse($3,,ac_builddir=$ext_builddir,ac_builddir=$3)
-  sed -e s#\$(srcdir)#$ac_srcdir#g -e s#\$(builddir)#$ac_builddir#g $src  
 Makefile.fragments
+  $SED -e s#\$(srcdir)#$ac_srcdir#g -e s#\$(builddir)#$ac_builddir#g $src  
 Makefile.fragments
 ])
 
 dnl
@@ -333,7 +333,7 @@
   AC_CACHE_CHECK([whether $CC supports $1], 
[ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
   echo 'void somefunc() { };'  conftest.c
   cmd='$CC $1 -c conftest.c'
-  if eval $cmd 21 | egrep -e $1 /dev/null ; then
+  if eval $cmd 21 | $EGREP -e $1 /dev/null ; then
 ac_result=no
   else
 ac_result=yes
@@ -356,7 +356,7 @@
 dnl
 AC_DEFUN([PHP_LIBGCC_LIBPATH],[
   changequote({,})
-  libgcc_libpath=`$1 --print-libgcc-file-name|sed 's%/*[^/][^/]*$%%'`
+  libgcc_libpath=`$1 --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'`
   changequote([,])
 ])
 
@@ -655,7 +655,7 @@
 ext_shared=yes
 case [$]$1 in
 shared,*[)]
-  $1=`echo [$]$1|sed 's/^shared,//'`
+  $1=`echo [$]$1|$SED 's/^shared,//'`
   ;;
 shared[)]
   $1=yes
@@ -929,7 +929,7 @@
   ext_builddir=[]PHP_EXT_BUILDDIR($1)
   ext_srcdir=[]PHP_EXT_SRCDIR($1)
 
-  ifelse($5,,ac_extra=,[ac_extra=`echo $5|sed [EMAIL 
PROTECTED]@#$ext_srcdir#g|sed [EMAIL PROTECTED]@#$ext_builddir#g`])
+  ifelse($5,,ac_extra=,[ac_extra=`echo $5|$SED [EMAIL 
PROTECTED]@#$ext_srcdir#g|$SED [EMAIL PROTECTED]@#$ext_builddir#g`])
 
   if test $3 != shared  test $3 != yes  test $4 != cli; then
 dnl -- Static module
@@ -1943,7 +1943,7 @@
   AC_PROG_YACC
   if test $YACC = bison -y; then
 AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
-  set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ 
/'|tr -d a-z`
+  set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 
's/\./ /'|tr -d a-z`
   if test ( ${1} = 1 -a ( ${2} = 28 -o ${2} = 35 -o ${2} 
= 75 -o ${2} = 875 ) ) -o ( ${1} = 2 -a ( ${2} = 0 ) 
); then
 php_cv_bison_version=${1}.${2} (ok)
   else
@@ -1981,7 +1981,7 @@
 
   if test $LEX ;then
 AC_CACHE_CHECK([for flex version], php_cv_flex_version, [
-  flexvers=`echo  | $LEX -V -v --version 2/dev/null | sed -e 's/^.* //' 
-e 's/\./ /g'`
+  flexvers=`echo  | $LEX -V -v --version 2/dev/null | $SED -e 's/^.* 
//' -e 's/\./ /g'`
   if test ! -z $flexvers; then
 set $flexvers
 if test ${1} != 2 -o ${2} != 5 -o ${3} != 4; then
@@ -2426,6 +2426,10 @@
 dnl Generates the config.nice file
 dnl
 AC_DEFUN([PHP_CONFIG_NICE],[
+  AC_REQUIRE([AC_PROG_EGREP])
+  AC_REQUIRE([LT_AC_PROG_SED])
+  PHP_SUBST(EGREP)
+  PHP_SUBST(SED)
   test -f $1  mv $1 $1.old
   rm -f $1.old
   cat $1EOF
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.53r2=1.54ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.53 php-src/Makefile.global:1.54
--- php-src/Makefile.global:1.53Mon May 23 05:37:34 2005
+++ php-src/Makefile.global Fri May 27 09:10:01 2005
@@ -71,7 +71,7 @@
 
 distclean: clean
rm -f config.cache config.log config.status Makefile.objects 
Makefile.fragments libtool main/php_config.h stamp-h php5.spec 
sapi/apache/libphp5.module buildmk.stamp
-   egrep define'.*include/php' $(top_srcdir)/configure|sed 's/.*//'|xargs 
rm -f
+   $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 
's/.*//'|xargs rm -f
find . -name Makefile | xargs rm -f

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in /ext/curl config.m4 /ext/dom config.m4 /ext/iconv config.m4 /ext/interbase php_ibase_udf.c /ext/libxml config0.m4 /ext/mbstring

2005-05-06 Thread Jani Taskinen

sniper  Fri May  6 22:51:54 2005 EDT

  Removed files:   
/php-src/ext/pdoMakefile.frag 

  Modified files:  
/php-srcMakefile.global acinclude.m4 configure.in 
/php-src/ext/curl   config.m4 
/php-src/ext/domconfig.m4 
/php-src/ext/iconv  config.m4 
/php-src/ext/interbase  php_ibase_udf.c 
/php-src/ext/libxml config0.m4 
/php-src/ext/mbstring   config.m4 
/php-src/ext/odbc   config.m4 
/php-src/ext/pdoconfig.m4 
/php-src/ext/pdo_sqlite .cvsignore config.m4 
/php-src/ext/pdo_sqlite/sqlite/src  .cvsignore 
/php-src/ext/sessionconfig.m4 
/php-src/ext/sqlite config.m4 
/php-src/ext/xmlconfig.m4 
/php-src/sapi/embed config.m4 
/php-src/scriptsMakefile.frag phpize.m4 
  Log:
  - Added PHP_INSTALL_HEADERS() macro
  - Fixed several VPATH build issues
  - Changed all awk calls to use $AWK
  - Changed all mkdir calls to use $php_shtool mkdir
  
  http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.51r2=1.52ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.51 php-src/Makefile.global:1.52
--- php-src/Makefile.global:1.51Thu Dec  4 10:57:55 2003
+++ php-src/Makefile.global Fri May  6 22:51:50 2005
@@ -5,6 +5,8 @@
 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main 
-I$(top_srcdir)
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) 
$(PHP_FRAMEWORKPATH)
 
+CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
+INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
 
 all: $(all_targets) 
@echo
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.305r2=1.306ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.305 php-src/acinclude.m4:1.306
--- php-src/acinclude.m4:1.305  Sat Apr 30 05:29:09 2005
+++ php-src/acinclude.m4Fri May  6 22:51:50 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.305 2005/04/30 09:29:09 sniper Exp $
+dnl $Id: acinclude.m4,v 1.306 2005/05/07 02:51:50 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -138,7 +138,7 @@
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
 AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
-test -d include || mkdir include
+test -d include || $php_shtool mkdir include
  Makefile.objects
  Makefile.fragments
 dnl We need to play tricks here to avoid matching the grep line itself
@@ -901,7 +901,11 @@
 ])
 
 AC_DEFUN([PHP_ADD_BUILD_DIR],[
-  BUILD_DIR=$BUILD_DIR $1
+  ifelse($2,,[
+BUILD_DIR=$BUILD_DIR $1
+  ], [
+$php_shtool mkdir -p $1
+  ])
 ])
 
 AC_DEFUN([PHP_GEN_BUILD_DIRS],[
@@ -919,13 +923,13 @@
 dnl shared can be set to shared or yes to build the extension as
 dnl a dynamically loadable library. Optional parameter sapi_class can
 dnl be set to cli to mark extension build only with CLI or CGI sapi's.
-dnl extra-cflags are passed to the compiler, with @ext_srcdir@ being
-dnl substituted.
+dnl extra-cflags are passed to the compiler, with 
+dnl @ext_srcdir@ and @ext_builddir@ being substituted.
 AC_DEFUN([PHP_NEW_EXTENSION],[
   ext_builddir=[]PHP_EXT_BUILDDIR($1)
   ext_srcdir=[]PHP_EXT_SRCDIR($1)
 
-  ifelse($5,,ac_extra=,[ac_extra=`echo $5|sed [EMAIL 
PROTECTED]@#$ext_srcdir#g`])
+  ifelse($5,,ac_extra=,[ac_extra=`echo $5|sed [EMAIL 
PROTECTED]@#$ext_srcdir#g|sed [EMAIL PROTECTED]@#$ext_builddir#g`])
 
   if test $3 != shared  test $3 != yes  test $4 != cli; then
 dnl -- Static module
@@ -2345,6 +2349,29 @@
 dnl Misc. macros
 dnl -
 
+dnl 
+dnl PHP_INSTALL_HEADERS(path [, file ...])
+dnl
+dnl PHP header files to be installed
+dnl
+AC_DEFUN([PHP_INSTALL_HEADERS],[
+  if test -z $2; then
+for header_file in $1; do
+  PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
+INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_file
+  ])
+done 
+  else
+header_path=$1
+for header_file in $2; do
+  hp_hf=$header_path/$header_file
+  PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
+INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $hp_hf
+  ])
+done 
+  fi
+])
+
 dnl
 dnl PHP_AP_EXTRACT_VERSION(/path/httpd)
 dnl
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.552r2=1.553ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.552 php-src/configure.in:1.553
--- php-src/configure.in:1.552  Sat Apr 30 00:27:23 2005
+++ php-src/configure.inFri May  6 22:51:50 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.552 2005/04/30 04:27:23 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.553 2005/05/07 02:51:50 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1122,6 +1122,7 @@
 PHP_SUBST(PHP_FRAMEWORKS)
 PHP_SUBST(PHP_FRAMEWORKPATH)
 PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
+PHP_SUBST(INSTALL_EXT_HEADERS)
 
 old_CC=$CC

[PHP-CVS] cvs: php-src / Makefile.global acinclude.m4 configure.in

2003-12-04 Thread Jani Taskinen

sniper  Thu Dec  4 10:57:56 2003 EDT

  Modified files:  
/php-srcMakefile.global acinclude.m4 configure.in 
  Log:
  - Only add 'install-modules' into install targets when there are such
modules to install.
  
  
  
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.50 php-src/Makefile.global:1.51
--- php-src/Makefile.global:1.50Thu Jul 24 13:44:16 2003
+++ php-src/Makefile.global Thu Dec  4 10:57:55 2003
@@ -38,10 +38,10 @@
 
 install-modules: build-modules
@test -d modules  \
-   $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)  \
-   echo Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/  \
-   rm -f modules/*.la  \
-   $(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) /dev/null 21 || true
+   $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
+   @echo Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/
+   @rm -f modules/*.la /dev/null 21
+   @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
 
 install-tester:
@echo Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.265 php-src/acinclude.m4:1.266
--- php-src/acinclude.m4:1.265  Thu Nov 13 09:17:47 2003
+++ php-src/acinclude.m4Thu Dec  4 10:57:55 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.265 2003/11/13 14:17:47 sniper Exp $
+dnl $Id: acinclude.m4,v 1.266 2003/12/04 15:57:55 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1153,6 +1153,7 @@
 dnl from object_var in build-dir.
 dnl
 AC_DEFUN([PHP_SHARED_MODULE],[
+  install_modules=install-modules
   PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.la
   PHP_SUBST($2)
   cat Makefile.objectsEOF
Index: php-src/configure.in
diff -u php-src/configure.in:1.482 php-src/configure.in:1.483
--- php-src/configure.in:1.482  Thu Dec  4 08:41:48 2003
+++ php-src/configure.inThu Dec  4 10:57:55 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.482 2003/12/04 13:41:48 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.483 2003/12/04 15:57:55 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1149,7 +1149,7 @@
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets=install-modules $install_pear install-build install-headers 
install-programs
+install_targets=$install_modules $install_pear install-build install-headers 
install-programs
 
 case $PHP_SAPI in
   cgi)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global run-tests.php

2003-07-24 Thread Ilia Alshanetsky

iliaa   Thu Jul 24 13:44:16 2003 EDT

  Modified files:  
/php-srcrun-tests.php Makefile.global 
  Log:
  When encountering a test that users GET/POST make run-tests.php use CGI
  sapi if it is avaliable.
  If CLI sapi is not avaliable print a clear error when make test is executed.
  
  
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.166 php-src/run-tests.php:1.167
--- php-src/run-tests.php:1.166 Tue Jun 10 16:03:24 2003
+++ php-src/run-tests.php   Thu Jul 24 13:44:16 2003
@@ -117,7 +117,7 @@
putenv(TEST_PHP_EXECUTABLE=$php);
}
 }
-if (!file_exists($php)) {
+if (empty($php) || !file_exists($php)) {
error(environment variable TEST_PHP_EXECUTABLE must be set to specify PHP 
executable!);
 }
 
@@ -665,6 +665,14 @@
}
fclose($fp);
 
+   /* For GET/POST tests, check if cgi sapi is avaliable and if it is, use it. */
+   if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
+   if (file_exists(./sapi/cgi/php)) {
+   $old_php = $php;
+   $php = realpath(./sapi/cgi/php) . ' -C ';
+   }
+   }
+
$shortname = str_replace($cwd.'/', '', $file);
$tested = trim($section_text['TEST']). [$shortname];
 
@@ -708,6 +716,9 @@
} else {
echo \n;
}
+   if (isset($old_php)) {
+   $php = $old_php;
+   }
return 'SKIPPED';
}
if (eregi(^info, trim($output))) {
@@ -795,6 +806,11 @@
$output = trim($out);
$output = preg_replace('/\r\n/',\n,$output);
 
+   /* when using CGI, strip the headers from the output */
+   if (isset($old_php)  ($pos = strpos($output, \n\n)) !== FALSE) {
+   $output = substr($output, ($pos + 2));
+   }
+
if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
if (isset($section_text['EXPECTF'])) {
$wanted = trim($section_text['EXPECTF']);
@@ -821,6 +837,9 @@
if (preg_match(/^$wanted_re\$/s, $output)) {
@unlink($tmp_file);
echo PASS $tested\n;
+   if (isset($old_php)) {
+   $php = $old_php;
+   }
return 'PASSED';
}
 
@@ -832,6 +851,9 @@
if ($ok) {
@unlink($tmp_file);
echo PASS $tested\n;
+   if (isset($old_php)) {
+   $php = $old_php;
+   }
return 'PASSED';
}
}
@@ -888,6 +910,10 @@
 );
fclose($log);
error_report($file,$logname,$tested);
+   }
+
+   if (isset($old_php)) {
+   $php = $old_php;
}
 
return $warn ? 'WARNED' : 'FAILED';
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.49 php-src/Makefile.global:1.50
--- php-src/Makefile.global:1.49Tue Jul  1 22:38:47 2003
+++ php-src/Makefile.global Thu Jul 24 13:44:16 2003
@@ -50,11 +50,15 @@
 
 install-su: install-pear install-tester
 
-test: $(SAPI_CLI_PATH)
-   @TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-TEST_PHP_SRCDIR=$(top_srcdir) \
-CC=$(CC) \
-   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS)
+test: 
+   [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH)  test ! -z $(SAPI_CLI_PATH); then 
\
+   TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
+   TEST_PHP_SRCDIR=$(top_srcdir) \
+   CC=$(CC) \
+   $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 
'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \
+   else \
+   echo ERROR: Cannot run tests without CLI sapi.; \
+   fi
 
 clean:
find . -name \*.lo -o -name \*.o | xargs rm -f



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global configure.in /sapi/cgi Makefile.frag config9.m4

2003-07-01 Thread Sascha Schumann

sas Tue Jul  1 21:08:27 2003 EDT

  Modified files:  
/php-srcMakefile.global configure.in 
/php-src/sapi/cgi   Makefile.frag config9.m4 
  Log:
  Fix install-sapi dependency - it should depend on OVERALL_TARGET, of course.
  
  
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.47 php-src/Makefile.global:1.48
--- php-src/Makefile.global:1.47Sun Jun 29 01:59:29 2003
+++ php-src/Makefile.global Tue Jul  1 21:08:26 2003
@@ -16,15 +16,15 @@
 
 libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) 
$(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+   [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp5.la 
$(phptempdir)/libphp5.la /dev/null 21
 
 libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ libs/libphp5.so
 
 install: $(all_targets) $(install_targets)
 
-install-sapi: libphp5.la
+install-sapi: $(OVERALL_TARGET)
@echo Installing PHP SAPI module
-   [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp5.la 
$(phptempdir)/libphp5.la /dev/null 21
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
[EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
Index: php-src/configure.in
diff -u php-src/configure.in:1.457 php-src/configure.in:1.458
--- php-src/configure.in:1.457  Tue Jul  1 13:01:21 2003
+++ php-src/configure.inTue Jul  1 21:08:26 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.457 2003/07/01 17:01:21 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.458 2003/07/02 01:08:26 sas Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1125,22 +1125,10 @@
 CXXFLAGS=$CXXFLAGS $standard_libtool_flag
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets=install-modules $install_pear install-build install-headers 
install-programs
-
-case $PHP_SAPI in
-  cgi)
-dnl Install CGI only (CLI is not installed even if it's enabled)
-install_targets=install-cgi $install_targets
-;;
-  cli)
-dnl Install CLI only (--disable-cgi used, no other SAPIs enabled)
-install_targets=install-cli $install_targets
-;;
-  *)
-dnl Install CLI and another SAPI
-install_targets=$PHP_INSTALL_CLI_TARGET install-sapi $install_targets
-;;
-esac
+install_targets=install-sapi install-modules $install_pear install-build 
install-headers install-programs
+if test $PHP_SAPI != cgi; then
+  install_targets=$PHP_INSTALL_CLI_TARGET $install_targets
+fi
 
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
Index: php-src/sapi/cgi/Makefile.frag
diff -u php-src/sapi/cgi/Makefile.frag:1.2 php-src/sapi/cgi/Makefile.frag:1.3
--- php-src/sapi/cgi/Makefile.frag:1.2  Tue Jul  1 13:01:21 2003
+++ php-src/sapi/cgi/Makefile.frag  Tue Jul  1 21:08:26 2003
@@ -1,6 +1,2 @@
 $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(BUILD_CGI)
-
-install-cgi: $(SAPI_CGI_PATH)
-   @echo Installing PHP CGI binary:$(INSTALL_ROOT)$(bindir)/
-   @$(INSTALL_CGI)
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.7 php-src/sapi/cgi/config9.m4:1.8
--- php-src/sapi/cgi/config9.m4:1.7 Tue Jul  1 13:01:21 2003
+++ php-src/sapi/cgi/config9.m4 Tue Jul  1 21:08:26 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.7 2003/07/01 17:01:21 sniper Exp $
+dnl $Id: config9.m4,v 1.8 2003/07/02 01:08:26 sas Exp $
 dnl
 
 AC_ARG_ENABLE(cgi,
@@ -147,6 +147,7 @@
 AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
 AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
+INSTALL_IT=\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php
 PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, 
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
 
 case $host_alias in
@@ -157,10 +158,8 @@
 BUILD_CGI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) 
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)
   ;;
 esac
-INSTALL_CGI=\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 
\$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php
 
 PHP_SUBST(BUILD_CGI)
-PHP_SUBST(INSTALL_CGI)
 
   elif test $PHP_SAPI_CLI != no; then
 AC_MSG_RESULT(no)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global /sapi/cgi config9.m4

2003-07-01 Thread Jani Taskinen

sniper  Tue Jul  1 22:38:47 2003 EDT

  Modified files:  
/php-srcMakefile.global 
/php-src/sapi/cgi   config9.m4 
  Log:
  
  



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / Makefile.global

2003-06-28 Thread Jani Taskinen

sniper  Sun Jun 29 01:59:30 2003 EDT

  Modified files:  
/php-srcMakefile.global 
  Log:
  Fixed bug #24363 (plain ./configure  make install failed)
  
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.46 php-src/Makefile.global:1.47
--- php-src/Makefile.global:1.46Sun May 18 19:52:09 2003
+++ php-src/Makefile.global Sun Jun 29 01:59:29 2003
@@ -20,7 +20,7 @@
 libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@  cp $@ libs/libphp5.so
 
-install: $(install_targets)
+install: $(all_targets) $(install_targets)
 
 install-sapi: libphp5.la
@echo Installing PHP SAPI module



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

44 matches

Mail list logo