CVS update: php3

Date: Tuesday November 17, 1998 @ 18:21 Author: tommay Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv28591 Modified Files: Makefile.in acconfig.h config.h.in configure.in internal_functions.c Log Message: Added System V semaphore support. Index: php3/Makefile.in diff -c php3/Makefile.in:1.272 php3/Makefile.in:1.273 *** php3/Makefile.in:1.272 Fri Nov 13 09:15:44 1998 --- php3/Makefile.in Tue Nov 17 18:21:13 1998 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.272 1998/11/13 14:15:44 ssb Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.273 1998/11/17 23:21:13 tommay Exp $ # prefix = @prefix@ *************** *** 90,96 **** functions/zlib.c functions/COM.c functions/ifx.c \ functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \ functions/snmp.c functions/var.c functions/interbase.c \ ! functions/quot_print.c functions/cyr_convert.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) --- 90,97 ---- functions/zlib.c functions/COM.c functions/ifx.c \ functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \ functions/snmp.c functions/var.c functions/interbase.c \ ! functions/quot_print.c functions/cyr_convert.c \ ! functions/sysvsem.c FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) Index: php3/acconfig.h diff -c php3/acconfig.h:1.68 php3/acconfig.h:1.69 *** php3/acconfig.h:1.68 Tue Oct 20 20:13:41 1998 --- php3/acconfig.h Tue Nov 17 18:21:14 1998 *************** *** 225,230 **** --- 225,238 ---- */ #define PHP3_URL_FOPEN 0 + /* Define if you want System V semaphore support. + */ + #define HAVE_SYSVSEM 0 + + /* Define if you have union semun. + */ + #define HAVE_SEMUN 0 + /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 Index: php3/config.h.in diff -c php3/config.h.in:1.120 php3/config.h.in:1.121 *** php3/config.h.in:1.120 Tue Oct 20 20:13:41 1998 --- php3/config.h.in Tue Nov 17 18:21:14 1998 *************** *** 265,270 **** --- 265,278 ---- */ #define PHP3_URL_FOPEN 0 + /* Define if you want System V semaphore support. + */ + #define HAVE_SYSVSEM 0 + + /* Define if you have union semun. + */ + #define HAVE_SEMUN 0 + /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 Index: php3/configure.in diff -c php3/configure.in:1.276 php3/configure.in:1.277 *** php3/configure.in:1.276 Fri Nov 13 07:18:40 1998 --- php3/configure.in Tue Nov 17 18:21:15 1998 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.276 1998/11/13 12:18:40 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) --- 1,4 ---- ! dnl $Id: configure.in,v 1.277 1998/11/17 23:21:15 tommay Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 1710,1715 **** --- 1710,1749 ---- ],[ AC_DEFINE(PHP3_URL_FOPEN, 1) AC_MSG_RESULT(yes) + ]) + + AC_MSG_CHECKING(whether to enable System V semaphore support) + AC_ARG_ENABLE(sysvsem, + [ --enable-sysvsem Enable System V semaphore support.], + [ + if test "$enableval" = "yes"; then + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SYSVSEM, 1) + AC_CACHE_CHECK(for union semun,php_cv_semun, + AC_TRY_COMPILE([ + #include <sys/types.h> + #include <sys/ipc.h> + #include <sys/sem.h> + ], + [union semun x;], + [ + php_cv_semun=yes + ],[ + php_cv_semun=no + ]) + ) + if test $php_cv_semun = "yes"; then + AC_DEFINE(HAVE_SEMUN, 1) + else + AC_DEFINE(HAVE_SEMUN, 0) + fi + else + AC_MSG_RESULT(no) + AC_DEFINE(HAVE_SYSVSEM, 0) + fi + ],[ + AC_MSG_RESULT(no) + AC_DEFINE(HAVE_SYSVSEM, 0) ]) dnl If we're using gcc and the user hasn't specified CFLAGS, add -O2. Index: php3/internal_functions.c diff -c php3/internal_functions.c:1.330 php3/internal_functions.c:1.331 *** php3/internal_functions.c:1.330 Tue Oct 20 20:13:41 1998 --- php3/internal_functions.c Tue Nov 17 18:21:15 1998 *************** *** 29,35 **** */ ! /* $Id: internal_functions.c,v 1.330 1998/10/21 00:13:41 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: internal_functions.c,v 1.331 1998/11/17 23:21:15 tommay Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 92,97 **** --- 92,98 ---- #include "functions/php3_interbase.h" #include "functions/php3_xml.h" #include "functions/php3_pdf.h" + #include "functions/php3_sysvsem.h" extern php3_ini_structure php3_ini; *************** *** 150,155 **** --- 151,157 ---- {"InterBase", php3_ibase_module_ptr}, {"XML", xml_module_ptr}, {"PDF", pdf_module_ptr}, + {"System V semaphores", sysvsem_module_ptr}, {NULL, NULL} }; -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net