cvs: php4(php_4_0_4) / configure.in /ext/shmop shmop.c /main php.h

sas Sat Dec 2 05:46:09 2000 EDT Modified files: /php4 configure.in /php4/ext/shmop shmop.c /php4/main php.h Log: Merge changes from HEAD Index: php4/configure.in diff -u php4/configure.in:1.195.2.1 php4/configure.in:1.195.2.2 --- php4/configure.in:1.195.2.1 Sat Dec 2 00:14:56 2000 +++ php4/configure.in Sat Dec 2 05:46:04 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.195.2.1 2000/12/02 08:14:56 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.195.2.2 2000/12/02 13:46:04 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -51,7 +51,7 @@ dnl ## Diversion 5 is the last one. Here we generate files and clean up. dnl ## This is where the version number is changed from now on! -AM_INIT_AUTOMAKE(php, 4.0.4RC3) +AM_INIT_AUTOMAKE(php, 4.0.4RC3, nodefine) PHP_VERSION=$VERSION echo "/* automatically generated by configure */" > php_version.h.new Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.7 php4/ext/shmop/shmop.c:1.7.2.1 --- php4/ext/shmop/shmop.c:1.7 Wed Oct 25 10:44:00 2000 +++ php4/ext/shmop/shmop.c Sat Dec 2 05:46:08 2000 @@ -25,6 +25,8 @@ #if HAVE_SHMOP +#include "ext/standard/info.h" + #ifdef ZTS int shmop_globals_id; #else Index: php4/main/php.h diff -u php4/main/php.h:1.127 php4/main/php.h:1.127.2.1 --- php4/main/php.h:1.127 Fri Nov 17 08:02:08 2000 +++ php4/main/php.h Sat Dec 2 05:46:08 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.127 2000/11/17 16:02:08 sas Exp $ */ +/* $Id: php.h,v 1.127.2.1 2000/12/02 13:46:08 sas Exp $ */ #ifndef PHP_H #define PHP_H @@ -33,10 +33,6 @@ #include "php_version.h" #include "zend.h" #include "php_compat.h" - -/* automake defines PACKAGE and VERSION for Zend too */ -#undef PACKAGE -#undef VERSION #include "zend_API.h"